make odbc mandatory

Author: lovasoa

Cargo.lock

@@ -17,16 +17,6 @@ lto = "fat"
 panic = "abort"
 codegen-units = 2
 
-[features]
-# Build variants
-# - default (odbc-dynamic): ODBC enabled, dynamically linked (works on Linux, macOS, Windows)
-# - odbc-static: ODBC enabled, statically linked to the driver manager (Linux only)
-# - disable ODBC entirely: use `--no-default-features`
-default = ["odbc-dynamic"]
-odbc = ["sqlx/odbc"]
-odbc-dynamic = ["odbc"]
-odbc-static = ["odbc", "odbc-sys/static"]
-
 [dependencies]
 sqlx = { package = "sqlx-oldapi", git = "https://github.com/sqlpage/sqlx-oldapi", version = "0.6.49-beta.6", default-features = false, features = [
     "any",
@@ -36,6 +26,7 @@ sqlx = { package = "sqlx-oldapi", git = "https://github.com/sqlpage/sqlx-oldapi"
     "postgres",
     "mysql",
     "mssql",
+    "odbc",
     "chrono",
     "bigdecimal",
     "json",
@@ -84,13 +75,15 @@ clap = { version = "4.5.17", features = ["derive"] }
 tokio-util = "0.7.12"
 openidconnect = { version = "4.0.0", default-features = false }
 encoding_rs = "0.8.35"
-odbc-sys = { version = "0.27", optional = true }
 
 [target.'cfg(any(target_os = "linux", target_os = "macos"))'.dependencies]
-odbc-sys = { version = "0.27", optional = true, features = ["iodbc", "static"] }
+odbc-sys = { version = "0.27", features = ["iodbc", "static"] }
+
+[target.'cfg(any(target_os = "windows"))'.dependencies]
+odbc-sys = { version = "0.27", features = ["iodbc", "static"] }
 
 [patch.crates-io]
-odbc-sys = { git = "https://github.com/sqlpage/odbc-sys", branch = "main" }
+odbc-sys = { git = "https://github.com/sqlpage/odbc-sys", branch = "main" } # see https://github.com/pacman82/odbc-sys/pull/60
 
 [build-dependencies]
 awc = { version = "3", features = ["rustls-0_23-webpki-roots"] }

Cargo.toml

@@ -8,7 +8,6 @@ use crate::{
 };
 use anyhow::Context;
 use futures_util::future::BoxFuture;
-#[cfg(feature = "odbc")]
 use sqlx::odbc::OdbcConnectOptions;
 use sqlx::{
     any::{Any, AnyConnectOptions, AnyKind},
@@ -210,11 +209,9 @@ fn set_custom_connect_options(options: &mut AnyConnectOptions, config: &AppConfi
     if let Some(sqlite_options) = options.as_sqlite_mut() {
         set_custom_connect_options_sqlite(sqlite_options, config);
     }
-    #[cfg(feature = "odbc")]
-    {
-        if let Some(odbc_options) = options.as_odbc_mut() {
-            set_custom_connect_options_odbc(odbc_options, config);
-        }
+
+    if let Some(odbc_options) = options.as_odbc_mut() {
+        set_custom_connect_options_odbc(odbc_options, config);
     }
 }
 
@@ -243,7 +240,6 @@ fn make_sqlite_fun(name: &str, f: fn(&str) -> String) -> Function {
     })
 }
 
-#[cfg(feature = "odbc")]
 fn set_custom_connect_options_odbc(odbc_options: &mut OdbcConnectOptions, config: &AppConfig) {
     // Allow fetching very large text fields when using ODBC by removing the max column size limit
     let batch_size = config.max_pending_rows.clamp(1, 1024);