itsscb/sqlx
1
0
Fork 0
mirror of https://github.com/launchbadge/sqlx.git synced 2026-03-23 10:38:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

implement cargo sqlx prepare

Browse Source 
also organize code more clearly in `cargo-sqlx`
This commit is contained in:
Austin Bonander
2020-05-12 20:19:25 -07:00
committed by Ryan Leckey
parent 6913695588
commit 21041ff55e
13 changed files with 505 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sqlx-macros/src/query_macros/data.rs
View File

@@ -23,6 +23,8 @@ use syn::export::Span;
pub struct QueryData<DB: Database> {
pub(super) query: String,
pub(super) describe: Describe<DB>,
#[cfg(feature = "offline")]
pub(super) hash: String,
}
impl<DB: Database> QueryData<DB> {
@@ -33,6 +35,8 @@ impl<DB: Database> QueryData<DB> {
Ok(QueryData {
query: query.into(),
describe: conn.describe(query).await?,
#[cfg(feature = "offline")]
hash: offline::hash_string(query),
})
}
}
@@ -57,6 +61,8 @@ pub mod offline {
pub db_name: String,
pub query: String,
pub describe: serde_json::Value,
#[serde(skip)]
pub hash: String,
}
impl DynQueryData {
@@ -82,11 +88,14 @@ pub mod offline {
{
pub fn from_dyn_data(dyn_data: DynQueryData) -> crate::Result<Self> {
assert!(!dyn_data.db_name.is_empty());
assert!(!dyn_data.hash.is_empty());
if DB::NAME == dyn_data.db_name {
let describe: Describe<DB> = serde_json::from_value(dyn_data.describe)?;
Ok(QueryData {
query: dyn_data.query,
describe,
hash: dyn_data.hash,
})
} else {
Err(format!(
@@ -115,7 +124,7 @@ pub mod offline {
}
}
fn hash_string(query: &str) -> String {
pub fn hash_string(query: &str) -> String {
// picked `sha2` because it's already in the dependency tree for both MySQL and Postgres
use sha2::{Digest, Sha256};
@@ -156,6 +165,7 @@ pub mod offline {
return if query_data.query == self.query {
query_data.db_name = db_name;
query_data.hash = self.hash;
Ok(query_data)
} else {
Err(serde::de::Error::custom(format_args!(

2
sqlx-macros/src/query_macros/mod.rs
View File

@@ -122,7 +122,7 @@ pub fn expand_from_file(input: QueryMacroInput, file: PathBuf) -> crate::Result<
#[cfg(feature = "sqlite")]
sqlx_core::sqlite::Sqlite::NAME => expand_with_data(
input,
QueryData::<sqlx::sqlite::Sqlite>::from_dyn_data(query_data)?,
QueryData::<sqlx_core::sqlite::Sqlite>::from_dyn_data(query_data)?,
),
_ => Err(format!(
"found query data for {} but the feature for that database was not enabled",