From 1b8ecc246047408956078f4f1d785bfef1fb20c6 Mon Sep 17 00:00:00 2001 From: lovasoa Date: Tue, 1 Aug 2023 01:07:30 +0200 Subject: [PATCH] v0.9.1: mssql fixes --- CHANGELOG.md | 4 +++ Cargo.lock | 75 ++++++++++++++++++++++++++++------------------------ Cargo.toml | 4 +-- build.rs | 2 +- 4 files changed, 48 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 33c70eed..ee328b2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG.md +## 0.9.1 (2023-07-30) + + - Fix issues with the new experimental mssql driver. + ## 0.9.0 (2023-07-30) - Added a new `json` component, which allows building a JSON API entirely in SQL with SQLPage ! diff --git a/Cargo.lock b/Cargo.lock index 2a9501e8..c22c2202 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -66,7 +66,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.27", + "syn 2.0.28", ] [[package]] @@ -187,7 +187,7 @@ dependencies = [ "serde_urlencoded", "smallvec", "socket2", - "time 0.3.23", + "time 0.3.24", "url", ] @@ -327,7 +327,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.28", ] [[package]] @@ -349,7 +349,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.28", ] [[package]] @@ -360,7 +360,7 @@ checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.28", ] [[package]] @@ -560,7 +560,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" dependencies = [ "percent-encoding", - "time 0.3.23", + "time 0.3.24", "version_check", ] @@ -656,6 +656,12 @@ dependencies = [ "zeroize", ] +[[package]] +name = "deranged" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8810e7e2cf385b1e9b50d68264908ec367ba642c96d02edfe61c39e88e2a3c01" + [[package]] name = "derive_more" version = "0.99.17" @@ -879,7 +885,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.28", ] [[package]] @@ -1631,7 +1637,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.28", ] [[package]] @@ -1662,7 +1668,7 @@ checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.28", ] [[package]] @@ -1985,22 +1991,22 @@ checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.178" +version = "1.0.179" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60363bdd39a7be0266a520dab25fdc9241d2f987b08a01e01f0ec6d06a981348" +checksum = "0a5bf42b8d227d4abf38a1ddb08602e229108a517cd4e5bb28f9c7eaafdce5c0" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.178" +version = "1.0.179" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28482318d6641454cb273da158647922d1be6b5a2fcc6165cd89ebdd7ed576b" +checksum = "741e124f5485c7e60c03b043f79f320bff3527f4bbf12cf3831750dc46a0ec2c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.28", ] [[package]] @@ -2131,7 +2137,7 @@ dependencies = [ [[package]] name = "sqlpage" -version = "0.9.0" +version = "0.9.1" dependencies = [ "actix-web", "actix-web-httpauth", @@ -2186,9 +2192,9 @@ dependencies = [ [[package]] name = "sqlx-core-oldapi" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc02e40c6e194a245a8186c0383ab08fcdd0744f0ebb93b2f32f8a660d8cd9f8" +checksum = "efab67d1e6e4615d0898c07db966ad53b15ba6f96ea78923c3fc349c468f1368" dependencies = [ "ahash 0.8.3", "atoi", @@ -2250,9 +2256,9 @@ dependencies = [ [[package]] name = "sqlx-macros-oldapi" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e285f51c40b8766acc99de53e29bf3fec9402eaea29009826d03657560e723" +checksum = "7ebffe6af645226ed818b1c388c8f8dde280cbc42b2d7f3a02616301a7aeb5a4" dependencies = [ "dotenvy", "either", @@ -2269,9 +2275,9 @@ dependencies = [ [[package]] name = "sqlx-oldapi" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43bb2548267d973900f3660eb584ca4904adac8f20c0dcaa610c5f40c1fc7c7f" +checksum = "a9d2c73448c919bd23faa508440308ed78358061516b0948c3e7fae12b74fcec" dependencies = [ "sqlx-core-oldapi", "sqlx-macros-oldapi", @@ -2279,9 +2285,9 @@ dependencies = [ [[package]] name = "sqlx-rt-oldapi" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb46a5504be9bb6a75c6dd34840966f4903b33f5673e531b313bde4fa176917" +checksum = "590bd090fb91067e79b12cb2d57521aa0ffc871b66f508f8470b66821d5174de" dependencies = [ "once_cell", "tokio", @@ -2317,9 +2323,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.27" +version = "2.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" +checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" dependencies = [ "proc-macro2", "quote", @@ -2352,7 +2358,7 @@ checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.28", ] [[package]] @@ -2368,10 +2374,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" +checksum = "b79eabcd964882a646b3584543ccabeae7869e9ac32a46f6f22b7a5bd405308b" dependencies = [ + "deranged", "itoa", "serde", "time-core", @@ -2386,9 +2393,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" +checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd" dependencies = [ "time-core", ] @@ -2436,7 +2443,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.28", ] [[package]] @@ -2542,7 +2549,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.28", ] [[package]] @@ -2713,7 +2720,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.28", "wasm-bindgen-shared", ] @@ -2735,7 +2742,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.28", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/Cargo.toml b/Cargo.toml index d841dee7..e01e30f2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sqlpage" -version = "0.9.0" +version = "0.9.1" 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"] @@ -17,7 +17,7 @@ panic = "abort" codegen-units = 2 [dependencies] -sqlx = { package = "sqlx-oldapi", version = "0.6.7", features = ["any", "runtime-actix-rustls", "sqlite", "postgres", "mysql", "mssql", "chrono"] } +sqlx = { package = "sqlx-oldapi", version = "0.6.8", features = ["any", "runtime-actix-rustls", "sqlite", "postgres", "mysql", "mssql", "chrono"] } chrono = "0.4.23" actix-web = { version = "4", features = ["rustls", "cookies"] } percent-encoding = "2.2.0" diff --git a/build.rs b/build.rs index b58bc282..9f22614b 100644 --- a/build.rs +++ b/build.rs @@ -37,7 +37,7 @@ fn process_input_file(path_out: &Path, original: File) { let url = line .trim_start_matches("/* !include ") .trim_end_matches(" */"); - let resp = ureq::get(url).call().unwrap(); + let resp = ureq::get(url).call().expect("We need to download remote js dependencies to compile sqlpage"); let mut contents = BufReader::new(resp.into_reader()); std::io::copy(&mut contents, &mut outfile).unwrap(); outfile.write_all(b"\n").unwrap();