ibm_db 2.0.0-mswin32 → 2.5.0-mswin32

data/ext/ruby_ibm_db.h

@@ -201,10 +201,18 @@ VALUE ibm_db_active(int argc, VALUE *argv, VALUE self);
 */
 struct _ibm_db_globals {
   int  bin_mode;
-  char __ruby_conn_err_msg[DB2_MAX_ERR_MSG_LEN];
-  char __ruby_conn_err_state[SQL_SQLSTATE_SIZE + 1];
-  char __ruby_stmt_err_msg[DB2_MAX_ERR_MSG_LEN];
-  char __ruby_stmt_err_state[SQL_SQLSTATE_SIZE + 1];
+#ifdef UNICODE_SUPPORT_VERSION
+  SQLWCHAR  __ruby_conn_err_msg[DB2_MAX_ERR_MSG_LEN];
+  SQLWCHAR  __ruby_stmt_err_msg[DB2_MAX_ERR_MSG_LEN];
+  SQLWCHAR  __ruby_conn_err_state[SQL_SQLSTATE_SIZE + 1];
+  SQLWCHAR  __ruby_stmt_err_state[SQL_SQLSTATE_SIZE + 1];
+#else
+  char      __ruby_conn_err_msg[DB2_MAX_ERR_MSG_LEN];
+  char      __ruby_stmt_err_msg[DB2_MAX_ERR_MSG_LEN];
+  char      __ruby_conn_err_state[SQL_SQLSTATE_SIZE + 1];
+  char      __ruby_stmt_err_state[SQL_SQLSTATE_SIZE + 1];
+#endif
+
 #ifdef PASE /* i5/OS ease of use turn off commit */
   long i5_allow_commit;
 #endif /* PASE */

data/ext/ruby_ibm_db_cli.c

@@ -29,12 +29,23 @@
 */
 int _ruby_ibm_db_SQLConnect_helper(connect_args *data) {
   if(data->ctlg_conn == 1) {
+#ifndef UNICODE_SUPPORT_VERSION
     return SQLConnect( (SQLHDBC)*(data->hdbc), (SQLCHAR *)data->database,
             (SQLSMALLINT)data->database_len, (SQLCHAR *)data->uid, (SQLSMALLINT)data->uid_len,
             (SQLCHAR *)data->password, (SQLSMALLINT)data->password_len );
+#else
+    return SQLConnectW( (SQLHDBC)*(data->hdbc), data->database,
+            data->database_len, data->uid, data->uid_len,
+            data->password, data->password_len );
+#endif
   } else {
+#ifndef UNICODE_SUPPORT_VERSION
     return SQLDriverConnect( (SQLHDBC) *(data->hdbc), (SQLHWND)NULL,
             (SQLCHAR*)data->database, SQL_NTS, NULL, 0, NULL, SQL_DRIVER_NOPROMPT );
+#else
+    return SQLDriverConnectW( (SQLHDBC) *(data->hdbc), (SQLHWND)NULL,
+            data->database, SQL_NTS, NULL, 0, NULL, SQL_DRIVER_NOPROMPT );
+#endif
   }
 }
 
@@ -84,10 +95,17 @@ int _ruby_ibm_db_SQLDescribeCol_helper(describecol_args *data) {
 
   data->stmt_res->is_executing = 1;
 
+#ifdef UNICODE_SUPPORT_VERSION
+  rc = SQLDescribeColW( (SQLHSTMT)data->stmt_res->hstmt, (SQLSMALLINT)(data->col_no),
+      data->stmt_res->column_info[i].name, data->buff_length, &(data->name_length),
+      &(data->stmt_res->column_info[i].type), &(data->stmt_res->column_info[i].size),
+      &(data->stmt_res->column_info[i].scale), &(data->stmt_res->column_info[i].nullable) );
+#else
   rc = SQLDescribeCol( (SQLHSTMT)data->stmt_res->hstmt, (SQLSMALLINT)(data->col_no),
       data->stmt_res->column_info[i].name, data->buff_length, &(data->name_length), 
       &(data->stmt_res->column_info[i].type), &(data->stmt_res->column_info[i].size), 
       &(data->stmt_res->column_info[i].scale), &(data->stmt_res->column_info[i].nullable) );
+#endif
 
   data->stmt_res->is_executing = 0;
 
@@ -119,8 +137,15 @@ int _ruby_ibm_db_SQLColumnPrivileges_helper(metadata_args *data) {
 
   data->stmt_res->is_executing = 1;
 
-  rc = SQLColumnPrivileges( (SQLHSTMT) data->stmt_res->hstmt, data->qualifier, SQL_NTS,
-            data->owner,SQL_NTS, data->table_name,SQL_NTS, data->column_name,SQL_NTS );
+#ifndef UNICODE_SUPPORT_VERSION
+  rc = SQLColumnPrivileges( (SQLHSTMT) data->stmt_res->hstmt, data->qualifier, data->qualifier_len,
+            data->owner, data->owner_len, data->table_name, data->table_name_len, 
+            data->column_name, data->column_name_len );
+#else
+  rc = SQLColumnPrivilegesW( (SQLHSTMT) data->stmt_res->hstmt, data->qualifier, data->qualifier_len,
+            data->owner, data->owner_len, data->table_name, data->table_name_len,
+            data->column_name, data->column_name_len );
+#endif
 
   data->stmt_res->is_executing = 0;
 
@@ -136,8 +161,15 @@ int _ruby_ibm_db_SQLColumns_helper(metadata_args *data) {
 
   data->stmt_res->is_executing = 1;
 
-  rc = SQLColumns( (SQLHSTMT) data->stmt_res->hstmt, data->qualifier, SQL_NTS,
-            data->owner,SQL_NTS, data->table_name,SQL_NTS, data->column_name,SQL_NTS );
+#ifndef UNICODE_SUPPORT_VERSION
+  rc = SQLColumns( (SQLHSTMT) data->stmt_res->hstmt, data->qualifier, data->qualifier_len,
+            data->owner, data->owner_len, data->table_name, data->table_name_len,
+            data->column_name, data->column_name_len );
+#else
+  rc = SQLColumnsW( (SQLHSTMT) data->stmt_res->hstmt, data->qualifier, data->qualifier_len,
+            data->owner, data->owner_len, data->table_name, data->table_name_len,
+            data->column_name, data->column_name_len );
+#endif
 
   data->stmt_res->is_executing = 0;
 
@@ -152,8 +184,13 @@ int _ruby_ibm_db_SQLPrimaryKeys_helper(metadata_args *data) {
 
   data->stmt_res->is_executing = 1;
 
-  rc = SQLPrimaryKeys( (SQLHSTMT) data->stmt_res->hstmt, data->qualifier, SQL_NTS,
-                data->owner, SQL_NTS, data->table_name,SQL_NTS );
+#ifndef UNICODE_SUPPORT_VERSION
+  rc = SQLPrimaryKeys( (SQLHSTMT) data->stmt_res->hstmt, data->qualifier, data->qualifier_len,
+                data->owner, data->owner_len, data->table_name, data->table_name_len );
+#else
+  rc = SQLPrimaryKeysW( (SQLHSTMT) data->stmt_res->hstmt, data->qualifier, data->qualifier_len,
+                data->owner, data->owner_len, data->table_name, data->table_name_len );
+#endif
 
   data->stmt_res->is_executing = 0;
 
@@ -161,16 +198,22 @@ int _ruby_ibm_db_SQLPrimaryKeys_helper(metadata_args *data) {
 }
 
 /*
-   This function calls SQLForeignKeys cli call to get the list of primay key columns and the associated metadata
+   This function calls SQLForeignKeys cli call to get the list of foreign key columns and the associated metadata
 */
 int _ruby_ibm_db_SQLForeignKeys_helper(metadata_args *data) {
   int rc = 0;
 
   data->stmt_res->is_executing = 1;
 
-  rc = SQLForeignKeys( (SQLHSTMT) data->stmt_res->hstmt, data->qualifier, SQL_NTS,
-                data->owner, SQL_NTS, data->table_name ,SQL_NTS, NULL, SQL_NTS,
+#ifndef UNICODE_SUPPORT_VERSION
+  rc = SQLForeignKeys( (SQLHSTMT) data->stmt_res->hstmt, data->qualifier, data->qualifier_len,
+                data->owner, data->owner_len, data->table_name , data->table_name_len, NULL, SQL_NTS,
+                NULL, SQL_NTS, NULL, SQL_NTS );
+#else
+  rc = SQLForeignKeysW( (SQLHSTMT) data->stmt_res->hstmt, data->qualifier, data->qualifier_len,
+                data->owner, data->owner_len, data->table_name , data->table_name_len, NULL, SQL_NTS,
                 NULL, SQL_NTS, NULL, SQL_NTS );
+#endif
 
   data->stmt_res->is_executing = 0;
 
@@ -186,8 +229,13 @@ int _ruby_ibm_db_SQLProcedureColumns_helper(metadata_args *data) {
 
   data->stmt_res->is_executing = 1;
 
-  rc = SQLProcedureColumns( (SQLHSTMT) data->stmt_res->hstmt, data->qualifier, SQL_NTS, data->owner,
-          SQL_NTS, data->proc_name, SQL_NTS, data->column_name, SQL_NTS );
+#ifndef UNICODE_SUPPORT_VERSION
+  rc = SQLProcedureColumns( (SQLHSTMT) data->stmt_res->hstmt, data->qualifier, data->qualifier_len, data->owner,
+          data->owner_len, data->proc_name, data->proc_name_len, data->column_name, data->column_name_len );
+#else
+  rc = SQLProcedureColumnsW( (SQLHSTMT) data->stmt_res->hstmt, data->qualifier, data->qualifier_len, data->owner,
+          data->owner_len, data->proc_name, data->proc_name_len, data->column_name, data->column_name_len );
+#endif
 
   data->stmt_res->is_executing = 0;
 
@@ -203,8 +251,13 @@ int _ruby_ibm_db_SQLProcedures_helper(metadata_args *data) {
 
   data->stmt_res->is_executing = 1;
 
-  rc = SQLProcedures( (SQLHSTMT) data->stmt_res->hstmt, data->qualifier, SQL_NTS, data->owner,
-          SQL_NTS, data->proc_name, SQL_NTS );
+#ifndef UNICODE_SUPPORT_VERSION
+  rc = SQLProcedures( (SQLHSTMT) data->stmt_res->hstmt, data->qualifier, data->qualifier_len, data->owner,
+          data->owner_len, data->proc_name, data->proc_name_len );
+#else
+  rc = SQLProceduresW( (SQLHSTMT) data->stmt_res->hstmt, data->qualifier, data->qualifier_len, data->owner,
+          data->owner_len, data->proc_name, data->proc_name_len );
+#endif
 
   data->stmt_res->is_executing = 0;
 
@@ -220,8 +273,15 @@ int _ruby_ibm_db_SQLSpecialColumns_helper(metadata_args *data) {
 
   data->stmt_res->is_executing = 1;
 
-  rc = SQLSpecialColumns( (SQLHSTMT) data->stmt_res->hstmt,SQL_BEST_ROWID, data->qualifier, SQL_NTS,
-                data->owner,SQL_NTS, data->table_name,SQL_NTS,(SQLUSMALLINT)data->scope,SQL_NULLABLE );
+#ifndef UNICODE_SUPPORT_VERSION
+  rc = SQLSpecialColumns( (SQLHSTMT) data->stmt_res->hstmt, SQL_BEST_ROWID, data->qualifier, data->qualifier_len,
+                data->owner, data->owner_len, data->table_name, data->table_name_len,
+                (SQLUSMALLINT)data->scope, SQL_NULLABLE );
+#else
+  rc = SQLSpecialColumnsW( (SQLHSTMT) data->stmt_res->hstmt, SQL_BEST_ROWID, data->qualifier, data->qualifier_len,
+                data->owner, data->owner_len, data->table_name, data->table_name_len,
+                (SQLUSMALLINT)data->scope, SQL_NULLABLE );
+#endif
 
   data->stmt_res->is_executing = 0;
 
@@ -236,8 +296,13 @@ int _ruby_ibm_db_SQLStatistics_helper(metadata_args *data) {
 
   data->stmt_res->is_executing = 1;
 
-  rc = SQLStatistics( (SQLHSTMT) data->stmt_res->hstmt, data->qualifier, SQL_NTS, data->owner,
-          SQL_NTS, data->table_name, SQL_NTS, (SQLUSMALLINT)data->unique, SQL_QUICK );
+#ifndef UNICODE_SUPPORT_VERSION
+  rc = SQLStatistics( (SQLHSTMT) data->stmt_res->hstmt, data->qualifier, data->qualifier_len, data->owner,
+          data->owner_len, data->table_name, data->table_name_len, (SQLUSMALLINT)data->unique, SQL_QUICK );
+#else
+  rc = SQLStatisticsW( (SQLHSTMT) data->stmt_res->hstmt, data->qualifier, data->qualifier_len, data->owner,
+          data->owner_len, data->table_name, data->table_name_len, (SQLUSMALLINT)data->unique, SQL_QUICK );
+#endif
 
   data->stmt_res->is_executing = 0;
 
@@ -253,8 +318,13 @@ int _ruby_ibm_db_SQLTablePrivileges_helper(metadata_args *data) {
 
   data->stmt_res->is_executing = 1;
 
-  rc = SQLTablePrivileges( (SQLHSTMT) data->stmt_res->hstmt, data->qualifier, SQL_NTS, data->owner,
-            SQL_NTS, data->table_name, SQL_NTS );
+#ifndef UNICODE_SUPPORT_VERSION
+  rc = SQLTablePrivileges( (SQLHSTMT) data->stmt_res->hstmt, data->qualifier, data->qualifier_len,
+            data->owner, data->owner_len, data->table_name, data->table_name_len );
+#else
+  rc = SQLTablePrivilegesW( (SQLHSTMT) data->stmt_res->hstmt, data->qualifier, data->qualifier_len,
+            data->owner, data->owner_len, data->table_name, data->table_name_len );
+#endif
 
   data->stmt_res->is_executing = 0;
 
@@ -270,8 +340,13 @@ int _ruby_ibm_db_SQLTables_helper(metadata_args *data) {
 
   data->stmt_res->is_executing = 1;
 
-  rc = SQLTables( (SQLHSTMT) data->stmt_res->hstmt, data->qualifier, SQL_NTS, data->owner,
-          SQL_NTS, data->table_name, SQL_NTS, data->table_type, SQL_NTS );
+#ifndef UNICODE_SUPPORT_VERSION
+  rc = SQLTables( (SQLHSTMT) data->stmt_res->hstmt, data->qualifier, data->qualifier_len, data->owner,
+          data->owner_len, data->table_name, data->table_name_len, data->table_type, data->table_type_len );
+#else
+  rc = SQLTablesW( (SQLHSTMT) data->stmt_res->hstmt, data->qualifier, data->qualifier_len, data->owner,
+          data->owner_len, data->table_name, data->table_name_len, data->table_type, data->table_type_len );
+#endif
 
   data->stmt_res->is_executing = 0;
 
@@ -286,7 +361,11 @@ int _ruby_ibm_db_SQLExecDirect_helper(exec_cum_prepare_args *data) {
 
   data->stmt_res->is_executing = 1;
 
+#ifndef UNICODE_SUPPORT_VERSION
   rc = SQLExecDirect( (SQLHSTMT) data->stmt_res->hstmt, data->stmt_string, (SQLINTEGER)data->stmt_string_len );
+#else
+  rc = SQLExecDirectW( (SQLHSTMT) data->stmt_res->hstmt, data->stmt_string, (SQLINTEGER)data->stmt_string_len );
+#endif
 
   data->stmt_res->is_executing = 0;
 
@@ -301,7 +380,11 @@ int _ruby_ibm_db_SQLPrepare_helper(exec_cum_prepare_args *data) {
 
   data->stmt_res->is_executing = 1;
 
+#ifndef UNICODE_SUPPORT_VERSION
   rc = SQLPrepare( (SQLHSTMT) data->stmt_res->hstmt, data->stmt_string, (SQLINTEGER)data->stmt_string_len );
+#else
+  rc = SQLPrepareW( (SQLHSTMT) data->stmt_res->hstmt, data->stmt_string, (SQLINTEGER)data->stmt_string_len );
+#endif
 
   data->stmt_res->is_executing = 0;
 
@@ -533,29 +616,46 @@ int _ruby_ibm_db_SQLRowCount_helper(sql_row_count_args *data) {
    This function calls SQLGetInfo cli call to get general information about DBMS, which the app is connected to
 */
 int _ruby_ibm_db_SQLGetInfo_helper(get_info_args *data) {
+#ifndef UNICODE_SUPPORT_VERSION
   return SQLGetInfo( data->conn_res->hdbc, data->infoType, data->infoValue, data->buff_length, data->out_length);
+#else
+  return SQLGetInfoW( data->conn_res->hdbc, data->infoType, data->infoValue, data->buff_length, data->out_length);
+#endif
 }
 
 /*
    This function calls SQLGetDiagRec cli call to get the current values of a diagnostic record that contains error
 */
 int _ruby_ibm_db_SQLGetDiagRec_helper(get_diagRec_args *data) {
+#ifdef UNICODE_SUPPORT_VERSION
+  return SQLGetDiagRecW( data->hType, data->handle, data->recNum, data->SQLState, data->NativeErrorPtr,
+                              data->msgText, data->buff_length, data->text_length_ptr );
+#else
   return SQLGetDiagRec(data->hType, data->handle, data->recNum, data->SQLState, data->NativeErrorPtr,
                               data->msgText, data->buff_length, data->text_length_ptr );
+#endif
 }
 
 /*
    This function calls SQLSetStmtAttr cli call to set attributes related to a statement
 */
 int _ruby_ibm_db_SQLSetStmtAttr_helper(set_handle_attr_args *data) {
+#ifndef UNICODE_SUPPORT_VERSION
   return SQLSetStmtAttr( (SQLHSTMT) *(data->handle), data->attribute, data->valuePtr, data->strLength );
+#else
+  return SQLSetStmtAttrW( (SQLHSTMT) *(data->handle), data->attribute, data->valuePtr, data->strLength );
+#endif
 }
 
 /*
    This function calls SQLSetConnectAttr cli call to set attributes that govern aspects of connections
 */
 int _ruby_ibm_db_SQLSetConnectAttr_helper(set_handle_attr_args *data) {
+#ifndef UNICODE_SUPPORT_VERSION
   return SQLSetConnectAttr( (SQLHDBC) *(data->handle), data->attribute, data->valuePtr, data->strLength );
+#else
+  return SQLSetConnectAttrW( (SQLHDBC) *(data->handle), data->attribute, data->valuePtr, data->strLength );
+#endif
 }
 
 /*
@@ -567,6 +667,10 @@ int _ruby_ibm_db_SQLSetEnvAttr_helper(set_handle_attr_args *data) {
 
 /*
    This function calls SQLGetStmtAttr cli call to set an environment attribute
+
+   The unicode equivalent of SQLGetStmtAttr is not used because the attributes being retrieved currently are not of type char or binary (SQL_IS_INTEGER). If support for retrieving a string type is provided then use the SQLGetStmtAttrW function accordingly
+   In get_last_serial_id although we are retrieving a char type, it is converted back to an integer (atoi). The char to integer conversion function in unicode equivalent will be more complicated and is unnecessary for this case.
+
 */
 int _ruby_ibm_db_SQLGetStmtAttr_helper(get_handle_attr_args *data) {
   return SQLGetStmtAttr( (SQLHSTMT) *(data->handle), data->attribute, data->valuePtr, 
@@ -577,8 +681,13 @@ int _ruby_ibm_db_SQLGetStmtAttr_helper(get_handle_attr_args *data) {
    This function calls SQLGetConnectAttr cli call to set an environment attribute
 */
 int _ruby_ibm_db_SQLGetConnectAttr_helper(get_handle_attr_args *data) {
+#ifndef UNICODE_SUPPORT_VERSION
   return SQLGetConnectAttr( (SQLHDBC) *(data->handle), data->attribute, data->valuePtr, 
             data->buff_length, data->out_length);
+#else
+  return SQLGetConnectAttrW( (SQLHDBC) *(data->handle), data->attribute, data->valuePtr,
+            data->buff_length, data->out_length);
+#endif
 }
 
 /*

data/ext/ruby_ibm_db_cli.h

@@ -31,7 +31,7 @@ typedef struct _param_cache_node {
   char        *varname;               /* bound variable name */
   SQLBIGINT   ivalue;                 /* Temp storage value */
   SQLDOUBLE   fvalue;                 /* Temp storage value */
-  SQLCHAR     *svalue;                /* Temp storage value */
+  SQLPOINTER  svalue;                /* Temp storage value */
   struct _param_cache_node *next; /* Pointer to next node */
 } param_node;
 
@@ -49,8 +49,9 @@ typedef struct _conn_handle_struct {
 
   int  errorType;    /*Indicates Whether the error logged in ruby_error_msg is a statement error or connection error*/
 
-  char *ruby_error_msg;
-  char *ruby_error_state;
+  SQLPOINTER   ruby_error_msg;
+  SQLPOINTER   ruby_error_state;
+  SQLSMALLINT  ruby_error_msg_len;
 
 } conn_handle;
 
@@ -59,7 +60,7 @@ typedef union {
   SQLDOUBLE    d_val;
   SQLFLOAT     f_val;
   SQLSMALLINT  s_val;
-  SQLCHAR      *str_val;
+  SQLPOINTER   str_val;
 } ibm_db_row_data_type;
 
 typedef struct {
@@ -68,7 +69,12 @@ typedef struct {
 } ibm_db_row_type;
 
 typedef struct _ibm_db_result_set_info_struct {
+#ifdef UNICODE_SUPPORT_VERSION
+  SQLWCHAR     *name;
+  long         name_length;
+#else
   SQLCHAR      *name;
+#endif
   SQLSMALLINT  type;
   SQLUINTEGER  size;
   SQLSMALLINT  scale;
@@ -104,20 +110,27 @@ typedef struct _stmt_handle_struct {
   ibm_db_result_set_info  *column_info;
   ibm_db_row_type         *row_data;
 
-  char *ruby_stmt_err_msg;
-  char *ruby_stmt_err_state;
+  SQLPOINTER   ruby_stmt_err_msg;
+  SQLPOINTER   ruby_stmt_err_state;
+  SQLSMALLINT  ruby_stmt_err_msg_len;
 } stmt_handle;
 
 /* 
     Structure holding the data to be passed to SQLConnect or SQLDriverConnect CLI call 
 */
 typedef struct _ibm_db_connect_args_struct {
-  char          *database;
-  char          *uid;
-  char          *password;
-  long          database_len;
-  long          uid_len;
-  long          password_len;
+#ifdef UNICODE_SUPPORT_VERSION
+  SQLWCHAR          *database;
+  SQLWCHAR          *uid;
+  SQLWCHAR          *password;
+#else
+  SQLCHAR          *database;
+  SQLCHAR          *uid;
+  SQLCHAR          *password;
+#endif
+  SQLSMALLINT       database_len;
+  SQLSMALLINT       uid_len;
+  SQLSMALLINT       password_len;
   int           ctlg_conn;        /*Indicates if the connection is a cataloged connection or not*/
   SQLHANDLE     *hdbc;
 } connect_args;
@@ -158,12 +171,27 @@ typedef struct _ibm_db_describecol_args_struct {
 */
 typedef struct _ibm_db_metadata_args_struct {
   stmt_handle   *stmt_res;
+#ifdef UNICODE_SUPPORT_VERSION
+  SQLWCHAR      *qualifier;
+  SQLWCHAR      *owner;
+  SQLWCHAR      *table_name;
+  SQLWCHAR      *proc_name;  /*Used for call SQLProcedureColumns*/
+  SQLWCHAR      *column_name;
+  SQLWCHAR      *table_type;
+#else
   SQLCHAR       *qualifier;
   SQLCHAR       *owner;
   SQLCHAR       *table_name;
   SQLCHAR       *proc_name;  /*Used for call SQLProcedureColumns*/
   SQLCHAR       *column_name;
   SQLCHAR       *table_type;
+#endif
+  SQLSMALLINT   qualifier_len;
+  SQLSMALLINT   owner_len;
+  SQLSMALLINT   table_name_len;
+  SQLSMALLINT   proc_name_len;  /*Used for call SQLProcedureColumns*/
+  SQLSMALLINT   column_name_len;
+  SQLSMALLINT   table_type_len;
   int           scope;       /*Used in SQLSpecialColumns To determine the scope of the unique row identifier*/
   int           unique;      /*Used in SQLStatistics to determine if only unique indexes are to be fetched or all*/
 
@@ -174,7 +202,11 @@ typedef struct _ibm_db_metadata_args_struct {
 */
 typedef struct _ibm_db_exec_direct_args_struct {
   stmt_handle   *stmt_res;
+#ifdef UNICODE_SUPPORT_VERSION
+  SQLWCHAR      *stmt_string;
+#else
   SQLCHAR       *stmt_string;
+#endif
   long          stmt_string_len;
 } exec_cum_prepare_args;
 
@@ -240,7 +272,7 @@ typedef struct _ibm_db_get_data_args_struct {
   stmt_handle    *stmt_res;
   SQLSMALLINT    col_num;
   SQLSMALLINT    targetType;
-  SQLPOINTER     *buff;
+  SQLPOINTER     buff;
   SQLLEN         buff_length;
   SQLLEN         *out_length;
 } get_data_args;
@@ -336,9 +368,9 @@ typedef struct _ibm_db_get_diagRec_struct {
   SQLSMALLINT       hType;
   SQLHANDLE         handle;
   SQLSMALLINT       recNum;
-  SQLCHAR           *SQLState;
+  SQLPOINTER        SQLState;
+  SQLPOINTER        msgText;
   SQLINTEGER        *NativeErrorPtr;
-  SQLCHAR           *msgText;
   SQLSMALLINT       buff_length;
   SQLSMALLINT       *text_length_ptr;
 } get_diagRec_args;