Merge branch 'master' into insert-no-panic

SeaQL · Dec 2, 2024 · d279f3e · d279f3e
2 parents f7561c7 + 760b825
commit d279f3e
Show file tree

Hide file tree

Showing 52 changed files with 105 additions and 64 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+
+## 1.1.2 - 2024-12-02
+
+### Enhancements
+
+- Added `ColumnTrait::enum_type_name()` to signify enum types https://github.com/SeaQL/sea-orm/pull/2415
+- Added `DbBackend::boolean_value()` for database dependent boolean value https://github.com/SeaQL/sea-orm/pull/2415
+
 ## 1.1.1 - 2024-11-04
 
 ### Enhancements

diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ members = [".", "sea-orm-macros", "sea-orm-codegen"]
 
 [package]
 name = "sea-orm"
-version = "1.1.1"
+version = "1.1.2"
 authors = ["Chris Tsang <[email protected]>"]
 edition = "2021"
 description = "🐚 An async & dynamic ORM for Rust"
@@ -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.4", default-features = false, optional = true }
-sea-orm-macros = { version = "~1.1.1", path = "sea-orm-macros", default-features = false, features = ["strum"] }
+sea-orm-macros = { version = "~1.1.2", path = "sea-orm-macros", default-features = false, features = ["strum"] }
 sea-query = { version = "0.32.1", default-features = false, features = ["thread-safe", "hashable-value", "backend-mysql", "backend-postgres", "backend-sqlite"] }
 sea-query-binder = { version = "0.7.0", default-features = false, optional = true }
 strum = { version = "0.26", default-features = false }

diff --git a/examples/actix_example/entity/Cargo.toml b/examples/actix_example/entity/Cargo.toml
@@ -13,4 +13,4 @@ serde = { version = "1", features = ["derive"] }
 
 [dependencies.sea-orm]
 path = "../../../" # remove this line in your own project
-version = "~1.1.1" # sea-orm version
+version = "~1.1.2" # sea-orm version
diff --git a/examples/actix_example/migration/Cargo.toml b/examples/actix_example/migration/Cargo.toml
@@ -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 = "~1.1.1" # sea-orm-migration version
+version = "~1.1.2" # sea-orm-migration version
 features = [
   # Enable following runtime and db backend features if you want to run migration via CLI
   # "runtime-actix-native-tls",

diff --git a/examples/actix_example/service/Cargo.toml b/examples/actix_example/service/Cargo.toml
@@ -10,7 +10,7 @@ entity = { path = "../entity" }
 
 [dependencies.sea-orm]
 path = "../../../" # remove this line in your own project
-version = "~1.1.1" # sea-orm version
+version = "~1.1.2" # sea-orm version
 features = [
     "debug-print",
     "runtime-async-std-native-tls",

diff --git a/examples/axum_example/entity/Cargo.toml b/examples/axum_example/entity/Cargo.toml
@@ -13,4 +13,4 @@ serde = { version = "1", features = ["derive"] }
 
 [dependencies.sea-orm]
 path = "../../../" # remove this line in your own project
-version = "~1.1.1" # sea-orm version
+version = "~1.1.2" # sea-orm version
diff --git a/examples/axum_example/migration/Cargo.toml b/examples/axum_example/migration/Cargo.toml
@@ -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 = "~1.1.1" # sea-orm-migration version
+version = "~1.1.2" # sea-orm-migration version
 features = [
   # Enable following runtime and db backend features if you want to run migration via CLI
   # "runtime-tokio-native-tls",

diff --git a/examples/axum_example/service/Cargo.toml b/examples/axum_example/service/Cargo.toml
@@ -10,7 +10,7 @@ entity = { path = "../entity" }
 
 [dependencies.sea-orm]
 path = "../../../" # remove this line in your own project
-version = "~1.1.1" # sea-orm version
+version = "~1.1.2" # sea-orm version
 features = [
     "debug-print",
     "runtime-tokio-native-tls",

diff --git a/examples/graphql_example/entity/Cargo.toml b/examples/graphql_example/entity/Cargo.toml
@@ -16,4 +16,4 @@ version = "5.0.10"
 
 [dependencies.sea-orm]
 path = "../../../" # remove this line in your own project
-version = "~1.1.1" # sea-orm version
+version = "~1.1.2" # sea-orm version
diff --git a/examples/graphql_example/migration/Cargo.toml b/examples/graphql_example/migration/Cargo.toml
@@ -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 = "~1.1.1" # sea-orm-migration version
+version = "~1.1.2" # sea-orm-migration version
 features = [
   # Enable following runtime and db backend features if you want to run migration via CLI
   # "runtime-tokio-native-tls",

diff --git a/examples/graphql_example/service/Cargo.toml b/examples/graphql_example/service/Cargo.toml
@@ -10,7 +10,7 @@ entity = { path = "../entity" }
 
 [dependencies.sea-orm]
 path = "../../../" # remove this line in your own project
-version = "~1.1.1" # sea-orm version
+version = "~1.1.2" # sea-orm version
 features = [
     "debug-print",
     "runtime-async-std-native-tls",

diff --git a/examples/jsonrpsee_example/entity/Cargo.toml b/examples/jsonrpsee_example/entity/Cargo.toml
@@ -13,4 +13,4 @@ serde = { version = "1", features = ["derive"] }
 
 [dependencies.sea-orm]
 path = "../../../" # remove this line in your own project
-version = "~1.1.1" # sea-orm version
+version = "~1.1.2" # sea-orm version
diff --git a/examples/jsonrpsee_example/migration/Cargo.toml b/examples/jsonrpsee_example/migration/Cargo.toml
@@ -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 = "~1.1.1" # sea-orm-migration version
+version = "~1.1.2" # sea-orm-migration version
 features = [
   # Enable following runtime and db backend features if you want to run migration via CLI
   # "runtime-tokio-native-tls",

diff --git a/examples/jsonrpsee_example/service/Cargo.toml b/examples/jsonrpsee_example/service/Cargo.toml
@@ -10,7 +10,7 @@ entity = { path = "../entity" }
 
 [dependencies.sea-orm]
 path = "../../../" # remove this line in your own project
-version = "~1.1.1" # sea-orm version
+version = "~1.1.2" # sea-orm version
 features = [
     "debug-print",
     "runtime-tokio-native-tls",

diff --git a/examples/loco_example/Cargo.toml b/examples/loco_example/Cargo.toml
@@ -27,7 +27,7 @@ tracing-subscriber = { version = "0.3.17", features = ["env-filter", "json"] }
 
 [dependencies.sea-orm]
 path = "../../" # remove this line in your own project
-version = "~1.1.1" # sea-orm version
+version = "~1.1.2" # sea-orm version
 features = [
   "sqlx-sqlite",
   "sqlx-postgres",

diff --git a/examples/loco_example/migration/Cargo.toml b/examples/loco_example/migration/Cargo.toml
@@ -14,7 +14,7 @@ loco-rs = { version = "0.7" }
 
 [dependencies.sea-orm-migration]
 path = "../../../sea-orm-migration" # remove this line in your own project
-version = "~1.1.1" # sea-orm-migration version
+version = "~1.1.2" # sea-orm-migration version
 features = [
   # Enable at least one `ASYNC_RUNTIME` and `DATABASE_DRIVER` feature if you want to run migration via CLI.
   # View the list of supported features at https://www.sea-ql.org/SeaORM/docs/install-and-config/database-and-async-runtime.

diff --git a/examples/loco_seaography/Cargo.toml b/examples/loco_seaography/Cargo.toml
@@ -34,7 +34,7 @@ tower-service = { version = "0.3" }
 
 [dependencies.sea-orm]
 path = "../../" # remove this line in your own project
-version = "~1.1.1" # sea-orm version
+version = "~1.1.2" # sea-orm version
 features = [
   "sqlx-sqlite",
   "sqlx-postgres",

diff --git a/examples/loco_seaography/migration/Cargo.toml b/examples/loco_seaography/migration/Cargo.toml
@@ -14,7 +14,7 @@ loco-rs = { version = "0.7.0" }
 
 [dependencies.sea-orm-migration]
 path = "../../../sea-orm-migration" # remove this line in your own project
-version = "~1.1.1" # sea-orm-migration version
+version = "~1.1.2" # sea-orm-migration version
 features = [
   # Enable at least one `ASYNC_RUNTIME` and `DATABASE_DRIVER` feature if you want to run migration via CLI.
   # View the list of supported features at https://www.sea-ql.org/SeaORM/docs/install-and-config/database-and-async-runtime.

diff --git a/examples/loco_starter/Cargo.toml b/examples/loco_starter/Cargo.toml
@@ -28,7 +28,7 @@ tracing-subscriber = { version = "0.3.17", features = ["env-filter", "json"] }
 
 [dependencies.sea-orm]
 path = "../../" # remove this line in your own project
-version = "~1.1.1" # sea-orm version
+version = "~1.1.2" # sea-orm version
 features = [
   "sqlx-sqlite",
   "sqlx-postgres",

diff --git a/examples/loco_starter/migration/Cargo.toml b/examples/loco_starter/migration/Cargo.toml
@@ -14,7 +14,7 @@ loco-rs = { version = "0.7.0" }
 
 [dependencies.sea-orm-migration]
 path = "../../../sea-orm-migration" # remove this line in your own project
-version = "~1.1.1" # sea-orm-migration version
+version = "~1.1.2" # sea-orm-migration version
 features = [
   # Enable at least one `ASYNC_RUNTIME` and `DATABASE_DRIVER` feature if you want to run migration via CLI.
   # View the list of supported features at https://www.sea-ql.org/SeaORM/docs/install-and-config/database-and-async-runtime.

diff --git a/examples/poem_example/entity/Cargo.toml b/examples/poem_example/entity/Cargo.toml
@@ -13,4 +13,4 @@ serde = { version = "1", features = ["derive"] }
 
 [dependencies.sea-orm]
 path = "../../../" # remove this line in your own project
-version = "~1.1.1" # sea-orm version
+version = "~1.1.2" # sea-orm version
diff --git a/examples/poem_example/migration/Cargo.toml b/examples/poem_example/migration/Cargo.toml
@@ -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 = "~1.1.1" # sea-orm-migration version
+version = "~1.1.2" # sea-orm-migration version
 features = [
   # Enable following runtime and db backend features if you want to run migration via CLI
   # "runtime-tokio-native-tls",

diff --git a/examples/poem_example/service/Cargo.toml b/examples/poem_example/service/Cargo.toml
@@ -10,7 +10,7 @@ entity = { path = "../entity" }
 
 [dependencies.sea-orm]
 path = "../../../" # remove this line in your own project
-version = "~1.1.1" # sea-orm version
+version = "~1.1.2" # sea-orm version
 features = [
     "debug-print",
     "runtime-async-std-native-tls",

diff --git a/examples/react_admin/backend/Cargo.toml b/examples/react_admin/backend/Cargo.toml
@@ -34,7 +34,7 @@ tower-service = { version = "0.3" }
 
 [dependencies.sea-orm]
 path = "../../../" # remove this line in your own project
-version = "~1.1.1" # sea-orm version
+version = "~1.1.2" # sea-orm version
 features = [
   "sqlx-sqlite",
   "sqlx-postgres",

diff --git a/examples/react_admin/backend/migration/Cargo.toml b/examples/react_admin/backend/migration/Cargo.toml
@@ -14,7 +14,7 @@ loco-rs = { version = "0.7.0" }
 
 [dependencies.sea-orm-migration]
 path = "../../../../sea-orm-migration" # remove this line in your own project
-version = "~1.1.1" # sea-orm-migration version
+version = "~1.1.2" # sea-orm-migration version
 features = [
   # Enable at least one `ASYNC_RUNTIME` and `DATABASE_DRIVER` feature if you want to run migration via CLI.
   # View the list of supported features at https://www.sea-ql.org/SeaORM/docs/install-and-config/database-and-async-runtime.

diff --git a/examples/rocket_example/entity/Cargo.toml b/examples/rocket_example/entity/Cargo.toml
@@ -13,4 +13,4 @@ rocket = { version = "0.5.0", features = ["json"] }
 
 [dependencies.sea-orm]
 path = "../../../" # remove this line in your own project
-version = "~1.1.1" # sea-orm version
+version = "~1.1.2" # sea-orm version
diff --git a/examples/rocket_example/migration/Cargo.toml b/examples/rocket_example/migration/Cargo.toml
@@ -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 = "~1.1.1" # sea-orm-migration version
+version = "~1.1.2" # sea-orm-migration version
 features = [
   # Enable following runtime and db backend features if you want to run migration via CLI
   # "runtime-tokio-native-tls",

diff --git a/examples/rocket_example/service/Cargo.toml b/examples/rocket_example/service/Cargo.toml
@@ -10,7 +10,7 @@ entity = { path = "../entity" }
 
 [dependencies.sea-orm]
 path = "../../../" # remove this line in your own project
-version = "~1.1.1" # sea-orm version
+version = "~1.1.2" # sea-orm version
 features = [
     "runtime-tokio-native-tls",
     "sqlx-postgres",

diff --git a/examples/rocket_okapi_example/entity/Cargo.toml b/examples/rocket_okapi_example/entity/Cargo.toml
@@ -13,7 +13,7 @@ rocket = { version = "0.5.0", features = ["json"] }
 
 [dependencies.sea-orm]
 path = "../../../" # remove this line in your own project
-version = "~1.1.1" # sea-orm version
+version = "~1.1.2" # sea-orm version
 
 [dependencies.rocket_okapi]
 version = "0.8.0"
diff --git a/examples/rocket_okapi_example/migration/Cargo.toml b/examples/rocket_okapi_example/migration/Cargo.toml
@@ -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 = "~1.1.1" # sea-orm-migration version
+version = "~1.1.2" # sea-orm-migration version
 features = [
   # Enable following runtime and db backend features if you want to run migration via CLI
   # "runtime-tokio-native-tls",

diff --git a/examples/rocket_okapi_example/service/Cargo.toml b/examples/rocket_okapi_example/service/Cargo.toml
@@ -10,7 +10,7 @@ entity = { path = "../entity" }
 
 [dependencies.sea-orm]
 path = "../../../" # remove this line in your own project
-version = "~1.1.1" # sea-orm version
+version = "~1.1.2" # sea-orm version
 features = [
     "runtime-tokio-native-tls",
 #    "sqlx-postgres",

diff --git a/examples/salvo_example/entity/Cargo.toml b/examples/salvo_example/entity/Cargo.toml
@@ -14,4 +14,4 @@ salvo = { version = "0.50" }
 
 [dependencies.sea-orm]
 path = "../../../" # remove this line in your own project
-version = "~1.1.1" # sea-orm version
+version = "~1.1.2" # sea-orm version
diff --git a/examples/salvo_example/migration/Cargo.toml b/examples/salvo_example/migration/Cargo.toml
@@ -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 = "~1.1.1" # sea-orm-migration version
+version = "~1.1.2" # sea-orm-migration version
 features = [
   # Enable following runtime and db backend features if you want to run migration via CLI
   # "runtime-tokio-native-tls",

diff --git a/examples/salvo_example/service/Cargo.toml b/examples/salvo_example/service/Cargo.toml
@@ -10,7 +10,7 @@ entity = { path = "../entity" }
 
 [dependencies.sea-orm]
 path = "../../../" # remove this line in your own project
-version = "~1.1.1" # sea-orm version
+version = "~1.1.2" # sea-orm version
 features = [
     "debug-print",
     "runtime-tokio-native-tls",

diff --git a/examples/seaography_example/migration/Cargo.toml b/examples/seaography_example/migration/Cargo.toml
@@ -15,11 +15,11 @@ async-std = { version = "1", features = ["attributes", "tokio1"] }
 
 [dependencies.sea-orm]
 path = "../../../" # remove this line in your own project
-version = "~1.1.1" # sea-orm version
+version = "~1.1.2" # sea-orm version
 
 [dependencies.sea-orm-migration]
 path = "../../../sea-orm-migration" # remove this line in your own project
-version = "~1.1.1" # sea-orm-migration version
+version = "~1.1.2" # sea-orm-migration version
 features = [
   "runtime-async-std-native-tls",
   "sqlx-mysql",

diff --git a/examples/tonic_example/entity/Cargo.toml b/examples/tonic_example/entity/Cargo.toml
@@ -13,4 +13,4 @@ serde = { version = "1", features = ["derive"] }
 
 [dependencies.sea-orm]
 path = "../../../" # remove this line in your own project
-version = "~1.1.1" # sea-orm version
+version = "~1.1.2" # sea-orm version
diff --git a/examples/tonic_example/migration/Cargo.toml b/examples/tonic_example/migration/Cargo.toml
@@ -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 = "~1.1.1" # sea-orm-migration version
+version = "~1.1.2" # sea-orm-migration version
 features = [
   # Enable following runtime and db backend features if you want to run migration via CLI
   # "runtime-tokio-rustls",

diff --git a/examples/tonic_example/service/Cargo.toml b/examples/tonic_example/service/Cargo.toml
@@ -10,7 +10,7 @@ entity = { path = "../entity" }
 
 [dependencies.sea-orm]
 path = "../../../" # remove this line in your own project
-version = "~1.1.1" # sea-orm version
+version = "~1.1.2" # sea-orm version
 features = [
     "debug-print",
     "runtime-tokio-rustls",

diff --git a/sea-orm-cli/Cargo.toml b/sea-orm-cli/Cargo.toml
@@ -3,7 +3,7 @@
 
 [package]
 name = "sea-orm-cli"
-version = "1.1.1"
+version = "1.1.2"
 authors = [
     "Chris Tsang <[email protected]>",
     "Billy Chan <[email protected]>",
@@ -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 = "=1.1.1", path = "../sea-orm-codegen", default-features = false, optional = true }
+sea-orm-codegen = { version = "=1.1.2", path = "../sea-orm-codegen", default-features = false, optional = true }
 sea-schema = { version = "0.16.0" }
 sqlx = { version = "0.8.2", default-features = false, features = ["mysql", "postgres"], optional = true }
 tracing-subscriber = { version = "0.3.17", default-features = false, features = ["env-filter", "fmt"] }

diff --git a/sea-orm-codegen/Cargo.toml b/sea-orm-codegen/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sea-orm-codegen"
-version = "1.1.1"
+version = "1.1.2"
 authors = ["Billy Chan <[email protected]>"]
 edition = "2021"
 description = "Code Generator for SeaORM"

diff --git a/sea-orm-macros/Cargo.toml b/sea-orm-macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sea-orm-macros"
-version = "1.1.1"
+version = "1.1.2"
 authors = [ "Billy Chan <[email protected]>" ]
 edition = "2021"
 description = "Derive macros for SeaORM"

diff --git a/sea-orm-macros/src/derives/active_enum.rs b/sea-orm-macros/src/derives/active_enum.rs
@@ -414,6 +414,10 @@ impl ActiveEnum {
                         .to_owned()
                         .into()
                 }
+
+                fn enum_type_name() -> Option<&'static str> {
+                    Some(stringify!(#ident))
+                }
             }
 
             #[automatically_derived]

diff --git a/sea-orm-macros/src/derives/case_style.rs b/sea-orm-macros/src/derives/case_style.rs
@@ -111,7 +111,7 @@ impl CaseStyleHelpers for Ident {
     }
 }
 
-impl<'meta> TryFrom<&ParseNestedMeta<'meta>> for CaseStyle {
+impl TryFrom<&ParseNestedMeta<'_>> for CaseStyle {
     type Error = syn::Error;
 
     fn try_from(value: &ParseNestedMeta) -> Result<Self, Self::Error> {