Release version 0.11.0

zino-rs · Jul 5, 2023 · 2c477f7 · 2c477f7
1 parent a12c38c
commit 2c477f7
Show file tree

Hide file tree

Showing 18 changed files with 42 additions and 102 deletions.
diff --git a/README.md b/README.md
@@ -12,6 +12,7 @@
 
 - 🚀 Out-of-the-box features for rapid application development.
 - ✨ Minimal design, modular architecture and high-level abstractions.
+- 🌐 Adopt an API-first approch to development with open standards.
 - ⚡ Embrace practical conventions to get the best performance.
 - 💎 Highly optimized ORM for MySQL and PostgreSQL based on [`sqlx`].
 - 📅 Lightweight scheduler for sync and async cron jobs.

diff --git a/examples/actix-app/Cargo.toml b/examples/actix-app/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "actix-app"
 description = "An example for actix-web integration."
-version = "0.1.4"
+version = "0.2.0"
 rust-version = "1.72"
 edition = "2021"
 publish = false
@@ -18,12 +18,12 @@ features = ["derive"]
 
 [dependencies.zino]
 path = "../../zino"
-version = "0.9.7"
+version = "0.10.0"
 features = ["actix"]
 
 [dependencies.zino-core]
 path = "../../zino-core"
-version = "0.10.7"
+version = "0.11.0"
 features = [
     "connector",
     "connector-arrow",
@@ -33,8 +33,8 @@ features = [
 
 [dependencies.zino-derive]
 path = "../../zino-derive"
-version = "0.7.7"
+version = "0.8.0"
 
 [dependencies.zino-model]
 path = "../../zino-model"
-version = "0.7.7"
+version = "0.8.0"
diff --git a/examples/actix-app/config/config.dev.toml b/examples/actix-app/config/config.dev.toml
@@ -1,7 +1,7 @@
 # --env=dev
 
 name = "data-cube"
-version = "0.5.4"
+version = "0.6.0"
 
 [main]
 host = "127.0.0.1"
@@ -24,14 +24,14 @@ host = "127.0.0.1"
 port = 3306
 database = "data_cube"
 username = "root"
-password = "EIlijBrcrOVnlmZKALXByQRPjTxhQhrlb8NlyZOLYGs"
+password = "Er/DkSLyeOsUiHXHK4hO7E8fdl1g8Qwy2Ef8mR1/4BQ"
 
 [[postgres]]
 host = "127.0.0.1"
 port = 5432
 database = "data_cube"
 username = "postgres"
-password = "rIgumT85z/q7bTPBbWCdNvruBzHpZIraUKRC1SE4xQe5vSn2"
+password = "9jMzf8xZSrC3kO2okJUL9XGvFWyzh1VDJwBIJ9e78NsRfJkp"
 
 [tracing]
 filter = "info,sqlx=trace,zino=trace,zino_core=trace"

diff --git a/examples/actix-app/config/config.prod.toml b/examples/actix-app/config/config.prod.toml
@@ -1,7 +1,7 @@
 # --env=prod
 
 name = "data-cube"
-version = "0.5.4"
+version = "0.6.0"
 
 [main]
 host = "127.0.0.1"
@@ -24,14 +24,14 @@ host = "127.0.0.1"
 port = 3306
 database = "data_cube"
 username = "root"
-password = "QT2MeDXD2m2MbrdDzJuSOBf94kPAEEEdMfXJSdbDny0"
+password = "I/m3n8cf08ZqLsZf8Ez+mEsvbShl9CPokIzIoc8lPxM"
 
 [[postgres]]
 host = "127.0.0.1"
 port = 5432
 database = "data_cube"
 username = "postgres"
-password = "W/70bVEZ6eaXJhkn18/JrpzghRMcwqJ+ChqiqlFymcX1LDUt"
+password = "Sx9x3GtJmAwwhIinkkpqwAb3exJ2+jV3CGfV7vH9C5vUvZ3p"
 
 [tracing]
 filter = "warn"

diff --git a/examples/axum-app/Cargo.toml b/examples/axum-app/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "axum-app"
 description = "An example for axum integration."
-version = "0.7.4"
+version = "0.8.0"
 rust-version = "1.72"
 edition = "2021"
 publish = false
@@ -18,12 +18,12 @@ features = ["derive"]
 
 [dependencies.zino]
 path = "../../zino"
-version = "0.9.7"
+version = "0.10.0"
 features = ["axum"]
 
 [dependencies.zino-core]
 path = "../../zino-core"
-version = "0.10.7"
+version = "0.11.0"
 features = [
     "connector",
     "connector-arrow",
@@ -33,8 +33,8 @@ features = [
 
 [dependencies.zino-derive]
 path = "../../zino-derive"
-version = "0.7.7"
+version = "0.8.0"
 
 [dependencies.zino-model]
 path = "../../zino-model"
-version = "0.7.7"
+version = "0.8.0"
diff --git a/examples/axum-app/config/config.dev.toml b/examples/axum-app/config/config.dev.toml
@@ -1,7 +1,7 @@
 # --env=dev
 
 name = "data-cube"
-version = "0.5.4"
+version = "0.6.0"
 
 [main]
 host = "127.0.0.1"
@@ -24,14 +24,14 @@ host = "127.0.0.1"
 port = 3306
 database = "data_cube"
 username = "root"
-password = "QIyThisBQvkLrupu/FZn0HpkVe7IvRboPjTQu21V89I"
+password = "QWi65/uOdFy745k4/vT5NyNsUKHppu7ccc+9oaF3lHs"
 
 [[postgres]]
 host = "127.0.0.1"
 port = 5432
 database = "data_cube"
 username = "postgres"
-password = "W2rHYCNbBmJ3WBsFPa65S5VAoQTONLzl+r0rAhxEr9pv59Pv"
+password = "D2m/CORXdT/zHw/pD3lWF2HejeGGTnhvkgfMV7biZctNAKlx"
 
 [tracing]
 filter = "info,sqlx=trace,zino=trace,zino_core=trace"

diff --git a/examples/axum-app/config/config.prod.toml b/examples/axum-app/config/config.prod.toml
@@ -1,7 +1,7 @@
 # --env=prod
 
 name = "data-cube"
-version = "0.5.4"
+version = "0.6.0"
 
 [main]
 host = "127.0.0.1"
@@ -24,14 +24,14 @@ host = "127.0.0.1"
 port = 3306
 database = "data_cube"
 username = "root"
-password = "vyis/yqE/tFzZSCz+Ew0M0P6vkyzjEXRtZcOWOCfmWA"
+password = "2M/J9HZJn6OE4PF0W4Dtz7X/wZ8L/hBxfAMqUBKzuM8"
 
 [[postgres]]
 host = "127.0.0.1"
 port = 5432
 database = "data_cube"
 username = "postgres"
-password = "Sh08dkU/IW7c9dND+zDih21gDDwiCTVFCVNqGNpCjgryB9Cq"
+password = "UamCNm91h3rQNcJkcJyw4YmtI0lH3sLoGhkHO9Onzm2PGnc2"
 
 [tracing]
 filter = "warn"

diff --git a/zino-core/Cargo.toml b/zino-core/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "zino-core"
 description = "Core types and traits for zino."
-version = "0.10.7"
+version = "0.11.0"
 rust-version = "1.72"
 edition = "2021"
 license = "MIT"
@@ -38,7 +38,6 @@ all-connectors = [
     "connector",
     "connector-arrow",
     "connector-http",
-    "connector-mssql",
     "connector-mysql",
     "connector-postgres",
     "connector-sqlite",
@@ -50,7 +49,6 @@ all-chatbots = ["chatbot", "chatbot-openai"]
 connector = ["connector-http"]
 connector-arrow = ["dep:datafusion", "connector"]
 connector-http = ["connector"]
-connector-mssql = ["connector", "sqlx", "sqlx/mssql"]
 connector-mysql = ["connector", "sqlx", "sqlx/mysql"]
 connector-postgres = ["connector", "sqlx", "sqlx/postgres"]
 connector-sqlite = ["connector", "sqlx", "sqlx/sqlite"]
@@ -66,9 +64,8 @@ full = [
 orm = ["sqlx", "sqlx/postgres"]
 orm-mysql = ["orm", "sqlx/mysql"]
 orm-postgres = ["orm", "sqlx/postgres"]
-runtime-actix = ["sqlx/runtime-actix-rustls"]
-runtime-async-std = ["sqlx/runtime-async-std-rustls"]
-runtime-tokio = ["sqlx/runtime-tokio-rustls"]
+runtime-async-std = ["sqlx/runtime-async-std"]
+runtime-tokio = ["sqlx/runtime-tokio"]
 view = ["dep:minijinja"]
 view-tera = ["view", "dep:tera"]
 view-minijinja = ["view", "dep:minijinja"]
@@ -153,10 +150,6 @@ features = [
     "stream",
 ]
 
-[dependencies.rust_decimal]
-version = "1.30.0"
-features = ["serde-float"]
-
 [dependencies.serde]
 version = "1.0.164"
 features = ["derive"]
@@ -166,12 +159,13 @@ version = "1.0.99"
 features = ["raw_value"]
 
 [dependencies.sqlx]
-version = "0.6.3"
+version = "0.7.0"
 optional = true
 features = [
+    "bigdecimal",
     "chrono",
-    "decimal",
-    "json",
+    "rust_decimal",
+    "tls-rustls",
     "uuid",
 ]
 

diff --git a/zino-core/src/connector/connector_mssql.rs b/zino-core/src/connector/connector_mssql.rs
diff --git a/zino-core/src/connector/data_source.rs b/zino-core/src/connector/data_source.rs
@@ -7,8 +7,6 @@ use toml::Table;
 use super::ArrowConnector;
 #[cfg(feature = "connector-http")]
 use super::HttpConnector;
-#[cfg(feature = "connector-mssql")]
-use sqlx::mssql::MssqlPool;
 #[cfg(feature = "connector-mysql")]
 use sqlx::mysql::MySqlPool;
 #[cfg(feature = "connector-postgres")]
@@ -25,9 +23,6 @@ pub(super) enum DataSourceConnector {
     /// HTTP
     #[cfg(feature = "connector-http")]
     Http(HttpConnector),
-    /// MSSQL
-    #[cfg(feature = "connector-mssql")]
-    Mssql(MssqlPool),
     /// MySQL
     #[cfg(feature = "connector-mysql")]
     MySql(MySqlPool),
@@ -89,8 +84,6 @@ impl DataSource {
             "arrow" => ArrowConnector::try_new_data_source(config)?,
             #[cfg(feature = "connector-http")]
             "http" => HttpConnector::try_new_data_source(config)?,
-            #[cfg(feature = "connector-mssql")]
-            "mssql" => MssqlPool::try_new_data_source(config)?,
             #[cfg(feature = "connector-mysql")]
             "mysql" => MySqlPool::try_new_data_source(config)?,
             #[cfg(feature = "connector-postgres")]
@@ -162,7 +155,6 @@ impl Connector for DataSource {
         let protocol = match source_type {
             "arrow" => "arrow",
             "http" | "rest" | "graphql" => "http",
-            "mssql" => "mssql",
             "mysql" | "ceresdb" | "databend" | "mariadb" | "tidb" => "mysql",
             "postgres" | "citus" | "greptimedb" | "highgo" | "hologres" | "opengauss"
             | "postgis" | "timescaledb" => "postgres",
@@ -185,8 +177,6 @@ impl Connector for DataSource {
             Arrow(connector) => connector.execute(query, params).await,
             #[cfg(feature = "connector-http")]
             Http(connector) => connector.execute(query, params).await,
-            #[cfg(feature = "connector-mssql")]
-            Mssql(pool) => pool.execute(query, params).await,
             #[cfg(feature = "connector-mysql")]
             MySql(pool) => pool.execute(query, params).await,
             #[cfg(feature = "connector-postgres")]
@@ -202,8 +192,6 @@ impl Connector for DataSource {
             Arrow(connector) => connector.query(query, params).await,
             #[cfg(feature = "connector-http")]
             Http(connector) => connector.query(query, params).await,
-            #[cfg(feature = "connector-mssql")]
-            Mssql(pool) => pool.query(query, params).await,
             #[cfg(feature = "connector-mysql")]
             MySql(pool) => pool.query(query, params).await,
             #[cfg(feature = "connector-postgres")]
@@ -219,8 +207,6 @@ impl Connector for DataSource {
             Arrow(connector) => connector.query_one(query, params).await,
             #[cfg(feature = "connector-http")]
             Http(connector) => connector.query_one(query, params).await,
-            #[cfg(feature = "connector-mssql")]
-            Mssql(pool) => pool.query_one(query, params).await,
             #[cfg(feature = "connector-mysql")]
             MySql(pool) => pool.query_one(query, params).await,
             #[cfg(feature = "connector-postgres")]

diff --git a/zino-core/src/connector/mod.rs b/zino-core/src/connector/mod.rs
@@ -14,7 +14,6 @@
 //! | `hologres`       | Aliyun Hologres        | `connector-postgres`   |
 //! | `http`           | HTTP services          | `connector-http`       |
 //! | `mariadb`        | MariaDB                | `connector-mysql`      |
-//! | `mssql`          | MSSQL (SQL Server)     | `connector-mssql`      |
 //! | `mysql`          | MySQL                  | `connector-mysql`      |
 //! | `opengauss`      | openGauss              | `connector-postgres`   |
 //! | `postgis`        | PostGIS                | `connector-postgres`   |
@@ -37,8 +36,6 @@ mod data_source;
 mod connector_arrow;
 #[cfg(feature = "connector-http")]
 mod connector_http;
-#[cfg(feature = "connector-mssql")]
-mod connector_mssql;
 #[cfg(feature = "connector-mysql")]
 mod connector_mysql;
 #[cfg(feature = "connector-postgres")]
@@ -47,7 +44,6 @@ mod connector_postgres;
 mod connector_sqlite;
 
 #[cfg(any(
-    feature = "connector-mssql",
     feature = "connector-mysql",
     feature = "connector-postgres",
     feature = "connector-sqlite"

diff --git a/zino-core/src/database/mysql.rs b/zino-core/src/database/mysql.rs
@@ -7,8 +7,7 @@ use crate::{
     AvroValue, JsonValue, Map, Record, SharedString, Uuid,
 };
 use chrono::{NaiveDate, NaiveDateTime, NaiveTime};
-use rust_decimal::Decimal;
-use sqlx::{Column as _, Row, TypeInfo, ValueRef};
+use sqlx::{types::Decimal, Column as _, Row, TypeInfo, ValueRef};
 use std::borrow::Cow;
 
 impl<'c> EncodeColumn<DatabaseDriver> for Column<'c> {

diff --git a/zino-core/src/database/postgres.rs b/zino-core/src/database/postgres.rs
@@ -7,8 +7,7 @@ use crate::{
     AvroValue, JsonValue, Map, Record, SharedString, Uuid,
 };
 use chrono::{NaiveDate, NaiveDateTime, NaiveTime};
-use rust_decimal::Decimal;
-use sqlx::{Column as _, Row, TypeInfo, ValueRef};
+use sqlx::{types::Decimal, Column as _, Row, TypeInfo, ValueRef};
 use std::borrow::Cow;
 
 impl<'c> EncodeColumn<DatabaseDriver> for Column<'c> {