use ODBC dub package

buggins · Mar 2, 2022 · ff8ac54 · ff8ac54
1 parent 51f33a3
commit ff8ac54
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/dub.json b/dub.json
@@ -20,7 +20,8 @@
             "versions": ["USE_MYSQL", "USE_SQLITE", "USE_PGSQL", "USE_ODBC"],
             "dependencies": {
                 "mysql-native": "~>3.0.3",
-                "derelict-pq": "~>2.2.0"
+                "derelict-pq": "~>2.2.0",
+                "odbc": "~>1.0.0"
             },
             "libs-posix": ["sqlite3", "odbc"],
             "libs-windows": ["odbc32"],
@@ -38,7 +39,8 @@
             "versions": ["USE_MYSQL", "USE_SQLITE", "USE_PGSQL", "USE_ODBC"],
             "dependencies": {
                 "mysql-native": "~>3.0.3",
-                "derelict-pq": "~>2.2.0"
+                "derelict-pq": "~>2.2.0",
+                "odbc": "~>1.0.0"
             },
             "libs-windows": ["odbc32"],
             "copyFiles-windows-x86": [ "libs/win32/sqlite3.dll", "libs/win32/libpq.dll"],
@@ -84,7 +86,10 @@
             "name": "ODBC",
             "versions": ["USE_ODBC"],
             "libs-posix": ["odbc"],
-            "libs-windows": ["odbc32"]
+            "libs-windows": ["odbc32"],
+            "dependencies": {
+                "odbc": "~>1.0.0"
+            }
         },
         {
             "name": "API"

diff --git a/source/ddbc/drivers/odbcddbc.d b/source/ddbc/drivers/odbcddbc.d
@@ -76,16 +76,10 @@ version (USE_ODBC)
 
     // The etc.c.odbc.* modules are deprecated and due for removal in Feb 2022
     // https://dlang.org/phobos/etc_c_odbc_sql.html
-    // We should now use core.sys.windows.* instead
-    static if(__VERSION__ < 2096) {
-        import etc.c.odbc.sql;
-        import etc.c.odbc.sqlext;
-        import etc.c.odbc.sqltypes;
-    } else {
-        import core.sys.windows.sql;
-        import core.sys.windows.sqlext;
-        import core.sys.windows.sqltypes;
-    }
+    // We should now use the odbc dub package instead
+    import odbc.sql;
+    import odbc.sqlext;
+    import odbc.sqltypes;
 
     /*private SQLRETURN check(lazy SQLRETURN fn, SQLHANDLE h, SQLSMALLINT t,
             string file = __FILE__, size_t line = __LINE__)