[PATCH v2 0/1] MR10556: odbc32: Report SQL_TIMESTAMP format for timestamp data in ODBC 2.x application.
-- v2: odbc32: Support data type conversion on version mismatch. https://gitlab.winehq.org/wine/wine/-/merge_requests/10556
From: Piotr Caban <piotr@codeweavers.com> --- dlls/odbc32/proxyodbc.c | 129 +++++++++++++++++++++++++++------- dlls/odbc32/tests/driver.c | 8 +++ dlls/odbc32/tests/driver.h | 2 + dlls/odbc32/tests/driver.spec | 1 + dlls/odbc32/tests/odbc32.c | 68 +++++++++++++++++- 5 files changed, 183 insertions(+), 25 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 22720088b0c..15d69035d37 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -473,6 +473,55 @@ static struct environment *create_environment( void ) return ret; } +static SQLSMALLINT map_type( struct statement *stmt, BOOL in, SQLSMALLINT type ) +{ + struct connection *con = (struct connection *)stmt->hdr.parent; + struct environment *env = (struct environment *)con->hdr.parent; + + C_ASSERT(SQL_DATE == SQL_C_DATE); + C_ASSERT(SQL_TIME == SQL_C_TIME); + C_ASSERT(SQL_TIMESTAMP == SQL_C_TIMESTAMP); + C_ASSERT(SQL_TYPE_DATE == SQL_C_TYPE_DATE); + C_ASSERT(SQL_TYPE_TIME == SQL_C_TYPE_TIME); + C_ASSERT(SQL_TYPE_TIMESTAMP == SQL_C_TYPE_TIMESTAMP); + + switch (type) + { + case SQL_DATE: + if ((in && con->driver_odbc_ver >= 0x300) + || (!in && env->attr_version >= SQL_OV_ODBC3)) + return SQL_TYPE_DATE; + break; + case SQL_TIME: + if ((in && con->driver_odbc_ver >= 0x300) + || (!in && env->attr_version >= SQL_OV_ODBC3)) + return SQL_TYPE_TIME; + break; + case SQL_TIMESTAMP: + if ((in && con->driver_odbc_ver >= 0x300) + || (!in && env->attr_version >= SQL_OV_ODBC3)) + return SQL_TYPE_TIMESTAMP; + break; + case SQL_TYPE_DATE: + if ((in && con->driver_odbc_ver < 0x300) + || (!in && env->attr_version == SQL_OV_ODBC2)) + return SQL_DATE; + break; + case SQL_TYPE_TIME: + if ((in && con->driver_odbc_ver < 0x300) + || (!in && env->attr_version == SQL_OV_ODBC2)) + return SQL_TIME; + break; + case SQL_TYPE_TIMESTAMP: + if ((in && con->driver_odbc_ver < 0x300) + || (!in && env->attr_version == SQL_OV_ODBC2)) + return SQL_TIMESTAMP; + break; + } + + return type; +} + /************************************************************************* * SQLAllocEnv [ODBC32.002] */ @@ -806,6 +855,8 @@ static SQLRETURN bind_col_unix( struct statement *stmt, SQLUSMALLINT column, SQL static SQLRETURN bind_col_win32( struct statement *stmt, SQLUSMALLINT column, SQLSMALLINT type, SQLPOINTER value, SQLLEN buflen, SQLLEN *retlen ) { + type = map_type( stmt, TRUE, type ); + if (stmt->hdr.win32_funcs->SQLBindCol) return stmt->hdr.win32_funcs->SQLBindCol( stmt->hdr.win32_handle, column, type, value, buflen, retlen ); return SQL_ERROR; @@ -945,17 +996,20 @@ static SQLRETURN col_attribute_win32_a( struct statement *stmt, SQLUSMALLINT col SQLPOINTER char_attr, SQLSMALLINT buflen, SQLSMALLINT *retlen, SQLLEN *num_attr ) { - SQLRETURN ret; + SQLRETURN ret = SQL_ERROR; if (stmt->hdr.win32_funcs->SQLColAttribute) - return stmt->hdr.win32_funcs->SQLColAttribute( stmt->hdr.win32_handle, col, field_id, char_attr, buflen, + { + ret = stmt->hdr.win32_funcs->SQLColAttribute( stmt->hdr.win32_handle, col, field_id, char_attr, buflen, retlen, num_attr ); - - if (stmt->hdr.win32_funcs->SQLColAttributeW) + } + else if (stmt->hdr.win32_funcs->SQLColAttributeW) { if (buflen < 0) + { ret = stmt->hdr.win32_funcs->SQLColAttributeW( stmt->hdr.win32_handle, col, field_id, char_attr, buflen, retlen, num_attr ); + } else { SQLWCHAR *strW; @@ -971,10 +1025,8 @@ static SQLRETURN col_attribute_win32_a( struct statement *stmt, SQLUSMALLINT col } free( strW ); } - return ret; } - - if (stmt->hdr.win32_funcs->SQLColAttributes) + else if (stmt->hdr.win32_funcs->SQLColAttributes) { if (buflen < 0) return SQL_ERROR; if (!col) @@ -1024,11 +1076,13 @@ static SQLRETURN col_attribute_win32_a( struct statement *stmt, SQLUSMALLINT col return SQL_ERROR; } - return stmt->hdr.win32_funcs->SQLColAttributes( stmt->hdr.win32_handle, col, field_id, char_attr, buflen, + ret = stmt->hdr.win32_funcs->SQLColAttributes( stmt->hdr.win32_handle, col, field_id, char_attr, buflen, retlen, num_attr ); } - return SQL_ERROR; + if (SUCCESS( ret ) && num_attr && field_id == SQL_COLUMN_TYPE) + *num_attr = map_type( stmt, FALSE, *num_attr ); + return ret; } /************************************************************************* @@ -1817,10 +1871,11 @@ static SQLRETURN describe_col_win32_a( struct statement *stmt, SQLUSMALLINT col_ SQLRETURN ret = SQL_ERROR; if (stmt->hdr.win32_funcs->SQLDescribeCol) - return stmt->hdr.win32_funcs->SQLDescribeCol( stmt->hdr.win32_handle, col_number, col_name, buflen, retlen, + { + ret = stmt->hdr.win32_funcs->SQLDescribeCol( stmt->hdr.win32_handle, col_number, col_name, buflen, retlen, data_type, col_size, decimal_digits, nullable ); - - if (stmt->hdr.win32_funcs->SQLDescribeColW) + } + else if (stmt->hdr.win32_funcs->SQLDescribeColW) { SQLWCHAR *nameW; SQLSMALLINT lenW; @@ -1835,6 +1890,9 @@ static SQLRETURN describe_col_win32_a( struct statement *stmt, SQLUSMALLINT col_ } free( nameW ); } + + if (SUCCESS( ret ) && data_type) + *data_type = map_type( stmt, FALSE, *data_type ); return ret; } @@ -2748,6 +2806,8 @@ static SQLRETURN get_data_win32( struct statement *stmt, SQLUSMALLINT column, SQ if (!stmt->hdr.win32_funcs->SQLGetData) return SQL_ERROR; + type = map_type( stmt, TRUE, type ); + if (type == SQL_C_WCHAR && is_ansi_driver( &stmt->hdr )) { SQLLEN data_len = buflen / sizeof(WCHAR) - 1; @@ -4160,6 +4220,8 @@ static SQLRETURN set_param_win32( struct statement *stmt, SQLUSMALLINT param, SQ SQLSMALLINT param_type, SQLULEN precision, SQLSMALLINT scale, SQLPOINTER value, SQLLEN *retlen ) { + value_type = map_type( stmt, TRUE, value_type ); + param_type = map_type( stmt, TRUE, param_type ); if (stmt->hdr.win32_funcs->SQLSetParam) return stmt->hdr.win32_funcs->SQLSetParam( stmt->hdr.win32_handle, param, value_type, param_type, precision, scale, value, retlen ); @@ -5132,9 +5194,14 @@ static SQLRETURN describe_param_unix( struct statement *stmt, SQLUSMALLINT param static SQLRETURN describe_param_win32( struct statement *stmt, SQLUSMALLINT param, SQLSMALLINT *type, SQLULEN *size, SQLSMALLINT *digits, SQLSMALLINT *nullable ) { + SQLRETURN ret = SQL_ERROR; + if (stmt->hdr.win32_funcs->SQLDescribeParam) - return stmt->hdr.win32_funcs->SQLDescribeParam( stmt->hdr.win32_handle, param, type, size, digits, nullable ); - return SQL_ERROR; + ret = stmt->hdr.win32_funcs->SQLDescribeParam( stmt->hdr.win32_handle, param, type, size, digits, nullable ); + + if (SUCCESS( ret ) && type) + *type = map_type( stmt, FALSE, *type ); + return ret; } /************************************************************************* @@ -5910,6 +5977,8 @@ static SQLRETURN bind_parameter_win32( struct statement *stmt, SQLUSMALLINT para SQLSMALLINT value_type, SQLSMALLINT param_type, SQLULEN size, SQLSMALLINT digits, SQLPOINTER value, SQLLEN buflen, SQLLEN *len ) { + value_type = map_type( stmt, TRUE, value_type ); + param_type = map_type( stmt, TRUE, param_type ); if (stmt->hdr.win32_funcs->SQLBindParameter) return stmt->hdr.win32_funcs->SQLBindParameter( stmt->hdr.win32_handle, param, io_type, value_type, param_type, size, digits, value, buflen, len ); @@ -6265,11 +6334,19 @@ static SQLRETURN describe_col_win32_w( struct statement *stmt, SQLUSMALLINT col_ SQLSMALLINT buf_len, SQLSMALLINT *name_len, SQLSMALLINT *data_type, SQLULEN *col_size, SQLSMALLINT *decimal_digits, SQLSMALLINT *nullable ) { + SQLRETURN ret = SQL_ERROR; + if (stmt->hdr.win32_funcs->SQLDescribeColW) - return stmt->hdr.win32_funcs->SQLDescribeColW( stmt->hdr.win32_handle, col_number, col_name, buf_len, + { + ret = stmt->hdr.win32_funcs->SQLDescribeColW( stmt->hdr.win32_handle, col_number, col_name, buf_len, name_len, data_type, col_size, decimal_digits, nullable ); - if (stmt->hdr.win32_funcs->SQLDescribeCol) FIXME( "Unicode to ANSI conversion not handled\n" ); - return SQL_ERROR; + } + else if (stmt->hdr.win32_funcs->SQLDescribeCol) FIXME( "Unicode to ANSI conversion not handled\n" ); + + + if (SUCCESS( ret ) && data_type) + *data_type = map_type( stmt, FALSE, *data_type ); + return ret; } /************************************************************************* @@ -6610,17 +6687,19 @@ static SQLRETURN col_attribute_win32_w( struct statement *stmt, SQLUSMALLINT col SQLPOINTER char_attr, SQLSMALLINT buflen, SQLSMALLINT *retlen, SQLLEN *num_attr ) { + SQLRETURN ret = SQL_ERROR; + if (stmt->hdr.win32_funcs->SQLColAttributeW) - return stmt->hdr.win32_funcs->SQLColAttributeW( stmt->hdr.win32_handle, col, field_id, char_attr, buflen, + { + ret = stmt->hdr.win32_funcs->SQLColAttributeW( stmt->hdr.win32_handle, col, field_id, char_attr, buflen, retlen, num_attr ); - - if (stmt->hdr.win32_funcs->SQLColAttribute) + } + else if (stmt->hdr.win32_funcs->SQLColAttribute) { FIXME( "Unicode to ANSI conversion not handled\n" ); return SQL_ERROR; } - - if (stmt->hdr.win32_funcs->SQLColAttributesW) + else if (stmt->hdr.win32_funcs->SQLColAttributesW) { if (buflen < 0) return SQL_ERROR; if (!col) @@ -6670,11 +6749,13 @@ static SQLRETURN col_attribute_win32_w( struct statement *stmt, SQLUSMALLINT col return SQL_ERROR; } - return stmt->hdr.win32_funcs->SQLColAttributesW( stmt->hdr.win32_handle, col, field_id, char_attr, buflen, + ret = stmt->hdr.win32_funcs->SQLColAttributesW( stmt->hdr.win32_handle, col, field_id, char_attr, buflen, retlen, num_attr ); } - return SQL_ERROR; + if (SUCCESS( ret ) && num_attr && field_id == SQL_COLUMN_TYPE) + *num_attr = map_type( stmt, FALSE, *num_attr ); + return ret; } /************************************************************************* diff --git a/dlls/odbc32/tests/driver.c b/dlls/odbc32/tests/driver.c index 7e3c8c7ade3..8dbdccd4f82 100644 --- a/dlls/odbc32/tests/driver.c +++ b/dlls/odbc32/tests/driver.c @@ -178,3 +178,11 @@ SQLRETURN WINAPI SQLFreeStmt( SQLHSTMT stmt, SQLUSMALLINT option ) { return driver_funcs->SQLFreeStmt( stmt, option ); } + +SQLRETURN WINAPI SQLDescribeCol( SQLHSTMT stmt, SQLUSMALLINT col, + SQLCHAR *name, SQLSMALLINT max_len, SQLSMALLINT *len, SQLSMALLINT *type, + SQLULEN *size, SQLSMALLINT *dec_digits, SQLSMALLINT *nullable ) +{ + return driver_funcs->SQLDescribeCol( stmt, col, name, max_len, len, + type, size, dec_digits, nullable ); +} diff --git a/dlls/odbc32/tests/driver.h b/dlls/odbc32/tests/driver.h index 1f04f464ace..5a6ea559a89 100644 --- a/dlls/odbc32/tests/driver.h +++ b/dlls/odbc32/tests/driver.h @@ -53,4 +53,6 @@ struct driver_funcs SQLRETURN (WINAPI *SQLSetDescField)(SQLHDESC, SQLSMALLINT, SQLSMALLINT, SQLPOINTER, SQLINTEGER); SQLRETURN (WINAPI *SQLFreeStmt)(SQLHSTMT, SQLUSMALLINT); + SQLRETURN (WINAPI *SQLDescribeCol)(SQLHSTMT, SQLUSMALLINT, SQLCHAR*, SQLSMALLINT, + SQLSMALLINT*, SQLSMALLINT*, SQLULEN*, SQLSMALLINT*, SQLSMALLINT*); }; diff --git a/dlls/odbc32/tests/driver.spec b/dlls/odbc32/tests/driver.spec index 99359bf8ee8..31eceac5c28 100644 --- a/dlls/odbc32/tests/driver.spec +++ b/dlls/odbc32/tests/driver.spec @@ -5,6 +5,7 @@ @ stdcall SQLBindParameter(long long long long long long long ptr long ptr) @ stdcall SQLBrowseConnect(long str long ptr long ptr) @ stdcall SQLConnect(long str long str long str long) +@ stdcall SQLDescribeCol(long long ptr long ptr ptr ptr ptr ptr) @ stdcall SQLDisconnect(long) @ stdcall SQLDriverConnect(long long str long ptr long ptr long) @ stdcall SQLExecDirect(long str long) diff --git a/dlls/odbc32/tests/odbc32.c b/dlls/odbc32/tests/odbc32.c index 8b9b88d72db..b83e6ebfdc3 100644 --- a/dlls/odbc32/tests/odbc32.c +++ b/dlls/odbc32/tests/odbc32.c @@ -89,6 +89,7 @@ DEFINE_EXPECT( driver_SQLBindParameter ); DEFINE_EXPECT( driver_SQLExecute ); DEFINE_EXPECT( driver_SQLSetDescField ); DEFINE_EXPECT( driver_SQLFreeStmt ); +DEFINE_EXPECT( driver_SQLDescribeCol ); static struct stmt_data { @@ -528,6 +529,38 @@ static SQLRETURN WINAPI driver_SQLFreeStmt( SQLHSTMT stmt, SQLUSMALLINT option ) return SQL_SUCCESS; } +static SQLRETURN WINAPI driver_SQLDescribeCol( SQLHSTMT stmt, SQLUSMALLINT col, + SQLCHAR *name, SQLSMALLINT max_len, SQLSMALLINT *len, SQLSMALLINT *type, + SQLULEN *size, SQLSMALLINT *dec_digits, SQLSMALLINT *nullable ) +{ + CHECK_EXPECT( driver_SQLDescribeCol ); + ok( (ULONG_PTR)stmt == SQL_HANDLE_STMT, "stmt = %p\n", stmt ); + ok( type != NULL, "type = %p\n", type ); + ok( !size, "size = %p\n", size ); + ok( !dec_digits, "dec_digits = %p\n", dec_digits ); + ok( !nullable, "nullable = %p\n", nullable ); + + switch (col) + { + case 1: + ok( name != NULL, "name = %p\n", name ); + ok( max_len == 32, "max_len = %d\n", max_len ); + ok( len != NULL, "len = %p\n", len ); + *len = 2; + strcpy( (char *)name, "Id" ); + *type = SQL_INTEGER; + break; + default: + ok( !name, "name = %p\n", name ); + ok( !max_len, "max_len = %d\n", max_len ); + todo_wine ok( len != NULL, "len = %p\n", len ); + *type = col; + break; + } + + return SQL_SUCCESS; +} + struct driver_funcs driver_funcs = { driver_SQLAllocHandle, @@ -555,6 +588,7 @@ struct driver_funcs driver_funcs = driver_SQLExecute, driver_SQLSetDescField, driver_SQLFreeStmt, + driver_SQLDescribeCol, }; static void load_resource(const char *name, char *path) @@ -1028,7 +1062,7 @@ static void test_SQLExecDirect( void ) SQLULEN rows_fetched; SQLINTEGER id[2], err, size; SQLCHAR name[32], msg[256], state[6]; - SQLSMALLINT len; + SQLSMALLINT len, type; ret = SQLAllocEnv( &env ); ok( ret == SQL_SUCCESS, "got %d\n", ret ); @@ -1087,6 +1121,38 @@ static void test_SQLExecDirect( void ) ok( ret == SQL_SUCCESS, "got %d\n", ret ); ok( stmt_data.rows_no == 1, "rows_no = %d\n", stmt_data.rows_no ); + SET_EXPECT( driver_SQLDescribeCol ); + ret = SQLDescribeCol( stmt, 1, name, sizeof(name), &len, &type, NULL, NULL, NULL ); + CHECK_CALLED( driver_SQLDescribeCol ); + ok( ret == SQL_SUCCESS, "got %d\n", ret ); + ok( len == 2, "len = %d\n", len ); + ok( !strcmp((char *)name, "Id"), "name = %s\n", wine_dbgstr_an((char *)name, len) ); + ok( type == SQL_INTEGER, "type = %d\n", type ); + + SET_EXPECT( driver_SQLDescribeCol ); + ret = SQLDescribeCol( stmt, SQL_DATE, NULL, 0, NULL, &type, NULL, NULL, NULL ); + CHECK_CALLED( driver_SQLDescribeCol ); + ok( ret == SQL_SUCCESS, "got %d\n", ret ); + ok( type == SQL_DATE, "type = %d\n", type ); + + SET_EXPECT( driver_SQLDescribeCol ); + ret = SQLDescribeCol( stmt, SQL_TYPE_DATE, NULL, 0, NULL, &type, NULL, NULL, NULL ); + CHECK_CALLED( driver_SQLDescribeCol ); + ok( ret == SQL_SUCCESS, "got %d\n", ret ); + ok( type == SQL_DATE, "type = %d\n", type ); + + SET_EXPECT( driver_SQLDescribeCol ); + ret = SQLDescribeCol( stmt, SQL_TYPE_TIME, NULL, 0, NULL, &type, NULL, NULL, NULL ); + CHECK_CALLED( driver_SQLDescribeCol ); + ok( ret == SQL_SUCCESS, "got %d\n", ret ); + ok( type == SQL_TIME, "type = %d\n", type ); + + SET_EXPECT( driver_SQLDescribeCol ); + ret = SQLDescribeCol( stmt, SQL_TYPE_TIMESTAMP, NULL, 0, NULL, &type, NULL, NULL, NULL ); + CHECK_CALLED( driver_SQLDescribeCol ); + ok( ret == SQL_SUCCESS, "got %d\n", ret ); + ok( type == SQL_TIMESTAMP, "type = %d\n", type ); + SET_EXPECT( driver_SQLExecDirect ); ret = SQLExecDirect( stmt, (SQLCHAR *)"INSERT INTO winetest VALUES (1, 'Mary')", ARRAYSIZE("INSERT INTO winetest VALUES (1, 'Mary')") - 1 ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10556
On Sat Apr 4 15:51:11 2026 +0000, Piotr Caban wrote:
I'll try to add FIXME's for missing cases. I've pushed new patch that implements type mapping in all functions.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/10556#note_137018
This merge request was approved by Hans Leidekker. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10556
participants (3)
-
Hans Leidekker (＠hans) -
Piotr Caban
-
Piotr Caban (＠piotr)