Skip to content

Commit

Permalink
Merge branch 'SeaQL:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@anshap1719
anshap1719 authored Jan 23, 2024
2 parents b41b38d + b580455 commit dab6c7e
Show file tree
Hide file tree
Showing 36 changed files with 41 additions and 41 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ members = [".", "sea-orm-macros", "sea-orm-codegen"]

[package]
name = "sea-orm"
version = "0.12.11"
version = "0.12.12"
authors = ["Chris Tsang <[email protected]>"]
edition = "2021"
description = "🐚 An async & dynamic ORM for Rust"
Expand Down Expand Up @@ -33,7 +33,7 @@ log = { version = "0.4", default-features = false }
tracing = { version = "0.1", default-features = false, features = ["attributes", "log"] }
rust_decimal = { version = "1", default-features = false, optional = true }
bigdecimal = { version = "0.3", default-features = false, optional = true }
sea-orm-macros = { version = "0.12.11", path = "sea-orm-macros", default-features = false, features = ["strum"] }
sea-orm-macros = { version = "0.12.12", path = "sea-orm-macros", default-features = false, features = ["strum"] }
sea-query = { version = "0.30.4", default-features = false, features = ["thread-safe", "hashable-value", "backend-mysql", "backend-postgres", "backend-sqlite"] }
sea-query-binder = { version = "0.5.0", default-features = false, optional = true }
strum = { version = "0.25", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion examples/actix3_example/entity/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ serde = { version = "1", features = ["derive"] }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "0.12.11" # sea-orm version
version = "0.12.12" # sea-orm version
2 changes: 1 addition & 1 deletion examples/actix3_example/migration/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ async-std = { version = "1", features = ["attributes", "tokio1"] }

[dependencies.sea-orm-migration]
path = "../../../sea-orm-migration" # remove this line in your own project
version = "0.12.11" # sea-orm-migration version
version = "0.12.12" # sea-orm-migration version
features = [
# Enable following runtime and db backend features if you want to run migration via CLI
# "runtime-async-std-native-tls",
Expand Down
2 changes: 1 addition & 1 deletion examples/actix3_example/service/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ entity = { path = "../entity" }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "0.12.11" # sea-orm version
version = "0.12.12" # sea-orm version
features = [
"debug-print",
"runtime-async-std-native-tls",
Expand Down
2 changes: 1 addition & 1 deletion examples/actix_example/entity/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ serde = { version = "1", features = ["derive"] }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "0.12.11" # sea-orm version
version = "0.12.12" # sea-orm version
2 changes: 1 addition & 1 deletion examples/actix_example/migration/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ async-std = { version = "1", features = ["attributes", "tokio1"] }

[dependencies.sea-orm-migration]
path = "../../../sea-orm-migration" # remove this line in your own project
version = "0.12.11" # sea-orm-migration version
version = "0.12.12" # sea-orm-migration version
features = [
# Enable following runtime and db backend features if you want to run migration via CLI
# "runtime-actix-native-tls",
Expand Down
2 changes: 1 addition & 1 deletion examples/actix_example/service/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ entity = { path = "../entity" }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "0.12.11" # sea-orm version
version = "0.12.12" # sea-orm version
features = [
"debug-print",
"runtime-async-std-native-tls",
Expand Down
2 changes: 1 addition & 1 deletion examples/axum_example/entity/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ serde = { version = "1", features = ["derive"] }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "0.12.11" # sea-orm version
version = "0.12.12" # sea-orm version
2 changes: 1 addition & 1 deletion examples/axum_example/migration/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ async-std = { version = "1", features = ["attributes", "tokio1"] }

[dependencies.sea-orm-migration]
path = "../../../sea-orm-migration" # remove this line in your own project
version = "0.12.11" # sea-orm-migration version
version = "0.12.12" # sea-orm-migration version
features = [
# Enable following runtime and db backend features if you want to run migration via CLI
# "runtime-tokio-native-tls",
Expand Down
2 changes: 1 addition & 1 deletion examples/axum_example/service/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ entity = { path = "../entity" }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "0.12.11" # sea-orm version
version = "0.12.12" # sea-orm version
features = [
"debug-print",
"runtime-tokio-native-tls",
Expand Down
2 changes: 1 addition & 1 deletion examples/graphql_example/entity/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ version = "5.0.10"

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "0.12.11" # sea-orm version
version = "0.12.12" # sea-orm version
2 changes: 1 addition & 1 deletion examples/graphql_example/migration/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ async-std = { version = "1", features = ["attributes", "tokio1"] }

[dependencies.sea-orm-migration]
path = "../../../sea-orm-migration" # remove this line in your own project
version = "0.12.11" # sea-orm-migration version
version = "0.12.12" # sea-orm-migration version
features = [
# Enable following runtime and db backend features if you want to run migration via CLI
# "runtime-tokio-native-tls",
Expand Down
2 changes: 1 addition & 1 deletion examples/graphql_example/service/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ entity = { path = "../entity" }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "0.12.11" # sea-orm version
version = "0.12.12" # sea-orm version
features = [
"debug-print",
"runtime-async-std-native-tls",
Expand Down
2 changes: 1 addition & 1 deletion examples/jsonrpsee_example/entity/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ serde = { version = "1", features = ["derive"] }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "0.12.11" # sea-orm version
version = "0.12.12" # sea-orm version
2 changes: 1 addition & 1 deletion examples/jsonrpsee_example/migration/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ async-std = { version = "1", features = ["attributes", "tokio1"] }

[dependencies.sea-orm-migration]
path = "../../../sea-orm-migration" # remove this line in your own project
version = "0.12.11" # sea-orm-migration version
version = "0.12.12" # sea-orm-migration version
features = [
# Enable following runtime and db backend features if you want to run migration via CLI
# "runtime-tokio-native-tls",
Expand Down
2 changes: 1 addition & 1 deletion examples/jsonrpsee_example/service/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ entity = { path = "../entity" }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "0.12.11" # sea-orm version
version = "0.12.12" # sea-orm version
features = [
"debug-print",
"runtime-tokio-native-tls",
Expand Down
2 changes: 1 addition & 1 deletion examples/poem_example/entity/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ serde = { version = "1", features = ["derive"] }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "0.12.11" # sea-orm version
version = "0.12.12" # sea-orm version
2 changes: 1 addition & 1 deletion examples/poem_example/migration/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ async-std = { version = "1", features = ["attributes", "tokio1"] }

[dependencies.sea-orm-migration]
path = "../../../sea-orm-migration" # remove this line in your own project
version = "0.12.11" # sea-orm-migration version
version = "0.12.12" # sea-orm-migration version
features = [
# Enable following runtime and db backend features if you want to run migration via CLI
# "runtime-tokio-native-tls",
Expand Down
2 changes: 1 addition & 1 deletion examples/poem_example/service/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ entity = { path = "../entity" }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "0.12.11" # sea-orm version
version = "0.12.12" # sea-orm version
features = [
"debug-print",
"runtime-async-std-native-tls",
Expand Down
2 changes: 1 addition & 1 deletion examples/rocket_example/entity/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ rocket = { version = "0.5.0", features = ["json"] }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "0.12.11" # sea-orm version
version = "0.12.12" # sea-orm version
2 changes: 1 addition & 1 deletion examples/rocket_example/migration/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ async-std = { version = "1", features = ["attributes", "tokio1"] }

[dependencies.sea-orm-migration]
path = "../../../sea-orm-migration" # remove this line in your own project
version = "0.12.11" # sea-orm-migration version
version = "0.12.12" # sea-orm-migration version
features = [
# Enable following runtime and db backend features if you want to run migration via CLI
# "runtime-tokio-native-tls",
Expand Down
2 changes: 1 addition & 1 deletion examples/rocket_example/service/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ entity = { path = "../entity" }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "0.12.11" # sea-orm version
version = "0.12.12" # sea-orm version
features = [
"runtime-tokio-native-tls",
"sqlx-postgres",
Expand Down
2 changes: 1 addition & 1 deletion examples/rocket_okapi_example/entity/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ rocket = { version = "0.5.0", features = ["json"] }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "0.12.11" # sea-orm version
version = "0.12.12" # sea-orm version

[dependencies.rocket_okapi]
version = "0.8.0-rc.2"
2 changes: 1 addition & 1 deletion examples/rocket_okapi_example/migration/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ async-std = { version = "1", features = ["attributes", "tokio1"] }

[dependencies.sea-orm-migration]
path = "../../../sea-orm-migration" # remove this line in your own project
version = "0.12.11" # sea-orm-migration version
version = "0.12.12" # sea-orm-migration version
features = [
# Enable following runtime and db backend features if you want to run migration via CLI
# "runtime-tokio-native-tls",
Expand Down
2 changes: 1 addition & 1 deletion examples/rocket_okapi_example/service/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ entity = { path = "../entity" }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "0.12.11" # sea-orm version
version = "0.12.12" # sea-orm version
features = [
"runtime-tokio-native-tls",
"sqlx-postgres",
Expand Down
2 changes: 1 addition & 1 deletion examples/salvo_example/entity/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ salvo = { version = "0.50" }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "0.12.11" # sea-orm version
version = "0.12.12" # sea-orm version
2 changes: 1 addition & 1 deletion examples/salvo_example/migration/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ async-std = { version = "1", features = ["attributes", "tokio1"] }

[dependencies.sea-orm-migration]
path = "../../../sea-orm-migration" # remove this line in your own project
version = "0.12.11" # sea-orm-migration version
version = "0.12.12" # sea-orm-migration version
features = [
# Enable following runtime and db backend features if you want to run migration via CLI
# "runtime-tokio-native-tls",
Expand Down
2 changes: 1 addition & 1 deletion examples/salvo_example/service/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ entity = { path = "../entity" }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "0.12.11" # sea-orm version
version = "0.12.12" # sea-orm version
features = [
"debug-print",
"runtime-tokio-native-tls",
Expand Down
4 changes: 2 additions & 2 deletions examples/seaography_example/migration/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ async-std = { version = "1", features = ["attributes", "tokio1"] }

[dependencies.sea-orm]
path = "../../.." # remove this line in your own project
version = "0.12.11" # sea-orm version
version = "0.12.12" # sea-orm version

[dependencies.sea-orm-migration]
path = "../../../sea-orm-migration" # remove this line in your own project
version = "0.12.11" # sea-orm-migration version
version = "0.12.12" # sea-orm-migration version
features = [
"runtime-async-std-native-tls",
"sqlx-mysql",
Expand Down
2 changes: 1 addition & 1 deletion examples/tonic_example/entity/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ serde = { version = "1", features = ["derive"] }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "0.12.11" # sea-orm version
version = "0.12.12" # sea-orm version
2 changes: 1 addition & 1 deletion examples/tonic_example/migration/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ async-std = { version = "1", features = ["attributes", "tokio1"] }

[dependencies.sea-orm-migration]
path = "../../../sea-orm-migration" # remove this line in your own project
version = "0.12.11" # sea-orm-migration version
version = "0.12.12" # sea-orm-migration version
features = [
# Enable following runtime and db backend features if you want to run migration via CLI
# "runtime-tokio-rustls",
Expand Down
2 changes: 1 addition & 1 deletion examples/tonic_example/service/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ entity = { path = "../entity" }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "0.12.11" # sea-orm version
version = "0.12.12" # sea-orm version
features = [
"debug-print",
"runtime-tokio-rustls",
Expand Down
4 changes: 2 additions & 2 deletions sea-orm-cli/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

[package]
name = "sea-orm-cli"
version = "0.12.11"
version = "0.12.12"
authors = [
"Chris Tsang <[email protected]>",
"Billy Chan <[email protected]>",
Expand Down Expand Up @@ -37,7 +37,7 @@ required-features = ["cli", "codegen"]
clap = { version = "4.3", features = ["env", "derive"], optional = true }
dotenvy = { version = "0.15", default-features = false, optional = true }
async-std = { version = "1.9", default-features = false, features = ["attributes", "tokio1"], optional = true }
sea-orm-codegen = { version = "=0.12.11", path = "../sea-orm-codegen", default-features = false, optional = true }
sea-orm-codegen = { version = "=0.12.12", path = "../sea-orm-codegen", default-features = false, optional = true }
sea-schema = { version = "0.14.2" }
sqlx = { version = "0.7", default-features = false, features = ["mysql", "postgres"], optional = true }
tracing-subscriber = { version = "0.3.17", default-features = false, features = ["env-filter", "fmt"] }
Expand Down
2 changes: 1 addition & 1 deletion sea-orm-codegen/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sea-orm-codegen"
version = "0.12.11"
version = "0.12.12"
authors = ["Billy Chan <[email protected]>"]
edition = "2021"
description = "Code Generator for SeaORM"
Expand Down
2 changes: 1 addition & 1 deletion sea-orm-macros/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sea-orm-macros"
version = "0.12.11"
version = "0.12.12"
authors = [ "Billy Chan <[email protected]>" ]
edition = "2021"
description = "Derive macros for SeaORM"
Expand Down
6 changes: 3 additions & 3 deletions sea-orm-migration/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

[package]
name = "sea-orm-migration"
version = "0.12.11"
version = "0.12.12"
authors = ["Billy Chan <[email protected]>"]
edition = "2021"
description = "Migration utility for SeaORM"
Expand All @@ -23,8 +23,8 @@ path = "src/lib.rs"
async-trait = { version = "0.1", default-features = false }
clap = { version = "4.3", features = ["env", "derive"], optional = true }
dotenvy = { version = "0.15", default-features = false, optional = true }
sea-orm = { version = "0.12.11", path = "../", default-features = false, features = ["macros"] }
sea-orm-cli = { version = "0.12.11", path = "../sea-orm-cli", default-features = false, optional = true }
sea-orm = { version = "0.12.12", path = "../", default-features = false, features = ["macros"] }
sea-orm-cli = { version = "0.12.12", path = "../sea-orm-cli", default-features = false, optional = true }
sea-schema = { version = "0.14.1" }
tracing = { version = "0.1", default-features = false, features = ["log"] }
tracing-subscriber = { version = "0.3.17", default-features = false, features = ["env-filter", "fmt"] }
Expand Down

0 comments on commit dab6c7e

Please sign in to comment.