Merge branch 'master' into ss/bakery
This commit is contained in:
commit
dbe950e628
30
Cargo.toml
30
Cargo.toml
@ -23,13 +23,7 @@ keywords = ["orm", "database", "sql", "mysql", "postgres", "sqlite", "async"]
|
|||||||
publish = false
|
publish = false
|
||||||
|
|
||||||
[package.metadata.docs.rs]
|
[package.metadata.docs.rs]
|
||||||
features = [
|
features = ["default", "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", "runtime-async-std-native-tls"]
|
||||||
"default",
|
|
||||||
"sqlx-mysql",
|
|
||||||
"sqlx-postgres",
|
|
||||||
"sqlx-sqlite",
|
|
||||||
"runtime-async-std-native-tls",
|
|
||||||
]
|
|
||||||
rustdoc-args = ["--cfg", "docsrs"]
|
rustdoc-args = ["--cfg", "docsrs"]
|
||||||
|
|
||||||
[lib]
|
[lib]
|
||||||
@ -41,16 +35,7 @@ async-stream = { version="^0.3" }
|
|||||||
chrono = { version = "^0", optional = true }
|
chrono = { version = "^0", optional = true }
|
||||||
futures = { version = "^0.3" }
|
futures = { version = "^0.3" }
|
||||||
futures-util = { version = "^0.3" }
|
futures-util = { version = "^0.3" }
|
||||||
rust_decimal = "1.14"
|
sea-query = { version = "^0.12" }
|
||||||
rust_decimal_macros = "1.14"
|
|
||||||
|
|
||||||
sea-query = { version="^0.12.5" }
|
|
||||||
# sea-query = { path="../sea-query", features=[
|
|
||||||
# "with-rust_decimal",
|
|
||||||
# "postgres-rust_decimal",
|
|
||||||
# "sqlx-mysql",
|
|
||||||
# ] }
|
|
||||||
|
|
||||||
sea-orm-macros = { path = "sea-orm-macros", optional = true }
|
sea-orm-macros = { path = "sea-orm-macros", optional = true }
|
||||||
serde = { version = "^1.0", features = [ "derive" ] }
|
serde = { version = "^1.0", features = [ "derive" ] }
|
||||||
sqlx = { version = "^0.5", optional = true }
|
sqlx = { version = "^0.5", optional = true }
|
||||||
@ -60,23 +45,20 @@ serde_json = { version="^1", optional=true }
|
|||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
async-std = { version = "^1.9", features = [ "attributes" ] }
|
async-std = { version = "^1.9", features = [ "attributes" ] }
|
||||||
maplit = { version = "^1" }
|
maplit = { version = "^1" }
|
||||||
sea-orm = { path=".", features=[
|
sea-orm = { path = ".", features = ["sqlx-sqlite", "sqlx-json", "sqlx-chrono", "sqlx-decimal", "runtime-async-std-native-tls"] }
|
||||||
"sqlx-sqlite",
|
|
||||||
"sqlx-json",
|
|
||||||
"sqlx-chrono",
|
|
||||||
"runtime-async-std-native-tls",
|
|
||||||
] }
|
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
debug-print = []
|
debug-print = []
|
||||||
default = ["macros", "with-json", "with-chrono", "mock"]
|
default = [ "macros", "with-json", "with-chrono", "with-rust_decimal", "mock" ]
|
||||||
macros = [ "sea-orm-macros" ]
|
macros = [ "sea-orm-macros" ]
|
||||||
mock = []
|
mock = []
|
||||||
with-json = [ "serde_json", "sea-query/with-json" ]
|
with-json = [ "serde_json", "sea-query/with-json" ]
|
||||||
with-chrono = [ "chrono", "sea-query/with-chrono" ]
|
with-chrono = [ "chrono", "sea-query/with-chrono" ]
|
||||||
|
with-rust_decimal = [ "sea-query/with-rust_decimal" ]
|
||||||
sqlx-dep = [ "sqlx" ]
|
sqlx-dep = [ "sqlx" ]
|
||||||
sqlx-json = [ "sqlx/json", "with-json" ]
|
sqlx-json = [ "sqlx/json", "with-json" ]
|
||||||
sqlx-chrono = [ "sqlx/chrono", "with-chrono" ]
|
sqlx-chrono = [ "sqlx/chrono", "with-chrono" ]
|
||||||
|
sqlx-decimal = [ "sqlx/decimal", "with-rust_decimal" ]
|
||||||
sqlx-mysql = [ "sqlx-dep", "sea-query/sqlx-mysql", "sqlx/mysql" ]
|
sqlx-mysql = [ "sqlx-dep", "sea-query/sqlx-mysql", "sqlx/mysql" ]
|
||||||
sqlx-postgres = [ "sqlx-dep", "sea-query/sqlx-postgres", "sqlx/postgres" ]
|
sqlx-postgres = [ "sqlx-dep", "sea-query/sqlx-postgres", "sqlx/postgres" ]
|
||||||
sqlx-sqlite = [ "sqlx-dep", "sea-query/sqlx-sqlite", "sqlx/sqlite" ]
|
sqlx-sqlite = [ "sqlx-dep", "sea-query/sqlx-sqlite", "sqlx/sqlite" ]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user