Merge branch 'master' into sqlx-0.8

SeaQL · Aug 6, 2024 · 2209212 · 2209212
2 parents 89a03b1 + 7e433df
commit 2209212
Show file tree

Hide file tree

Showing 44 changed files with 80 additions and 98 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,17 +5,17 @@ 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.0.0 - Pending
+## 1.0.0 - 2024-08-02
 
 ### Versions
 
-+ `1.0.0-rc.7`: 2024-06-25
-+ `1.0.0-rc.6`: 2024-06-19
-+ `1.0.0-rc.5`: 2024-05-29
-+ `1.0.0-rc.4`: 2024-05-13
-+ `1.0.0-rc.3`: 2024-03-26
-+ `1.0.0-rc.2`: 2024-03-15
 + `1.0.0-rc.1`: 2024-02-06
++ `1.0.0-rc.2`: 2024-03-15
++ `1.0.0-rc.3`: 2024-03-26
++ `1.0.0-rc.4`: 2024-05-13
++ `1.0.0-rc.5`: 2024-05-29
++ `1.0.0-rc.6`: 2024-06-19
++ `1.0.0-rc.7`: 2024-06-25
 
 ### New Features
 

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.0.0-rc.7"
+version = "1.0.0"
 authors = ["Chris Tsang <[email protected]>"]
 edition = "2021"
 description = "🐚 An async & dynamic ORM for Rust"
@@ -33,9 +33,9 @@ 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.0.0-rc.7", path = "sea-orm-macros", default-features = false, features = ["strum"] }
-sea-query = { version = "0.31.0-rc.8", default-features = false, features = ["thread-safe", "hashable-value", "backend-mysql", "backend-postgres", "backend-sqlite"] }
-sea-query-binder = { version = "0.6.0-rc.4", default-features = false, optional = true }
+sea-orm-macros = { version = "~1.0.0", path = "sea-orm-macros", default-features = false, features = ["strum"] }
+sea-query = { version = "0.31.0", default-features = false, features = ["thread-safe", "hashable-value", "backend-mysql", "backend-postgres", "backend-sqlite"] }
+sea-query-binder = { version = "0.6.0", default-features = false, optional = true }
 strum = { version = "0.26", default-features = false }
 serde = { version = "1.0", default-features = false }
 serde_json = { version = "1.0", default-features = false, optional = true }
@@ -92,38 +92,14 @@ sqlx-postgres = ["sqlx-dep", "sea-query-binder/sqlx-postgres", "sqlx/postgres",
 sqlx-sqlite = ["sqlx-dep", "sea-query-binder/sqlx-sqlite", "sqlx/sqlite"]
 sqlite-use-returning-for-3_35 = []
 runtime-async-std = ["sqlx?/runtime-async-std"]
-runtime-async-std-native-tls = [
-    "sqlx?/runtime-async-std-native-tls",
-    "sea-query-binder?/runtime-async-std-native-tls",
-    "runtime-async-std",
-]
-runtime-async-std-rustls = [
-    "sqlx?/runtime-async-std-rustls",
-    "sea-query-binder?/runtime-async-std-rustls",
-    "runtime-async-std",
-]
-runtime-actix = []
-runtime-actix-native-tls = [
-    "sqlx?/runtime-tokio-native-tls",
-    "sea-query-binder?/runtime-actix-native-tls",
-    "runtime-actix",
-]
-runtime-actix-rustls = [
-    "sqlx?/runtime-tokio-rustls",
-    "sea-query-binder?/runtime-actix-rustls",
-    "runtime-actix",
-]
+runtime-async-std-native-tls = ["sqlx?/runtime-async-std-native-tls", "runtime-async-std"]
+runtime-async-std-rustls = ["sqlx?/runtime-async-std-rustls", "runtime-async-std"]
+runtime-actix = ["sqlx?/runtime-tokio"]
+runtime-actix-native-tls = ["sqlx?/runtime-tokio-native-tls", "runtime-actix"]
+runtime-actix-rustls = ["sqlx?/runtime-tokio-rustls", "runtime-actix"]
 runtime-tokio = ["sqlx?/runtime-tokio"]
-runtime-tokio-native-tls = [
-    "sqlx?/runtime-tokio-native-tls",
-    "sea-query-binder?/runtime-tokio-native-tls",
-    "runtime-tokio",
-]
-runtime-tokio-rustls = [
-    "sqlx?/runtime-tokio-rustls",
-    "sea-query-binder?/runtime-tokio-rustls",
-    "runtime-tokio",
-]
+runtime-tokio-native-tls = ["sqlx?/runtime-tokio-native-tls", "runtime-tokio"]
+runtime-tokio-rustls = ["sqlx?/runtime-tokio-rustls", "runtime-tokio"]
 tests-cfg = ["serde/derive"]
 seaography = ["sea-orm-macros/seaography"]
 

diff --git a/build-tools/bump.sh b/build-tools/bump.sh
@@ -19,20 +19,20 @@ cd ..
 
 # Bump `sea-orm` version
 sed -i 's/^version.*$/version = "'$1'"/' Cargo.toml
-sed -i 's/^sea-orm-macros [^,]*,/sea-orm-macros = { version = "'$1'",/' Cargo.toml
+sed -i 's/^sea-orm-macros [^,]*,/sea-orm-macros = { version = "'~$1'",/' Cargo.toml
 
 # Bump `sea-orm-migration` version
 cd sea-orm-migration
 sed -i 's/^version.*$/version = "'$1'"/' Cargo.toml
-sed -i 's/^sea-orm-cli [^,]*,/sea-orm-cli = { version = "'$1'",/' Cargo.toml
-sed -i 's/^sea-orm [^,]*,/sea-orm = { version = "'$1'",/' Cargo.toml
+sed -i 's/^sea-orm-cli [^,]*,/sea-orm-cli = { version = "'~$1'",/' Cargo.toml
+sed -i 's/^sea-orm [^,]*,/sea-orm = { version = "'~$1'",/' Cargo.toml
 cd ..
 
 git commit -am "$1"
 
 # Bump examples' dependency version
 cd examples
-find . -depth -type f -name '*.toml' -exec sed -i 's/^version = ".*" # sea-orm version$/version = "'$1'" # sea-orm version/' {} \;
-find . -depth -type f -name '*.toml' -exec sed -i 's/^version = ".*" # sea-orm-migration version$/version = "'$1'" # sea-orm-migration version/' {} \;
+find . -depth -type f -name '*.toml' -exec sed -i 's/^version = ".*" # sea-orm version$/version = "'~$1'" # sea-orm version/' {} \;
+find . -depth -type f -name '*.toml' -exec sed -i 's/^version = ".*" # sea-orm-migration version$/version = "'~$1'" # sea-orm-migration version/' {} \;
 git add .
 git commit -m "update examples"
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.0.0-rc.7" # sea-orm version
+version = "~1.0.0" # 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.0.0-rc.7" # sea-orm-migration version
+version = "~1.0.0" # 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.0.0-rc.7" # sea-orm version
+version = "~1.0.0" # 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.0.0-rc.7" # sea-orm version
+version = "~1.0.0" # 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.0.0-rc.7" # sea-orm-migration version
+version = "~1.0.0" # 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.0.0-rc.7" # sea-orm version
+version = "~1.0.0" # 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.0.0-rc.7" # sea-orm version
+version = "~1.0.0" # 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.0.0-rc.7" # sea-orm-migration version
+version = "~1.0.0" # 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.0.0-rc.7" # sea-orm version
+version = "~1.0.0" # 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.0.0-rc.7" # sea-orm version
+version = "~1.0.0" # 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.0.0-rc.7" # sea-orm-migration version
+version = "~1.0.0" # 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.0.0-rc.7" # sea-orm version
+version = "~1.0.0" # 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.0.0-rc.7" # sea-orm version
+version = "~1.0.0" # 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.4" }
 
 [dependencies.sea-orm-migration]
 path = "../../../sea-orm-migration" # remove this line in your own project
-version = "1.0.0-rc.7" # sea-orm-migration version
+version = "~1.0.0" # 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.0.0-rc.6" # sea-orm version
+version = "~1.0.0" # 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.4.0" }
 
 [dependencies.sea-orm-migration]
 path = "../../../sea-orm-migration" # remove this line in your own project
-version = "1.0.0-rc.6" # sea-orm-migration version
+version = "~1.0.0" # 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.0.0-rc.7" # sea-orm version
+version = "~1.0.0" # 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.4.0" }
 
 [dependencies.sea-orm-migration]
 path = "../../../sea-orm-migration" # remove this line in your own project
-version = "1.0.0-rc.7" # sea-orm-migration version
+version = "~1.0.0" # 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.0.0-rc.7" # sea-orm version
+version = "~1.0.0" # 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.0.0-rc.7" # sea-orm-migration version
+version = "~1.0.0" # 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.0.0-rc.7" # sea-orm version
+version = "~1.0.0" # sea-orm version
 features = [
     "debug-print",
     "runtime-async-std-native-tls",

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.0.0-rc.7" # sea-orm version
+version = "~1.0.0" # 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.0.0-rc.7" # sea-orm-migration version
+version = "~1.0.0" # 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.0.0-rc.7" # sea-orm version
+version = "~1.0.0" # 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.0.0-rc.7" # sea-orm version
+version = "~1.0.0" # 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.0.0-rc.7" # sea-orm-migration version
+version = "~1.0.0" # 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.0.0-rc.7" # sea-orm version
+version = "~1.0.0" # 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.0.0-rc.7" # sea-orm version
+version = "~1.0.0" # 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.0.0-rc.7" # sea-orm-migration version
+version = "~1.0.0" # 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.0.0-rc.7" # sea-orm version
+version = "~1.0.0" # 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.0.0-rc.7" # sea-orm version
+version = "~1.0.0" # sea-orm version
 
 [dependencies.sea-orm-migration]
 path = "../../../sea-orm-migration" # remove this line in your own project
-version = "1.0.0-rc.7" # sea-orm-migration version
+version = "~1.0.0" # 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.0.0-rc.7" # sea-orm version
+version = "~1.0.0" # 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.0.0-rc.7" # sea-orm-migration version
+version = "~1.0.0" # sea-orm-migration version
 features = [
   # Enable following runtime and db backend features if you want to run migration via CLI
   # "runtime-tokio-rustls",