[PATCH v2 0/1] MR6365: odbc32: Always pass through the field id to SQLColAttributes/W

[Alistair Leslie-Hughes (＠alesliehughes)]

Application was quering for SQL_MAX_COLUMNS_IN_TABLE (101).

Let all fields through and only convert ones that need it.

--
  v2: odbc32: Always pass through the field id to SQLColAttributes/W
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6365

[PATCH v2 1/1] odbc32: Always pass through the field id to SQLColAttributes/W

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>

Application was quering for SQL_MAX_COLUMNS_IN_TABLE (101).

Let all through and only convert ones that need it.
---
 dlls/odbc32/proxyodbc.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
index 49e16b1df08..9009dc550ba 100644
--- a/dlls/odbc32/proxyodbc.c
+++ b/dlls/odbc32/proxyodbc.c
@@ -1001,13 +1001,9 @@ static SQLRETURN col_attribute_win32_a( struct statement *stmt, SQLUSMALLINT col
             field_id = SQL_DESC_NULLABLE;
             break;
 
-        case SQL_COLUMN_TYPE:
-        case SQL_COLUMN_DISPLAY_SIZE:
-            break;
-
         default:
-            FIXME( "field id %u not handled\n", field_id );
-            return SQL_ERROR;
+            /* Pass through field id. */
+            break;
         }
 
         return stmt->hdr.win32_funcs->SQLColAttributes( stmt->hdr.win32_handle, col, field_id, char_attr, buflen,
@@ -6186,13 +6182,9 @@ static SQLRETURN col_attribute_win32_w( struct statement *stmt, SQLUSMALLINT col
             field_id = SQL_DESC_NULLABLE;
             break;
 
-        case SQL_COLUMN_TYPE:
-        case SQL_COLUMN_DISPLAY_SIZE:
-            break;
-
         default:
-            FIXME( "field id %u not handled\n", field_id );
-            return SQL_ERROR;
+            /* Pass through field id. */
+            break;
         }
 
         return stmt->hdr.win32_funcs->SQLColAttributesW( stmt->hdr.win32_handle, col, field_id, char_attr, buflen,
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6365

[Hans Leidekker (＠hans)]

Some of the other field IDs need special handling too. Let's just pass through SQL_MAX_COLUMNS_IN_TABLE.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6365#note_80122