Skip to content

Commit f738a82

Browse files
committed
Fix incorrect deprecation location. Simplify architecture check. Add changelog entry.
1 parent cd0d9a8 commit f738a82

File tree

6 files changed

+17
-53
lines changed

6 files changed

+17
-53
lines changed

changelog/odbc-4.dd

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
ODBC Bindings in `etc.c.odbc` have been updated to ODBC 4.0.
2+
3+
ODBC 4.0, via these new bindings, adds the following functionality:
4+
5+
1. Support for semi-structured data, such as JSON.
6+
2. Collection valued columns.
7+
3. Web-based Authorization flows.
8+
9+
A full list of new features can be found here: https://github.com/Microsoft/ODBC-Specification/blob/master/ODBC%204.0.md
10+
11+
Additionally these modules add support for 64-bit ODBC interfaces.

etc/c/odbc/package.d

Lines changed: 2 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -17,52 +17,9 @@ See_Also: $(LINK2 https://docs.microsoft.com/en-us/sql/odbc/reference/syntax/odb
1717

1818
module etc.c.odbc;
1919

20-
//64-bit architectures
21-
version(X86_64) {
20+
static if (size_t.sizeof == 8) {
2221
public import etc.c.odbc.odbc64;
23-
}
24-
version(AArch64) {
25-
public import etc.c.odbc.odbc64;
26-
}
27-
version(PPC64) {
28-
public import etc.c.odbc.odbc64;
29-
}
30-
version(MIPS64) {
31-
public import etc.c.odbc.odbc64;
32-
}
33-
version(RISCV64) {
34-
public import etc.c.odbc.odbc64;
35-
}
36-
version(SPARC64) {
37-
public import etc.c.odbc.odbc64;
38-
}
39-
version(HPPA64) {
40-
public import etc.c.odbc.odbc64;
41-
}
42-
version(IA64) {
43-
public import etc.c.odbc.odbc64;
44-
}
45-
46-
//32-bit architectures
47-
version(X86) {
48-
public import etc.c.odbc.odbc32;
49-
}
50-
version(ARM) {
51-
public import etc.c.odbc.odbc32;
52-
}
53-
version(PPC32) {
54-
public import etc.c.odbc.odbc32;
55-
}
56-
version(MIPS32) {
57-
public import etc.c.odbc.odbc32;
58-
}
59-
version(RISCV32) {
60-
public import etc.c.odbc.odbc32;
61-
}
62-
version(SPARC) {
63-
public import etc.c.odbc.odbc32;
64-
}
65-
version(HPPA) {
22+
} else {
6623
public import etc.c.odbc.odbc32;
6724
}
6825

etc/c/odbc/sql.d

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ Declarations for interfacing with the ODBC library.
1111
See_Also: $(LINK2 https://docs.microsoft.com/en-us/sql/odbc/reference/syntax/odbc-api-reference,
1212
ODBC API Reference on MSDN)
1313
*/
14+
deprecated ("The ODBC 3.5 modules are deprecated. Please use the ODBC4 modules in the `etc.c.odbc` package.")
1415
module etc.c.odbc.sql;
15-
deprecated("The ODBC 3.5 modules are deprecated. Please use the ODBC4 module in the etc.c.odbc package");
16-
deprecated:
1716

1817
public import etc.c.odbc.sqltypes;
1918

etc/c/odbc/sqlext.d

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@
99
See_Also: $(LINK2 https://docs.microsoft.com/en-us/sql/odbc/reference/syntax/odbc-api-reference,
1010
ODBC API Reference on MSDN)
1111
*/
12+
deprecated ("The ODBC 3.5 modules are deprecated. Please use the ODBC4 modules in the `etc.c.odbc` package.")
1213
module etc.c.odbc.sqlext;
13-
deprecated("The ODBC 3.5 modules are deprecated. Please use the ODBC4 module in the etc.c.odbc package");
14-
deprecated:
1514

1615
/* Conversion notes:
1716
The MinGW file was a horrible mess. All of the #defines were sorted alphabetically,

etc/c/odbc/sqltypes.d

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ Declarations for interfacing with the ODBC library.
1111
See_Also: $(LINK2 https://docs.microsoft.com/en-us/sql/odbc/reference/syntax/odbc-api-reference,
1212
ODBC API Reference on MSDN)
1313
*/
14+
deprecated ("The ODBC 3.5 modules are deprecated. Please use the ODBC4 modules in the `etc.c.odbc` package.")
1415
module etc.c.odbc.sqltypes;
15-
deprecated("The ODBC 3.5 modules are deprecated. Please use the ODBC4 module in the etc.c.odbc package");
16-
deprecated:
1716

1817
version (ANSI) {} else version = Unicode;
1918

etc/c/odbc/sqlucode.d

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ Declarations for interfacing with the ODBC library.
1111
See_Also: $(LINK2 https://docs.microsoft.com/en-us/sql/odbc/reference/syntax/odbc-api-reference,
1212
ODBC API Reference on MSDN)
1313
*/
14+
deprecated ("The ODBC 3.5 modules are deprecated. Please use the ODBC4 modules in the `etc.c.odbc` package.")
1415
module etc.c.odbc.sqlucode;
15-
deprecated("The ODBC 3.5 modules are deprecated. Please use the ODBC4 module in the etc.c.odbc package");
16-
deprecated:
1716

1817
version (ANSI) {} else version = Unicode;
1918

0 commit comments

Comments
 (0)