Fixed CI and DbEnum

rorm-orm · Sep 5, 2023 · d874d59 · d874d59
1 parent 9e6606c
commit d874d59
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 80 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -33,27 +33,18 @@ jobs:
           rustup component add clippy
           cargo install clippy-sarif sarif-fmt cargo-deny
 
-      - name: Build rorm with tokio-rustls
-        run: cargo build -p rorm -F tokio-rustls
+      - name: Build rorm with tokio
+        run: cargo build -p rorm -F tokio
 
-      - name: Build rorm with tokio-native-tls
-        run: cargo build -p rorm -F tokio-native-tls
-
-      - name: Build rorm with async-std-rustls
-        run: cargo build -p rorm -F async-std-rustls
-
-      - name: Build rorm with async-std-native-tls
-        run: cargo build -p rorm -F async-std-native-tls
-
-      - name: Build rorm with actix-rustls
-        run: cargo build -p rorm -F actix-rustls
-
-      - name: Build rorm with actix-native-tls
-        run: cargo build -p rorm -F actix-native-tls
+      - name: Build rorm with async-std
+        run: cargo build -p rorm -F async-std
 
       - name: Run cargo deny check
         run: cargo deny check --hide-inclusion-graph
 
+      - name: Run cargo test
+        run: cargo test --all
+
       - name: Run rust-clippy
         run: cargo clippy --workspace --message-format=json | clippy-sarif | tee rust-clippy-results.sarif | sarif-fmt
         continue-on-error: true

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -28,35 +28,8 @@ jobs:
 
       - uses: Swatinem/rust-cache@v2
 
-      - name: Install dependencies
-        run: |
-          rustup component add clippy
-          cargo install clippy-sarif sarif-fmt
+      - name: Build rorm with tokio
+        run: cargo build -p rorm -F tokio
 
-      - name: Build rorm with tokio-rustls
-        run: cargo build -p rorm -F tokio-rustls
-
-      - name: Build rorm with tokio-native-tls
-        run: cargo build -p rorm -F tokio-native-tls
-
-      - name: Build rorm with async-std-rustls
-        run: cargo build -p rorm -F async-std-rustls
-
-      - name: Build rorm with async-std-native-tls
-        run: cargo build -p rorm -F async-std-native-tls
-
-      - name: Build rorm with actix-rustls
-        run: cargo build -p rorm -F actix-rustls
-
-      - name: Build rorm with actix-native-tls
-        run: cargo build -p rorm -F actix-native-tls
-
-      - name: Run rust-clippy
-        run: cargo clippy --workspace --message-format=json | clippy-sarif | tee rust-clippy-results.sarif | sarif-fmt
-        continue-on-error: true
-
-      - name: Upload clippy analysis results to GitHub
-        uses: github/codeql-action/upload-sarif@v2
-        with:
-          sarif_file: rust-clippy-results.sarif
-          wait-for-processing: true
+      - name: Build rorm with async-std
+        run: cargo build -p rorm -F async-std
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -28,35 +28,8 @@ jobs:
 
       - uses: Swatinem/rust-cache@v2
 
-      - name: Install dependencies
-        run: |
-          rustup component add clippy
-          cargo install clippy-sarif sarif-fmt
+      - name: Build rorm with tokio
+        run: cargo build -p rorm -F tokio
 
-      - name: Build rorm with tokio-rustls
-        run: cargo build -p rorm -F tokio-rustls
-
-      - name: Build rorm with tokio-native-tls
-        run: cargo build -p rorm -F tokio-native-tls
-
-      - name: Build rorm with async-std-rustls
-        run: cargo build -p rorm -F async-std-rustls
-
-      - name: Build rorm with async-std-native-tls
-        run: cargo build -p rorm -F async-std-native-tls
-
-      - name: Build rorm with actix-rustls
-        run: cargo build -p rorm -F actix-rustls
-
-      - name: Build rorm with actix-native-tls
-        run: cargo build -p rorm -F actix-native-tls
-
-      - name: Run rust-clippy
-        run: cargo clippy --workspace --message-format=json | clippy-sarif | tee rust-clippy-results.sarif | sarif-fmt
-        continue-on-error: true
-
-      - name: Upload clippy analysis results to GitHub
-        uses: github/codeql-action/upload-sarif@v2
-        with:
-          sarif_file: rust-clippy-results.sarif
-          wait-for-processing: true
+      - name: Build rorm with async-std
+        run: cargo build -p rorm -F async-std
diff --git a/rorm-macro/src/generate/db_enum.rs b/rorm-macro/src/generate/db_enum.rs
@@ -39,7 +39,7 @@ pub fn generate_db_enum(parsed: &ParsedDbEnum) -> TokenStream {
             ::rorm::new_converting_decoder!(
                 #[doc(hidden)]
                 #decoder,
-                |value: ::rorm::choice::Choice| -> #ident {
+                |value: ::rorm::db::choice::Choice| -> #ident {
                     let value: String = value.0;
                     match value.as_str() {
                         #(
@@ -50,7 +50,7 @@ pub fn generate_db_enum(parsed: &ParsedDbEnum) -> TokenStream {
                 }
             );
             impl ::rorm::internal::field::as_db_type::AsDbType for #ident {
-                type Primitive = ::rorm::choice::Choice;
+                type Primitive = ::rorm::db::choice::Choice;
                 type DbType = ::rorm::internal::hmr::db_type::Choices;
 
                 const IMPLICIT: Option<::rorm::internal::hmr::annotations::Annotations> = Some({