CeresDB · jiacai2050 · Mar 7, 2023 · Mar 7, 2023 · Mar 7, 2023 · Mar 7, 2023
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -2,9 +2,8 @@ name: Release
 
 on:
   push:
-    # Pattern matched against refs/tags
     tags:
-      - '*'           # Push events to every tag not containing /
+      - 'v*'           # Push events to every tag not containing /
   workflow_dispatch:
 
 jobs:
@@ -22,6 +21,8 @@ jobs:
           toolchain: stable
           override: true
 
-      - run: cargo publish
+      - name: Publish sqlness
+        run: cargo publish
+        working-directory: sqlness
         env:
           CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,27 +1,14 @@
-[package]
-name = "sqlness"
-version = "0.4.0"
+[workspace]
+members = ["sqlness", "sqlness-cli"]
+
+[workspace.package]
+version = "0.4.1"
 edition = "2021"
 authors = [
     "CeresDB Authors <ceresdbservice@gmail.com>",
     "Ruihang Xia <waynestxia@gmail.com>",
 ]
 repository = "https://github.com/CeresDB/sqlness"
+homepage = "https://github.com/CeresDB/sqlness"
 license = "Apache-2.0"
-description = "SQL integration test harness"
-
-[dependencies]
-async-trait = "0.1"
-derive_builder = "0.11"
-mysql = { version = "23.0.1", optional = true }
-prettydiff = "0.6.2"
-serde = { version = "1.0", features = ["derive"] }
-thiserror = "1.0"
-toml = "0.5"
-walkdir = "2.3"
-
-[dev-dependencies]
-tokio = { version = "1.23", features = ["full"] }
-
-[features]
-default = []
+keywords = ["sql", "database", "cli"]
diff --git a/Makefile b/Makefile
@@ -22,10 +22,10 @@ clippy:
 	cd $(DIR); cargo clippy --all-targets --all-features --workspace -- -D warnings
 
 basic-example:
-	cd $(DIR); cargo run --example basic
+	cd $(DIR)/sqlness; cargo run --example basic
 
 bad-example:
-	cd $(DIR); cargo run --example bad
+	cd $(DIR)/sqlness; cargo run --example bad
 
 cli-test:
-	cd $(DIR)/cli;  cargo run -- -c tests -i 127.0.0.1 -p 3306 -u root -P 1a2b3c -d public
+	cd $(DIR)/sqlness-cli;  cargo run -- -c tests -i 127.0.0.1 -p 3306 -u root -P 1a2b3c -d public
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
diff --git a/sqlness-cli/Cargo.toml b/sqlness-cli/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "sqlness-cli"
+version = { workspace = true }
+edition = { workspace = true }
+homepage = { workspace = true }
+keywords = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
+description = "Sqlness command line tool"
+
+[dependencies]
+async-trait = "0.1.64"
+clap = { version = "4.1.8", features = [ "derive" ] }
+futures = "0.3.26"
+sqlness = { path = "../sqlness", features = [ "mysql" ] }
diff --git a/cli/src/main.rs → sqlness-cli/src/main.rs b/cli/src/main.rs → sqlness-cli/src/main.rs
diff --git a/cli/tests/local/input.result → sqlness-cli/tests/local/input.result b/cli/tests/local/input.result → sqlness-cli/tests/local/input.result
diff --git a/cli/tests/local/input.sql → sqlness-cli/tests/local/input.sql b/cli/tests/local/input.sql → sqlness-cli/tests/local/input.sql
diff --git a/sqlness/Cargo.toml b/sqlness/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+name = "sqlness"
+description = "SQL integration test harness"
+version = { workspace = true }
+edition = { workspace = true }
+homepage = { workspace = true }
+keywords = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
+
+[dependencies]
+async-trait = "0.1"
+derive_builder = "0.11"
+mysql = { version = "23.0.1", optional = true }
+prettydiff = "0.6.2"
+serde = { version = "1.0", features = ["derive"] }
+thiserror = "1.0"
+toml = "0.5"
+walkdir = "2.3"
+
+[dev-dependencies]
+tokio = { version = "1.23", features = ["full"] }
+
+[features]
+default = []
diff --git a/examples/bad-case/simple/select.result → ...ss/examples/bad-case/simple/select.result b/examples/bad-case/simple/select.result → ...ss/examples/bad-case/simple/select.result
diff --git a/examples/bad-case/simple/select.sql → sqlness/examples/bad-case/simple/select.sql b/examples/bad-case/simple/select.sql → sqlness/examples/bad-case/simple/select.sql
diff --git a/examples/bad.rs → sqlness/examples/bad.rs b/examples/bad.rs → sqlness/examples/bad.rs
diff --git a/examples/basic-case/simple/config.toml → ...ss/examples/basic-case/simple/config.toml b/examples/basic-case/simple/config.toml → ...ss/examples/basic-case/simple/config.toml
diff --git a/examples/basic-case/simple/select.result → .../examples/basic-case/simple/select.result b/examples/basic-case/simple/select.result → .../examples/basic-case/simple/select.result
diff --git a/examples/basic-case/simple/select.sql → ...ess/examples/basic-case/simple/select.sql b/examples/basic-case/simple/select.sql → ...ess/examples/basic-case/simple/select.sql
diff --git a/examples/basic.rs → sqlness/examples/basic.rs b/examples/basic.rs → sqlness/examples/basic.rs
diff --git a/examples/basic.toml → sqlness/examples/basic.toml b/examples/basic.toml → sqlness/examples/basic.toml
diff --git a/examples/interceptor-arg/simple/input.result → ...mples/interceptor-arg/simple/input.result b/examples/interceptor-arg/simple/input.result → ...mples/interceptor-arg/simple/input.result
diff --git a/examples/interceptor-arg/simple/input.sql → ...examples/interceptor-arg/simple/input.sql b/examples/interceptor-arg/simple/input.sql → ...examples/interceptor-arg/simple/input.sql
diff --git a/examples/interceptor_arg.rs → sqlness/examples/interceptor_arg.rs b/examples/interceptor_arg.rs → sqlness/examples/interceptor_arg.rs
diff --git a/src/case.rs → sqlness/src/case.rs b/src/case.rs → sqlness/src/case.rs
diff --git a/src/config.rs → sqlness/src/config.rs b/src/config.rs → sqlness/src/config.rs
diff --git a/src/database.rs → sqlness/src/database.rs b/src/database.rs → sqlness/src/database.rs
diff --git a/src/database_impl/mod.rs → sqlness/src/database_impl/mod.rs b/src/database_impl/mod.rs → sqlness/src/database_impl/mod.rs
diff --git a/src/database_impl/mysql.rs → sqlness/src/database_impl/mysql.rs b/src/database_impl/mysql.rs → sqlness/src/database_impl/mysql.rs
diff --git a/src/environment.rs → sqlness/src/environment.rs b/src/environment.rs → sqlness/src/environment.rs
diff --git a/src/error.rs → sqlness/src/error.rs b/src/error.rs → sqlness/src/error.rs
diff --git a/src/interceptor.rs → sqlness/src/interceptor.rs b/src/interceptor.rs → sqlness/src/interceptor.rs
diff --git a/src/interceptor/arg.rs → sqlness/src/interceptor/arg.rs b/src/interceptor/arg.rs → sqlness/src/interceptor/arg.rs
diff --git a/src/lib.rs → sqlness/src/lib.rs b/src/lib.rs → sqlness/src/lib.rs
diff --git a/src/runner.rs → sqlness/src/runner.rs b/src/runner.rs → sqlness/src/runner.rs