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

Merge branch 'sea-query-v0.27' into feature/issues-969_sea-query-binder

Browse Source
This commit is contained in:
Ivan Krivosheev 2022-09-08 12:59:09 +03:00 committed by GitHub
commit ab5b488860
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.toml
View File

@ -34,8 +34,8 @@ log = { version = "^0.4" }
tracing = { version = "^0.1", features = ["log"] }
rust_decimal = { version = "^1", optional = true }
sea-orm-macros = { version = "^0.10.0", path = "sea-orm-macros", optional = true }
sea-query = { git = "https://github.com/SeaQL/sea-query", branch = "master", version = "^0.27", features = ["thread-safe"] }
sea-query-binder = { git = "https://github.com/SeaQL/sea-query", branch = "master", version = "^0.1", optional = true }
sea-query = { version = "^0.27", features = ["thread-safe"] }
sea-query-binder = { version = "^0.1", optional = true }
sea-strum = { version = "^0.23", features = ["derive", "sea-orm"] }
serde = { version = "^1.0", features = ["derive"] }
serde_json = { version = "^1.0", optional = true }
@ -45,6 +45,10 @@ ouroboros = "0.15"
url = "^2.2"
once_cell = "1.8"
[patch.crates-io]
sea-query = { git = "https://github.com/SeaQL/sea-query" }
sea-query-binder = { git = "https://github.com/SeaQL/sea-query" }
[dev-dependencies]
smol = { version = "^1.2" }
smol-potat = { version = "^1.1" }

4
src/executor/cursor.rs
View File

@ -415,8 +415,8 @@ mod tests {
r#"FROM "cake_filling""#,
r#"WHERE "cake_filling"."cake_id" > $1"#,
r#"AND "cake_filling"."filling_id" > $2"#,
r#"AND ("cake_filling"."cake_id" < $3"#,
r#"AND "cake_filling"."filling_id" < $4)"#,
r#"AND "cake_filling"."cake_id" < $3"#,
r#"AND "cake_filling"."filling_id" < $4"#,
r#"ORDER BY "cake_filling"."cake_id" ASC, "cake_filling"."filling_id" ASC"#,
r#"LIMIT $5"#,
]