Merge remote-tracking branch 'root/master'

.github/workflows/rust.yml

@@ -243,7 +243,7 @@ jobs:
  examples/poem_example,
  examples/proxy_gluesql_example,
  examples/rocket_example,
- # examples/rocket_okapi_example,
+ examples/rocket_okapi_example,
  examples/salvo_example,
  examples/seaography_example,
  examples/tonic_example,

CHANGELOG.md

@@ -10,10 +10,51 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Breaking Changes
 
 * Updated Strum to version 0.26 https://github.com/SeaQL/sea-orm/pull/2088
+* Renamed `ConnectOptions::pool_options()` to `ConnectOptions::sqlx_pool_options()` https://github.com/SeaQL/sea-orm/pull/2145
+* Made `sqlx_common` private, hiding `sqlx_error_to_xxx_err` https://github.com/SeaQL/sea-orm/pull/2145
 
 ### Enhancements
 
 * [sea-orm-cli] Fix `migrate generate` on empty `mod.rs` files
+* `DerivePartialModel` macro attribute `entity` now supports `syn::Type` https://github.com/SeaQL/sea-orm/pull/2137
+```rust
+#[derive(DerivePartialModel)]
+#[sea_orm(entity = "<entity::Model as ModelTrait>::Entity")]
+struct EntityNameNotAIdent {
+ #[sea_orm(from_col = "foo2")]
+ _foo: i32,
+ #[sea_orm(from_col = "bar2")]
+ _bar: String,
+}
+```
+* Added `RelationDef::from_alias()` https://github.com/SeaQL/sea-orm/pull/2146
+```rust
+assert_eq!(
+ cake::Entity::find()
+ .join_as(
+ JoinType::LeftJoin,
+ cake_filling::Relation::Cake.def().rev(),
+ cf.clone()
+ )
+ .join(
+ JoinType::LeftJoin,
+ cake_filling::Relation::Filling.def().from_alias(cf)
+ )
+ .build(DbBackend::MySql)
+ .to_string(),
+ [
+ "SELECT `cake`.`id`, `cake`.`name` FROM `cake`",
+ "LEFT JOIN `cake_filling` AS `cf` ON `cake`.`id` = `cf`.`cake_id`",
+ "LEFT JOIN `filling` ON `cf`.`filling_id` = `filling`.`id`",
+ ]
+ .join(" ")
+);
+```
+
+### House keeping
+
+* Improved Actix example to return 404 not found on unexpected inputs https://github.com/SeaQL/sea-orm/pull/2140
+* Re-enable `rocket_okapi` example https://github.com/SeaQL/sea-orm/pull/2136
 
 ## 1.0.0-rc.1 - 2024-02-06
 

examples/actix_example/api/src/lib.rs

@@ -89,24 +89,34 @@ async fn create(
  .finish())
 }
 
-#[get("/{id}")]
+#[get(r#"/{id:\d+}"#)]
 async fn edit(data: web::Data<AppState>, id: web::Path<i32>) -> Result<HttpResponse, Error> {
  let conn = &data.conn;
  let template = &data.templates;
  let id = id.into_inner();
 
- let post: post::Model = Query::find_post_by_id(conn, id)
+ let post: Option<post::Model> = Query::find_post_by_id(conn, id)
  .await
- .expect("could not find post")
- .unwrap_or_else(|| panic!("could not find post with id {id}"));
+ .expect("could not find post");
 
  let mut ctx = tera::Context::new();
- ctx.insert("post", &post);
-
- let body = template
- .render("edit.html.tera", &ctx)
- .map_err(|_| error::ErrorInternalServerError("Template error"))?;
- Ok(HttpResponse::Ok().content_type("text/html").body(body))
+ let body = match post {
+ Some(post) => {
+ ctx.insert("post", &post);
+
+ template
+ .render("edit.html.tera", &ctx)
+ .map_err(|_| error::ErrorInternalServerError("Template error"))
+ }
+ None => {
+ ctx.insert("uri", &format!("/{}", id));
+
+ template
+ .render("error/404.html.tera", &ctx)
+ .map_err(|_| error::ErrorInternalServerError("Template error"))
+ }
+ };
+ Ok(HttpResponse::Ok().content_type("text/html").body(body?))
 }
 
 #[post("/{id}")]

examples/basic/src/example_filling.rs

@@ -55,7 +55,7 @@ impl ColumnTrait for Column {
  fn def(&self) -> ColumnDef {
  match self {
  Self::Id => ColumnType::Integer.def(),
- Self::Name => ColumnType::string(None).def(),
+ Self::Name => ColumnType::String(StringLen::None).def(),
  }
  }
 }

examples/basic/src/example_fruit.rs

@@ -62,7 +62,7 @@ impl ColumnTrait for Column {
  fn def(&self) -> ColumnDef {
  match self {
  Self::Id => ColumnType::Integer.def(),
- Self::Name => ColumnType::string(None).def(),
+ Self::Name => ColumnType::String(StringLen::None).def(),
  Self::CakeId => ColumnType::Integer.def(),
  }
  }

examples/rocket_okapi_example/README.md

@@ -1,8 +1,8 @@
 # Rocket and Rocket-API with SeaORM example app
 
-1. Modify the `url` var in `api/Rocket.toml` to point to your chosen database
+1. Modify the `url` var in `api/Rocket.toml` to point to your chosen database (or leave it as-is to use in-memory SQLite)
 
-1. Turn on the appropriate database feature for your chosen db in `service/Cargo.toml` (the `"sqlx-postgres",` line)
+1. If not using the SQLite DB: turn on the appropriate database feature for your chosen db in `service/Cargo.toml` (the `"sqlx-postgres",` line)
 
 1. Execute `cargo run` to start the server
 

examples/rocket_okapi_example/Rocket.toml

@@ -8,4 +8,8 @@ template_dir = "api/templates/"
 
 # Postgres
 # make sure to enable "sqlx-postgres" feature in Cargo.toml, i.e default = ["sqlx-postgres"]
-url = "postgres://user:pass@localhost:5432/rocket"
+# url = "postgres://user:pass@localhost:5432/rocket"
+
+# SQLite
+# make sure to enable "sqlx-sqlite" feature in Cargo.toml, i.e default = ["sqlx-sqlite"]
+url = "sqlite::memory:"

examples/rocket_okapi_example/api/Cargo.toml

@@ -12,7 +12,9 @@ rocket-okapi-example-service = { path = "../service" }
 futures = { version = "0.3" }
 futures-util = { version = "0.3" }
 rocket = { version = "0.5.0", features = ["json"] }
+rocket_cors = "0.6.0"
 rocket_dyn_templates = { version = "0.1.0-rc.1", features = ["tera"] }
+rocket_okapi = { version = "0.8.0", features = ["swagger", "rapidoc", "rocket_db_pools"] }
 serde_json = { version = "1" }
 entity = { path = "../entity" }
 migration = { path = "../migration" }
@@ -26,12 +28,3 @@ features = [
  "rocket_okapi",
 ] # enables rocket_okapi so to have open api features enabled
 # version = "0.5"
-
-[dependencies.rocket_okapi]
-version = "0.8.0-rc.2"
-features = ["swagger", "rapidoc", "rocket_db_pools"]
-
-[dependencies.rocket_cors]
-git = "https://github.com/lawliet89/rocket_cors.git"
-rev = "54fae070"
-default-features = false

examples/rocket_okapi_example/api/src/okapi_example.rs

@@ -11,7 +11,6 @@ use crate::pool;
 use pool::Db;
 
 pub use entity::post;
-pub use entity::post::Entity as Post;
 
 use rocket_okapi::settings::OpenApiSettings;
 

examples/rocket_okapi_example/dto/Cargo.toml

@@ -15,4 +15,4 @@ rocket = { version = "0.5.0", features = ["json"] }
 path = "../entity"
 
 [dependencies.rocket_okapi]
-version = "0.8.0-rc.2"
+version = "0.8.0"

examples/rocket_okapi_example/entity/Cargo.toml

@@ -16,4 +16,4 @@ path = "../../../" # remove this line in your own project
 version = "1.0.0-rc.1" # sea-orm version
 
 [dependencies.rocket_okapi]
-version = "0.8.0-rc.2"
+version = "0.8.0"

examples/rocket_okapi_example/service/Cargo.toml

@@ -13,9 +13,9 @@ path = "../../../" # remove this line in your own project
 version = "1.0.0-rc.1" # sea-orm version
 features = [
  "runtime-tokio-native-tls",
- "sqlx-postgres",
-  # "sqlx-mysql",
- # "sqlx-sqlite",
+# "sqlx-postgres",
+# "sqlx-mysql",
+ "sqlx-sqlite",
 ]
 
 [dev-dependencies]

issues/1143/src/entity/sea_orm_active_enums.rs

@@ -1,7 +1,7 @@
 use sea_orm::entity::prelude::*;
 
 #[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
-#[sea_orm(rs_type = "String", db_type = "string(Some(1))")]
+#[sea_orm(rs_type = "String", db_type = "String(StringLen::N(1))")]
 pub enum Category {
  #[sea_orm(string_value = "B")]
  Big,

issues/1599/entity/src/filling.rs

@@ -55,7 +55,7 @@ impl ColumnTrait for Column {
  fn def(&self) -> ColumnDef {
  match self {
  Self::Id => ColumnType::Integer.def(),
- Self::Name => ColumnType::string(None).def(),
+ Self::Name => ColumnType::String(StringLen::None).def(),
  Self::VendorId => ColumnType::Integer.def().nullable(),
  }
  }

sea-orm-codegen/src/entity/base_entity.rs

@@ -267,7 +267,7 @@ impl Entity {
 #[cfg(test)]
 mod tests {
  use quote::{format_ident, quote};
- use sea_query::{ColumnType, ForeignKeyAction};
+ use sea_query::{ColumnType, ForeignKeyAction, StringLen};
 
  use crate::{Column, DateTimeCrate, Entity, PrimaryKey, Relation, RelationType};
 
@@ -284,7 +284,7 @@ mod tests {
  },
  Column {
  name: "name".to_owned(),
- col_type: ColumnType::string(None),
+ col_type: ColumnType::String(StringLen::None),
  auto_increment: false,
  not_null: false,
  unique: false,

sea-orm-codegen/src/entity/column.rs

@@ -115,8 +115,8 @@ impl Column {
  None => quote! { ColumnType::Char(None) },
  },
  ColumnType::String(s) => match s {
- StringLen::N(s) => quote! { ColumnType::string(Some(#s)) },
- StringLen::None => quote! { ColumnType::string(None) },
+ StringLen::N(s) => quote! { ColumnType::String(StringLen::N(#s)) },
+ StringLen::None => quote! { ColumnType::String(StringLen::None) },
  StringLen::Max => quote! { ColumnType::String(StringLen::Max) },
  },
  ColumnType::Text => quote! { ColumnType::Text },
@@ -302,8 +302,8 @@ mod tests {
  };
  }
  vec![
- make_col!("id", ColumnType::string(Some(255))),
- make_col!("id", ColumnType::string(None)),
+ make_col!("id", ColumnType::String(StringLen::N(255))),
+ make_col!("id", ColumnType::String(StringLen::None)),
  make_col!(
  "cake_id",
  ColumnType::Custom(SeaRc::new(Alias::new("cus_col")))
@@ -493,8 +493,8 @@ mod tests {
  fn test_get_def() {
  let columns = setup();
  let col_defs = vec![
- "ColumnType::string(Some(255u32)).def()",
- "ColumnType::string(None).def()",
+ "ColumnType::String(StringLen::N(255u32)).def()",
+ "ColumnType::String(StringLen::None).def()",
  "ColumnType::custom(\"cus_col\").def()",
  "ColumnType::TinyInteger.def()",
  "ColumnType::TinyUnsigned.def()",
@@ -681,7 +681,7 @@ mod tests {
  assert_eq!(
  column.get_def().to_string(),
  quote! {
- ColumnType::string(None).def().null()
+ ColumnType::String(StringLen::None).def().null()
  }
  .to_string()
  );

sea-orm-codegen/src/entity/writer.rs

@@ -841,7 +841,7 @@ mod tests {
  use pretty_assertions::assert_eq;
  use proc_macro2::TokenStream;
  use quote::quote;
- use sea_query::{Alias, ColumnType, ForeignKeyAction, RcOrArc, SeaRc};
+ use sea_query::{Alias, ColumnType, ForeignKeyAction, RcOrArc, SeaRc, StringLen};
  use std::io::{self, BufRead, BufReader, Read};
 
  fn setup() -> Vec<Entity> {
@@ -993,7 +993,7 @@ mod tests {
  },
  Column {
  name: "name".to_owned(),
- col_type: ColumnType::string(Some(255)),
+ col_type: ColumnType::String(StringLen::N(255)),
  auto_increment: false,
  not_null: true,
  unique: false,
@@ -1020,7 +1020,7 @@ mod tests {
  },
  Column {
  name: "name".to_owned(),
- col_type: ColumnType::string(Some(255)),
+ col_type: ColumnType::String(StringLen::N(255)),
  auto_increment: false,
  not_null: true,
  unique: false,
@@ -1074,7 +1074,7 @@ mod tests {
  },
  Column {
  name: "_name_".to_owned(),
- col_type: ColumnType::string(Some(255)),
+ col_type: ColumnType::String(StringLen::N(255)),
  auto_increment: false,
  not_null: true,
  unique: false,

sea-orm-codegen/tests/expanded/filling.rs

@@ -44,7 +44,7 @@ impl ColumnTrait for Column {
  fn def(&self) -> ColumnDef {
  match self {
  Self::Id => ColumnType::Integer.def(),
- Self::Name => ColumnType::string(Some(255u32)).def(),
+ Self::Name => ColumnType::String(StringLen::N(255u32)).def(),
  }
  }
 }

sea-orm-codegen/tests/expanded/fruit.rs

@@ -49,7 +49,7 @@ impl ColumnTrait for Column {
  fn def(&self) -> ColumnDef {
  match self {
  Self::Id => ColumnType::Integer.def(),
- Self::Name => ColumnType::string(Some(255u32)).def(),
+ Self::Name => ColumnType::String(StringLen::N(255u32)).def(),
  Self::CakeId => ColumnType::Integer.def().null(),
  }
  }

sea-orm-codegen/tests/expanded/vendor.rs

@@ -50,7 +50,7 @@ impl ColumnTrait for Column {
  fn def(&self) -> ColumnDef {
  match self {
  Self::Id => ColumnType::Integer.def(),
- Self::Name => ColumnType::string(Some(255u32)).def(),
+ Self::Name => ColumnType::String(StringLen::N(255u32)).def(),
  Self::FruitId => ColumnType::Integer.def().null(),
  }
  }

sea-orm-codegen/tests/expanded_with_schema_name/filling.rs

@@ -48,7 +48,7 @@ impl ColumnTrait for Column {
  fn def(&self) -> ColumnDef {
  match self {
  Self::Id => ColumnType::Integer.def(),
- Self::Name => ColumnType::string(Some(255u32)).def(),
+ Self::Name => ColumnType::String(StringLen::N(255u32)).def(),
  }
  }
 }

sea-orm-codegen/tests/expanded_with_schema_name/fruit.rs

@@ -53,7 +53,7 @@ impl ColumnTrait for Column {
  fn def(&self) -> ColumnDef {
  match self {
  Self::Id => ColumnType::Integer.def(),
- Self::Name => ColumnType::string(Some(255u32)).def(),
+ Self::Name => ColumnType::String(StringLen::N(255u32)).def(),
  Self::CakeId => ColumnType::Integer.def().null(),
  }
  }

sea-orm-codegen/tests/expanded_with_schema_name/vendor.rs

@@ -54,7 +54,7 @@ impl ColumnTrait for Column {
  fn def(&self) -> ColumnDef {
  match self {
  Self::Id => ColumnType::Integer.def(),
- Self::Name => ColumnType::string(Some(255u32)).def(),
+ Self::Name => ColumnType::String(StringLen::N(255u32)).def(),
  Self::FruitId => ColumnType::Integer.def().null(),
  }
  }