[PATCH 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.

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

[PATCH 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 | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
index 49e16b1df08..61f0b1b2176 100644
--- a/dlls/odbc32/proxyodbc.c
+++ b/dlls/odbc32/proxyodbc.c
@@ -1001,13 +1001,8 @@ 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. */
         }
 
         return stmt->hdr.win32_funcs->SQLColAttributes( stmt->hdr.win32_handle, col, field_id, char_attr, buflen,
@@ -6186,13 +6181,8 @@ 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. */
         }
 
         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

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

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=148010

Your paranoid android.


=== debian11 (build log) ===

../wine/dlls/odbc32/proxyodbc.c:1004:9: error: label at end of compound statement
../wine/dlls/odbc32/proxyodbc.c:6184:9: error: label at end of compound statement
Task: The win32 Wine build failed

=== debian11b (build log) ===

../wine/dlls/odbc32/proxyodbc.c:1004:9: error: label at end of compound statement
../wine/dlls/odbc32/proxyodbc.c:6184:9: error: label at end of compound statement
Task: The wow64 Wine build failed