From 2cd8221624950933b48f16266ef5a49f31e267a9 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Tue, 6 May 2025 07:55:00 +1000 Subject: [PATCH] Rebase against 226a7eeabbc13345e49da1ff8c018d6f06211c66. --- ...ributesW-accept-field-id-SQL_COLUMN_.patch | 33 ------------------- staging/upstream-commit | 2 +- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 patches/odbc32-fixes/0021-odbc32-SQLColAttributesW-accept-field-id-SQL_COLUMN_.patch diff --git a/patches/odbc32-fixes/0021-odbc32-SQLColAttributesW-accept-field-id-SQL_COLUMN_.patch b/patches/odbc32-fixes/0021-odbc32-SQLColAttributesW-accept-field-id-SQL_COLUMN_.patch deleted file mode 100644 index f0e9c672..00000000 --- a/patches/odbc32-fixes/0021-odbc32-SQLColAttributesW-accept-field-id-SQL_COLUMN_.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f9dc463e820b2b8840ef1b98957ba6f9b67d8e32 Mon Sep 17 00:00:00 2001 -From: Alistair Leslie-Hughes -Date: Mon, 5 May 2025 09:29:17 +1000 -Subject: [PATCH 1/4] odbc32: SQLColAttributesW accept field id - SQL_COLUMN_NAME. - ---- - dlls/odbc32/proxyodbc.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c -index 76c104e3a4a..ce69e3ae134 100644 ---- a/dlls/odbc32/proxyodbc.c -+++ b/dlls/odbc32/proxyodbc.c -@@ -1028,6 +1028,7 @@ static SQLRETURN col_attribute_win32_a( struct statement *stmt, SQLUSMALLINT col - field_id = SQL_COLUMN_NAME; - break; - -+ case SQL_COLUMN_NAME: - case SQL_COLUMN_TYPE: - case SQL_COLUMN_DISPLAY_SIZE: - case SQL_MAX_COLUMNS_IN_TABLE: -@@ -6386,6 +6387,7 @@ static SQLRETURN col_attribute_win32_w( struct statement *stmt, SQLUSMALLINT col - field_id = SQL_COLUMN_NAME; - break; - -+ case SQL_COLUMN_NAME: - case SQL_COLUMN_TYPE: - case SQL_COLUMN_DISPLAY_SIZE: - case SQL_MAX_COLUMNS_IN_TABLE: --- -2.47.2 - diff --git a/staging/upstream-commit b/staging/upstream-commit index 74ab5dc4..3b5bc04d 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -71c6c3dd6dcfffc040aa5a10a825eeb8e17f6299 +226a7eeabbc13345e49da1ff8c018d6f06211c66