caisin/sea-orm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

issues-969 Update dependencies

Browse Source 
issues-969 Fix sqlx_query function
This commit is contained in:
Ivan Krivosheev 2022-09-03 18:42:51 +03:00
parent bac22d30c5
commit ecbd7c2713
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.toml
View File

@ -26,16 +26,16 @@ path = "src/lib.rs"
[dependencies] [dependencies]
async-stream = { version = "^0.3" } async-stream = { version = "^0.3" }
async-trait = { version = "^0.1" } async-trait = { version = "^0.1" }
chrono = { version = "^0.4", optional = true } chrono = { version = "^0.4.20", default-features = false, features = ["clock"], optional = true }
time = { version = "^0.3", optional = true } time = { version = "^0.3", optional = true }
futures = { version = "^0.3" } futures = { version = "^0.3" }
futures-util = { version = "^0.3" } futures-util = { version = "^0.3" }
log = { version = "^0.4" } log = { version = "^0.4" }
tracing = { version = "^0.1", features = ["log"] } tracing = { version = "^0.1", features = ["log"] }
rust_decimal = { version = "^1", optional = true } rust_decimal = { version = "^1", optional = true }
sea-orm-macros = { version = "^0.9.1", path = "sea-orm-macros", optional = true } sea-orm-macros = { version = "^0.10.0", path = "sea-orm-macros", optional = true }
sea-query = { git = "https://github.com/ikrivosheev/sea-query", version = "^0.27", features = ["thread-safe"] } sea-query = { git = "https://github.com/SeaQL/sea-query", branch = "master", version = "^0.27", features = ["thread-safe"] }
sea-query-binder = { git = "https://github.com/ikrivosheev/sea-query", version = "^0.1", optional = true } sea-query-binder = { git = "https://github.com/SeaQL/sea-query", branch = "master", version = "^0.1", optional = true }
sea-strum = { version = "^0.23", features = ["derive", "sea-orm"] } sea-strum = { version = "^0.23", features = ["derive", "sea-orm"] }
serde = { version = "^1.0", features = ["derive"] } serde = { version = "^1.0", features = ["derive"] }
serde_json = { version = "^1.0", optional = true } serde_json = { version = "^1.0", optional = true }

10
src/driver/sqlx_mysql.rs
View File

@ -216,9 +216,9 @@ impl From<MySqlQueryResult> for ExecResult {
} }
pub(crate) fn sqlx_query(stmt: &Statement) -> sqlx::query::Query<'_, MySql, SqlxValues> { pub(crate) fn sqlx_query(stmt: &Statement) -> sqlx::query::Query<'_, MySql, SqlxValues> {
if let Some(values) = &stmt.values { let values = stmt
sqlx::query_with(&stmt.sql, SqlxValues(values.clone())) .values
} else { .as_ref()
sqlx::query_with(&stmt.sql, SqlxValues(Values(Vec::new()))) .map_or(Values(Vec::new()), |values| values.clone());
} sqlx::query_with(&stmt.sql, SqlxValues(values))
} }

10
src/driver/sqlx_postgres.rs
View File

@ -216,9 +216,9 @@ impl From<PgQueryResult> for ExecResult {
} }
pub(crate) fn sqlx_query(stmt: &Statement) -> sqlx::query::Query<'_, Postgres, SqlxValues> { pub(crate) fn sqlx_query(stmt: &Statement) -> sqlx::query::Query<'_, Postgres, SqlxValues> {
if let Some(values) = &stmt.values { let values = stmt
sqlx::query_with(&stmt.sql, SqlxValues(values.clone())) .values
} else { .as_ref()
sqlx::query_with(&stmt.sql, SqlxValues(Values(Vec::new()))) .map_or(Values(Vec::new()), |values| values.clone());
} sqlx::query_with(&stmt.sql, SqlxValues(values))
} }

10
src/driver/sqlx_sqlite.rs
View File

@ -223,9 +223,9 @@ impl From<SqliteQueryResult> for ExecResult {
} }
pub(crate) fn sqlx_query(stmt: &Statement) -> sqlx::query::Query<'_, Sqlite, SqlxValues> { pub(crate) fn sqlx_query(stmt: &Statement) -> sqlx::query::Query<'_, Sqlite, SqlxValues> {
if let Some(values) = &stmt.values { let values = stmt
sqlx::query_with(&stmt.sql, SqlxValues(values.clone())) .values
} else { .as_ref()
sqlx::query_with(&stmt.sql, SqlxValues(Values(Vec::new()))) .map_or(Values(Vec::new()), |values| values.clone());
} sqlx::query_with(&stmt.sql, SqlxValues(values))
} }