Merge pull request #20910 from LightBender/odbc-deprecate

Deprecate the old ODBC 3.5 modules in core.sys.windows.
dlang · Feb 25, 2025 · 53a1cc8 · 53a1cc8
2 parents beef42e + a0581f2
commit 53a1cc8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/druntime/src/core/sys/windows/sql.d b/druntime/src/core/sys/windows/sql.d
@@ -11,13 +11,15 @@ $(RED Warning:
  */
 
 module core.sys.windows.sql;
+
+enum ODBCVER = 0x0400;
+
+deprecated ("The ODBC 3.5 modules are deprecated. Please use the ODBC4 modules in the `etc.c.odbc` package."):
 version (Windows):
 
 public import core.sys.windows.sqltypes;
 import core.sys.windows.windef;
 
-enum ODBCVER = 0x0351;
-
 enum SQL_ACCESSIBLE_PROCEDURES=20;
 enum SQL_ACCESSIBLE_TABLES=19;
 enum SQL_ALL_TYPES=0;

diff --git a/druntime/src/core/sys/windows/sqlext.d b/druntime/src/core/sys/windows/sqlext.d
@@ -11,6 +11,7 @@ $(RED Warning:
  */
 
 module core.sys.windows.sqlext;
+deprecated ("The ODBC 3.5 modules are deprecated. Please use the ODBC4 modules in the `etc.c.odbc` package."):
 version (Windows):
 
 /* Conversion notes:

diff --git a/druntime/src/core/sys/windows/sqltypes.d b/druntime/src/core/sys/windows/sqltypes.d
@@ -70,6 +70,10 @@ alias long   ODBCINT64, SQLBIGINT;
 alias ulong  SQLUBIGINT;
 //}
 
+//Everything above this line may by used by odbcinst.d
+//Everything below this line is deprecated
+deprecated ("The ODBC 3.5 modules are deprecated. Please use the ODBC4 modules in the `etc.c.odbc` package."):
+
 struct DATE_STRUCT {
     SQLSMALLINT year;
     SQLUSMALLINT month;

diff --git a/druntime/src/core/sys/windows/sqlucode.d b/druntime/src/core/sys/windows/sqlucode.d
@@ -11,6 +11,7 @@ $(RED Warning:
  */
 
 module core.sys.windows.sqlucode;
+deprecated ("The ODBC 3.5 modules are deprecated. Please use the ODBC4 modules in the `etc.c.odbc` package."):
 version (Windows):
 
 version (ANSI) {} else version = Unicode;