From 51e5cb43cb3cff22f32d75692ccfb993b972b94f Mon Sep 17 00:00:00 2001
From: lovasoa <pere.jobs@gmail.com>
Date: Thu, 14 Sep 2023 01:58:28 +0200
Subject: [PATCH] v0.10.3: add mssql connect options

fixes https://github.com/lovasoa/SQLpage/issues/86
---
 CHANGELOG.md                                  |  8 +++++++-
 Cargo.lock                                    | 20 +++++++++----------
 Cargo.toml                                    |  2 +-
 .../your-first-sql-website/index.sql          |  2 +-
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3de7638..e10a0c35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # CHANGELOG.md
 
-## 0.10.2 (unreleased)
+## 0.10.3 (2023-09-14)
+
+ - Update database drivers to the latest version.
+   - Adds new connection string options for mssql, including `app_name` and `instance`.
+     Set them with `DATABASE_URL=mssql://user:password@host:port/database?app_name=My%20App&instance=My%20Instance` 
+
+## 0.10.2 (2023-09-04)
 
  - Fix a bug where the `map` component followed by another component would break the page layout.
 
diff --git a/Cargo.lock b/Cargo.lock
index abcf12d0..e4dd3e97 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -857,13 +857,12 @@ dependencies = [
 
 [[package]]
 name = "flume"
-version = "0.10.14"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577"
+checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
 dependencies = [
  "futures-core",
  "futures-sink",
- "pin-project",
  "spin 0.9.8",
 ]
 
@@ -2247,7 +2246,7 @@ dependencies = [
 
 [[package]]
 name = "sqlpage"
-version = "0.10.2"
+version = "0.10.3"
 dependencies = [
  "actix-rt",
  "actix-web",
@@ -2304,9 +2303,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-core-oldapi"
-version = "0.6.11"
+version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dec70ba8430c952cf77ff9b9a35aed426c235bedb4f3b5e8e599a2ccdaee4ab7"
+checksum = "764d14e59f96fef2f5d6290b53a76f01470ced822856a82c29157c31c9d8446e"
 dependencies = [
  "ahash 0.8.3",
  "atoi",
@@ -2329,7 +2328,6 @@ dependencies = [
  "futures-executor",
  "futures-intrusive",
  "futures-util",
- "generic-array",
  "hashlink",
  "hex",
  "hkdf",
@@ -2368,9 +2366,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-macros-oldapi"
-version = "0.6.11"
+version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b6f90a4aa8b4a3531fef20a22efd62d0ef1319aae51c7c19c01bc6b0169847e"
+checksum = "b014cb4d08e429b651a29bab233e85924fdd966a0c01ec116c06bf85aeb1e536"
 dependencies = [
  "dotenvy",
  "either",
@@ -2388,9 +2386,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-oldapi"
-version = "0.6.11"
+version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8abbce079744a2fa79bd977a62393ad83188d84785ff060badbb72ac5a56507d"
+checksum = "1318464b43f87f58794495f40c6d3d6a8ea06de5d91a06dfc2fc31144a891b63"
 dependencies = [
  "sqlx-core-oldapi",
  "sqlx-macros-oldapi",
diff --git a/Cargo.toml b/Cargo.toml
index bb45ed36..722542c3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sqlpage"
-version = "0.10.2"
+version = "0.10.3"
 edition = "2021"
 description = "A SQL-only web application framework. Takes .sql files and formats the query result using pre-made configurable professional-looking components."
 keywords = ["web", "sql", "framework"]
diff --git a/examples/official-site/your-first-sql-website/index.sql b/examples/official-site/your-first-sql-website/index.sql
index 71bacb8f..c524d8a9 100644
--- a/examples/official-site/your-first-sql-website/index.sql
+++ b/examples/official-site/your-first-sql-website/index.sql
@@ -120,7 +120,7 @@ Later, when you want to deploy your website online, you can switch back to a per
  - a SQLite file with `sqlite://your-database-file.db` ([see options](https://docs.rs/sqlx/0.6.3/sqlx/sqlite/struct.SqliteConnectOptions.html#main-content)),
  - a PostgreSQL-compatible server with `postgres://user:password@host/database` ([see options](https://www.postgresql.org/docs/15/libpq-connect.html#id-1.7.3.8.3.6)),
  - a MySQL-compatible server with `mysql://user:password@host/database` ([see options](https://dev.mysql.com/doc/refman/8.0/en/connecting-using-uri-or-key-value-pairs.html)),
- - a Microsoft SQL Server with `mssql://user:password@host/database`,
+ - a Microsoft SQL Server with `mssql://user:password@host/database` ([see options](https://docs.rs/sqlx-oldapi/latest/sqlx_oldapi/mssql/struct.MssqlConnectOptions.html)),
  
 For more information about the properties that can be set in sqlpage.json, see [SQLPage''s configuration documentation](https://github.com/lovasoa/SQLpage/blob/main/configuration.md#configuring-sqlpage)