Generate arbitrary named entity (#70)

* Generate arbitrary named entity (#69) * Bump cli & codegen version * CI tests no caching * Remove local dependency path
SeaQL · Aug 10, 2021 · ba226a2 · ba226a2
1 parent b1d28db
commit ba226a2
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 18 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -25,8 +25,6 @@ jobs:
           toolchain: stable
           override: true
 
-      - uses: Swatinem/rust-cache@v1
-
       - uses: actions-rs/cargo@v1
         with:
           command: build
@@ -60,8 +58,6 @@ jobs:
           toolchain: stable
           override: true
 
-      - uses: Swatinem/rust-cache@v1
-
       - uses: actions-rs/cargo@v1
         with:
           command: build
@@ -109,8 +105,6 @@ jobs:
           toolchain: stable
           override: true
 
-      - uses: Swatinem/rust-cache@v1
-
       - uses: actions-rs/cargo@v1
         with:
           command: build
@@ -158,8 +152,6 @@ jobs:
           toolchain: stable
           override: true
 
-      - uses: Swatinem/rust-cache@v1
-
       - uses: actions-rs/cargo@v1
         with:
           command: build
@@ -204,8 +196,6 @@ jobs:
           toolchain: stable
           override: true
 
-      - uses: Swatinem/rust-cache@v1
-
       - uses: actions-rs/cargo@v1
         with:
           command: build

diff --git a/sea-orm-cli/Cargo.toml b/sea-orm-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sea-orm-cli"
-version = "0.1.0"
+version = "0.1.1"
 authors = [ "Billy Chan <ccw.billy.123@gmail.com>" ]
 edition = "2018"
 description = "Command line utility for SeaORM"

diff --git a/sea-orm-cli/README.md b/sea-orm-cli/README.md
@@ -9,5 +9,5 @@ cargo run -- -h
 Running Entity Generator:
 
 ```sh
-cargo run -- entity generate -url mysql://sea:sea@localhost/bakery -schema bakery -o out
+cargo run -- generate entity -u mysql://sea:sea@localhost/bakery -s bakery -o out
 ```
diff --git a/sea-orm-codegen/Cargo.toml b/sea-orm-codegen/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sea-orm-codegen"
-version = "0.1.1"
+version = "0.1.2"
 authors = ["Billy Chan <ccw.billy.123@gmail.com>"]
 edition = "2018"
 description = "Code Generator for SeaORM"

diff --git a/sea-orm-codegen/src/entity/writer.rs b/sea-orm-codegen/src/entity/writer.rs
@@ -34,7 +34,7 @@ impl EntityWriter {
                 let code_blocks = Self::gen_code_blocks(entity);
                 Self::write(&mut lines, code_blocks);
                 OutputFile {
-                    name: format!("{}.rs", entity.table_name),
+                    name: format!("{}.rs", entity.get_table_name_snake_case()),
                     content: lines.join("\n\n"),
                 }
             })
@@ -123,11 +123,11 @@ impl EntityWriter {
     }
 
     pub fn gen_impl_entity_name(entity: &Entity) -> TokenStream {
-        let table_name_snake_case = entity.get_table_name_snake_case();
+        let table_name = entity.table_name.as_str();
         quote! {
             impl EntityName for Entity {
                 fn table_name(&self) -> &str {
-                    #table_name_snake_case
+                    #table_name
                 }
             }
         }
@@ -341,7 +341,7 @@ mod tests {
                 }],
             },
             Entity {
-                table_name: "cake_filling".to_owned(),
+                table_name: "_cake_filling_".to_owned(),
                 columns: vec![
                     Column {
                         name: "cake_id".to_owned(),

diff --git a/sea-orm-codegen/tests/entity/cake_filling.rs b/sea-orm-codegen/tests/entity/cake_filling.rs
@@ -7,7 +7,7 @@ pub struct Entity;
 
 impl EntityName for Entity {
     fn table_name(&self) -> &str {
-        "cake_filling"
+        "_cake_filling_"
     }
 }