Merge remote-tracking branch 'origin/master' into active-enum

.github/workflows/rust.yml

@@ -145,14 +145,20 @@ jobs:
         with:
           command: test
           args: >
-            --all
+            --workspace
 
       - uses: actions-rs/cargo@v1
         with:
           command: test
           args: >
             --manifest-path sea-orm-rocket/Cargo.toml
 
+      - uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: >
+            --manifest-path sea-orm-cli/Cargo.toml
+
   cli:
     name: CLI
     runs-on: ${{ matrix.os }}

CHANGELOG.md

@@ -36,6 +36,7 @@ assert_eq!(
     ))
 );
 
+// update many remains the same
 assert_eq!(
     Update::many(cake::Entity)
         .col_expr(cake::Column::Name, Expr::value("Cheese Cake".to_owned()))

Cargo.toml

@@ -37,6 +37,7 @@ serde_json = { version = "^1", optional = true }
 sqlx = { version = "^0.5", optional = true }
 uuid = { version = "0.8", features = ["serde", "v4"], optional = true }
 ouroboros = "0.11"
+url = "^2.2"
 
 [dev-dependencies]
 smol = { version = "^1.2" }

README.md

@@ -4,9 +4,7 @@
 
   <h1>SeaORM</h1>
 
-  <p>
-    <strong>🐚 An async & dynamic ORM for Rust</strong>
-  </p>
+  <h3>🐚 An async & dynamic ORM for Rust</h3>
 
   [![crate](https://img.shields.io/crates/v/sea-orm.svg)](https://crates.io/crates/sea-orm)
   [![docs](https://docs.rs/sea-orm/badge.svg)](https://docs.rs/sea-orm)
@@ -18,7 +16,7 @@
 
 # SeaORM
 
-SeaORM is a relational ORM to help you build light weight and concurrent web services in Rust.
+#### SeaORM is a relational ORM to help you build light weight and concurrent web services in Rust.
 
 [![Getting Started](https://img.shields.io/badge/Getting%20Started-brightgreen)](https://www.sea-ql.org/SeaORM/docs/index)
 [![Usage Example](https://img.shields.io/badge/Usage%20Example-yellow)](https://github.com/SeaQL/sea-orm/tree/master/examples/basic)

issues/249/Cargo.toml

@@ -1,11 +1,2 @@
 [workspace]
-# A separate workspace
-
-[package]
-name = "sea-orm-issues-249"
-version = "0.1.0"
-edition = "2018"
-publish = false
-
-[dependencies]
-sea-orm = { path = "../../", default-features = false, features = ["mock"] }
+members = ["core", "app"]

issues/249/README.md

@@ -0,0 +1 @@
+# Demo of a pure logic crate depending on SeaORM with no enabled features

issues/249/app/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "sea-orm-issues-249-app"
+version = "0.1.0"
+edition = "2018"
+publish = false
+
+[dependencies]
+core = { path = "../core" }
+sea-orm = { path = "../../../", default-features = false, features = ["macros", "sqlx-sqlite", "runtime-async-std-native-tls"] }

issues/249/app/src/main.rs

@@ -0,0 +1,14 @@
+use core::clone_a_model;
+
+use sea_orm::tests_cfg::cake;
+
+fn main() {
+	let c1 = cake::Model {
+		id: 1,
+		name: "Cheese".to_owned(),
+	};
+
+	let c2 = clone_a_model(&c1);
+
+	println!("{:?}", c2);
+}

issues/249/core/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "core"
+version = "0.1.0"
+edition = "2018"
+publish = false
+
+[dependencies]
+sea-orm = { path = "../../../", default-features = false }
+
+[dev-dependencies]
+sea-orm = { path = "../../../", features = ["mock"] }

issues/249/core/src/lib.rs

@@ -0,0 +1,17 @@
+pub use sea_orm::entity::*;
+
+pub fn clone_a_model<M>(model: &M) -> M
+where
+	M: ModelTrait {
+	model.clone()
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	#[test]
+	fn test() {
+		println!("OK");
+	}
+}

sea-orm-cli/Cargo.toml

@@ -32,6 +32,10 @@ sea-schema = { version = "^0.2.9", default-features = false, features = [
 sqlx = { version = "^0.5", default-features = false, features = [ "mysql", "postgres" ] }
 env_logger = { version = "^0.9" }
 log = { version = "^0.4" }
+url = "^2.2"
+
+[dev-dependencies]
+smol = "1.2.5"
 
 [features]
 default = [ "runtime-async-std-native-tls" ]