Merge branch 'master' into set-if-not-equals

SeaQL · May 9, 2024 · 605ea19 · 605ea19
2 parents b2b0a40 + e77cc5f
commit 605ea19
Show file tree

Hide file tree

Showing 96 changed files with 1,194 additions and 669 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,22 @@ 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-rc.4 - 2024-05-13
+
+### Enhancements
+
+* Added `QueryResult::column_names` https://github.com/SeaQL/sea-orm/pull/2148
+* [sea-orm-macro] Add `@generated` in generated code https://github.com/SeaQL/sea-orm/pull/2199
+
+### Upgrades
+
+* Upgrade `sea-query` to `0.31.0-rc.6`
+* Upgrade `sea-schema` to `0.15.0-rc.6`
+
+### House Keeping
+
+* Reduce warnings in integration tests https://github.com/SeaQL/sea-orm/pull/2177
+
 ## 1.0.0-rc.3 - 2024-03-26
 
 ### Enhancements
@@ -34,6 +50,8 @@ struct EntityNameNotAIdent {
 ```
 * Added `RelationDef::from_alias()` https://github.com/SeaQL/sea-orm/pull/2146
 ```rust
+let cf = Alias::new("cf");
+
 assert_eq!(
     cake::Entity::find()
         .join_as(

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.3"
+version = "1.0.0-rc.4"
 authors = ["Chris Tsang <chris.2y3@outlook.com>"]
 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.3", default-features = false, optional = true }
-sea-orm-macros = { version = "1.0.0-rc.3", path = "sea-orm-macros", default-features = false, features = ["strum"] }
-sea-query = { version = "0.31.0-rc.3", default-features = false, features = ["thread-safe", "hashable-value", "backend-mysql", "backend-postgres", "backend-sqlite"] }
-sea-query-binder = { version = "0.6.0-rc.1", default-features = false, optional = true }
+sea-orm-macros = { version = "1.0.0-rc.4", path = "sea-orm-macros", default-features = false, features = ["strum"] }
+sea-query = { version = "0.31.0-rc", default-features = false, features = ["thread-safe", "hashable-value", "backend-mysql", "backend-postgres", "backend-sqlite"] }
+sea-query-binder = { version = "0.6.0-rc", 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 }

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.3" # sea-orm version
+version = "1.0.0-rc.4" # 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.3" # sea-orm-migration version
+version = "1.0.0-rc.4" # 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.3" # sea-orm version
+version = "1.0.0-rc.4" # 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.3" # sea-orm version
+version = "1.0.0-rc.4" # 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.3" # sea-orm-migration version
+version = "1.0.0-rc.4" # 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.3" # sea-orm version
+version = "1.0.0-rc.4" # 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.3" # sea-orm version
+version = "1.0.0-rc.4" # 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.3" # sea-orm-migration version
+version = "1.0.0-rc.4" # 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.3" # sea-orm version
+version = "1.0.0-rc.4" # 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.3" # sea-orm version
+version = "1.0.0-rc.4" # 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.3" # sea-orm-migration version
+version = "1.0.0-rc.4" # 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.3" # sea-orm version
+version = "1.0.0-rc.4" # sea-orm version
 features = [
     "debug-print",
     "runtime-tokio-native-tls",