From 161c91436e15de11de3647a9149c436a9ce39b1d Mon Sep 17 00:00:00 2001
From: Chris Tsang <tyt2y7@gmail.com>
Date: Sat, 7 Aug 2021 23:25:22 +0800
Subject: [PATCH] Features

---
 .github/workflows/rust.yml | 12 ++----------
 Cargo.toml                 | 10 ++++------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index a1b7cb67..7d91ee74 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -35,14 +35,14 @@ jobs:
           command: build
           args: >
             --all
-            --features default,runtime-${{ matrix.runtime }}
+            --features default
 
       - uses: actions-rs/cargo@v1
         with:
           command: test
           args: >
             --all
-            --features default,runtime-${{ matrix.runtime }}
+            --features default
 
   sqlite:
     name: SQLite
@@ -68,14 +68,12 @@ jobs:
         with:
           command: build
           args: >
-            --all
             --features default,runtime-${{ matrix.runtime }}
 
       - uses: actions-rs/cargo@v1
         with:
           command: test
           args: >
-            --all
             --features default,sqlx-sqlite,runtime-${{ matrix.runtime }}
 
   mysql:
@@ -121,14 +119,12 @@ jobs:
         with:
           command: build
           args: >
-            --all
             --features default,runtime-${{ matrix.runtime }}
 
       - uses: actions-rs/cargo@v1
         with:
           command: test
           args: >
-            --all
             --features default,sqlx-mysql,runtime-${{ matrix.runtime }}
 
   mariadb:
@@ -174,14 +170,12 @@ jobs:
         with:
           command: build
           args: >
-            --all
             --features default,runtime-${{ matrix.runtime }}
 
       - uses: actions-rs/cargo@v1
         with:
           command: test
           args: >
-            --all
             --features default,sqlx-mysql,runtime-${{ matrix.runtime }}
 
   postgres:
@@ -224,12 +218,10 @@ jobs:
         with:
           command: build
           args: >
-            --all
             --features default,runtime-${{ matrix.runtime }}
 
       - uses: actions-rs/cargo@v1
         with:
           command: test
           args: >
-            --all
             --features default,sqlx-postgres,runtime-${{ matrix.runtime }}
diff --git a/Cargo.toml b/Cargo.toml
index 338ed06b..2e41f82e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -70,24 +70,22 @@ default = [
 ]
 macros = ["sea-orm-macros"]
 mock = []
-with-json = ["serde_json", "sea-query/with-json", "sqlx-json"]
-with-chrono = ["chrono", "sea-query/with-chrono", "sqlx-chrono"]
+with-json = ["serde_json", "sea-query/with-json"]
+with-chrono = ["chrono", "sea-query/with-chrono"]
 with-rust_decimal = [
     "rust_decimal",
     "sea-query/with-rust_decimal",
-    "sqlx-decimal",
 ]
 with-uuid = [
     "uuid",
     "sea-query/with-uuid",
-    "sqlx-core/uuid",
-    "sqlx-macros/uuid",
 ]
-sqlx-dep = ["sqlx"]
 sqlx-all = ["sqlx-mysql", "sqlx-postgres", "sqlx-sqlite"]
+sqlx-dep = ["sqlx-json", "sqlx-chrono", "sqlx-decimal", "sqlx-uuid"]
 sqlx-json = ["sqlx/json", "with-json"]
 sqlx-chrono = ["sqlx/chrono", "with-chrono"]
 sqlx-decimal = ["sqlx/decimal", "with-rust_decimal"]
+sqlx-uuid = ["sqlx/uuid", "with-uuid"]
 sqlx-mysql = ["sqlx-dep", "sea-query/sqlx-mysql", "sqlx/mysql"]
 sqlx-postgres = ["sqlx-dep", "sea-query/sqlx-postgres", "sqlx/postgres"]
 sqlx-sqlite = ["sqlx-dep", "sea-query/sqlx-sqlite", "sqlx/sqlite"]