connectivity/source/inc/odbc/OFunctions.hxx | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 8942956e05f2208ffb666a2118f5db092c30ce6a
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Wed Feb 16 22:10:49 2022 +0100
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Thu Feb 17 08:57:47 2022 +0100
ODBC: fix signatures of Bulk, SpecialColumns et NativeSQL
I compared with
https://docs.microsoft.com/en-us/sql/odbc/reference/syntax/odbc-api-reference?view=sql-server-ver15
Change-Id: Iac38c2305fbf3ace502f9e75802510f76a6bd700
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130055
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/connectivity/source/inc/odbc/OFunctions.hxx
b/connectivity/source/inc/odbc/OFunctions.hxx
index da3545c9ad79..4033fa23c1e7 100644
--- a/connectivity/source/inc/odbc/OFunctions.hxx
+++ b/connectivity/source/inc/odbc/OFunctions.hxx
@@ -336,7 +336,7 @@ bool LoadLibrary_ODBC3(OUString &_rPath);
#define N3SQLSetPos(a,b,c,d)
(*reinterpret_cast<T3SQLSetPos>(getOdbcFunction(ODBC3SQLFunctionId::SetPos)))(a,b,c,d)
typedef SQLRETURN (SQL_API *T3SQLBulkOperations) ( SQLHSTMT
StatementHandle,
- SQLSMALLINT Operation);
+ SQLUSMALLINT
Operation);
#define N3SQLBulkOperations(a,b)
(*reinterpret_cast<T3SQLBulkOperations>(getOdbcFunction(ODBC3SQLFunctionId::BulkOperations)))(a,b)
@@ -440,15 +440,15 @@ bool LoadLibrary_ODBC3(OUString &_rPath);
#define N3SQLProcedures(a,b,c,d,e,f,g)
(*reinterpret_cast<T3SQLProcedures>(getOdbcFunction(ODBC3SQLFunctionId::Procedures)))(a,b,c,d,e,f,g)
typedef SQLRETURN (SQL_API *T3SQLSpecialColumns) (SQLHSTMT
StatementHandle,
- SQLUSMALLINT
IdentifierType,
+ SQLSMALLINT
IdentifierType,
SQLCHAR *
CatalogName,
SQLSMALLINT
NameLength1,
SQLCHAR *
SchemaName,
SQLSMALLINT
NameLength2,
SQLCHAR *
TableName,
SQLSMALLINT
NameLength3,
- SQLUSMALLINT Scope,
- SQLUSMALLINT
Nullable);
+ SQLSMALLINT Scope,
+ SQLSMALLINT
Nullable);
#define N3SQLSpecialColumns(a,b,c,d,e,f,g,h,i,j)
(*reinterpret_cast<T3SQLSpecialColumns>(getOdbcFunction(ODBC3SQLFunctionId::SpecialColumns)))(a,b,c,d,e,f,g,h,i,j)
@@ -523,7 +523,7 @@ bool LoadLibrary_ODBC3(OUString &_rPath);
#define N3SQLGetCursorName(a,b,c,d)
(*reinterpret_cast<T3SQLGetCursorName>(getOdbcFunction(ODBC3SQLFunctionId::GetCursorName)))(a,b,c,d)
- typedef SQLRETURN (SQL_API *T3SQLNativeSql) ( SQLHSTMT
ConnectionHandle,
+ typedef SQLRETURN (SQL_API *T3SQLNativeSql) ( SQLHDBC
ConnectionHandle,
SQLCHAR *
InStatementText,
SQLINTEGER
TextLength1,
SQLCHAR *
OutStatementText,
