ibm_db 0.8.0 → 0.9.0

data/CHANGES

@@ -1,5 +1,11 @@
 Change Log
 ==============
+2007/09/28 (IBM_DB adapter 0.9.0, driver 0.9.0):
+  - Fixed ibm_db gem 0.8.5 incompatibility with DB2 CLI 9.1 FP3 and below
+
+2007/09/13 (IBM_DB adapter 0.8.5, driver 0.8.5):
+  - Fixed Ruby driver crash on Windows Vista [#13357]
+
 2007/07/05 (IBM_DB adapter 0.8.0, driver 0.7.0):
   - Support for Informix Dynamic Server 11.10
   - New driver method get_last_serial_value to retrieve last inserted serial

data/README

@@ -1,73 +1,8 @@
 =====================================================================
-README for the IBM_DB Adapter 0.8.0 and Driver 0.7.0 (2007/07/11)
+README for the IBM_DB Adapter 0.9.0 and Driver 0.9.0 (2007/09/28)
 For ActiveRecord Version 1.15.3 (and Rails 1.2.3)
 =====================================================================
 
-Change Log
-==============
-2007/07/11 (IBM_DB adapter 0.8.0, driver 0.7.0):
-  - Support for Informix Dynamic Server 11.10 and beyond
-  - New driver method get_last_serial_value to retrieve last inserted serial
-    value for Informix Dynamic Server
-
-2007/06/19 (IBM_DB adapter 0.7.5, driver 0.6.0):
-  - Driver code (ibm_db.c) remains at the same level: 0.6.0 (no changes)
-  - Fixed client attributes initialization on connection setup [11264]
-  - Fixed rake db:schema:dump native data types limits incompatible with table create
-
-2007/06/01 (IBM_DB adapter 0.7.0, driver 0.6.0):
-  - Driver code (ibm_db.c) remains at the same level: 0.6.0 (no changes)
-  - Fixed remaining failure on {:null => true} option for XML data type [#10877]
-  - Fixed handling of {:id => false} option during table creation in DB2 for zOS
-  - Fixed handle_lobs failures in table creation for has_many/belongs_to [#10701]
-  - Fixe db2-i5-zOS.yaml content (removed inadvertent tab) [#11234]
-
-2007/05/10 (IBM_DB adapter 0.6.5, driver 0.6.0):
-  - Driver code (ibm_db.c) remains at the same level: 0.6.0 (no changes)
-  - Fixed regression for reconnect after being inactive (connection recycle)
-  - Fixed rake db:schema:load failures on boolean data type [#10683]
-  - Fixed XML default option (:null => true for XML data type) [#10754]
-  - Fixed DB2 for zOS version 9 handling of column changes for DEFAULT NULL
-
-2007/04/30 (0.6.0):
-  - Support for remote connections to DB2 Universal Database on z/OS version 9
-  - Support for result set pagination via ActiveRecord add_limit_offset! method 
-    for DB2 Universal Database on z/OS and i5/OS
-  - Defect fixes
-  - Improved documentation 
-
-2007/04/20 (0.4.6):
-  - Fixed XML columns creation default value (NOT NULL)
-  - Fixed border case for IS NULL in where clauses
-  - Improved documentation (connection attributes)
-
-2007/04/20 (0.4.5):
-  - Fixed reconnect problems: driver (IBM_DB::active) and adapter (active)
-  - Client connection attribute rename (app_user to replace user)
-  - Improved support for ROWID data type (DB2 for zOS version 8 and 9)
-
-2007/03/21 (0.4.0):
-  - Support added for remote connectivity to DB2 zOS version 8
-  - Support added for remote connectivity to DB2 i5 v5r3 and v5r4
-  - Improved migration support (added change_column method)
-  - Support for setting and retrieving values for client attributes (user, 
-    account, application, workstation)
-
-2006/10/31 (0.2.0):
-  - Significant performance improvements
-  - Improved stored procedure support at driver level
-  - Added support for Large Object data types (LOBs) greater than 32K (BLOB, CLOB, XML) in size
-  - Added XML data type support for native storage of XML documents
-  - Significant quality improvements, through many bug fixes in the driver and adapter
-  - Improved migration support (added add_column and remove_column methods)
-
-2006/06/07 (0.1.0):
-
-  - Fixed compatibility issue with other adapters
-  - If a schema is omitted in database.yml, the username is now used as default schema
-  - Introduced descriptive CLI error messages when a connection or an execute statement fails
-  - Introduced check against schema in method 'indexes'
-
 Supported Operating Systems 
 ============================
   - Linux 32/64 bit

data/ext/ibm_db.c

@@ -10,7 +10,7 @@
   +----------------------------------------------------------------------+
 */
 
-#define MODULE_RELEASE "0.7.0"
+#define MODULE_RELEASE "0.9.0"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -324,9 +324,9 @@ static void _ruby_ibm_db_free_conn_struct(conn_handle *handle)
   }
   if ( handle != NULL ) {
     if ( handle->flag_pconnect ) {
-      free(handle);
+      ruby_xfree(handle);
     } else {
-      free(handle);
+      ruby_xfree(handle);
     }
   }
 }
@@ -355,7 +355,7 @@ static void _ruby_ibm_db_mark_row_struct(row_hash_struct *handle)
 /*  static void _ruby_ibm_db_free_row_struct */
 static void _ruby_ibm_db_free_row_struct(row_hash_struct *handle)
 {
-  free(handle);
+  ruby_xfree(handle);
 }
 /*  */
 
@@ -375,11 +375,11 @@ static void _ruby_ibm_db_free_result_struct(stmt_handle* handle)
       curr_ptr = curr_ptr->next;
 
       if (prev_ptr->varname) {
-        free(prev_ptr->varname);
+        ruby_xfree(prev_ptr->varname);
       }
 
-      if (prev_ptr->svalue) free(prev_ptr->svalue);
-      free(prev_ptr);
+      if (prev_ptr->svalue) ruby_xfree(prev_ptr->svalue);
+      ruby_xfree(prev_ptr);
 
       prev_ptr = curr_ptr;
     }
@@ -400,21 +400,21 @@ static void _ruby_ibm_db_free_result_struct(stmt_handle* handle)
         case SQL_NUMERIC:
         case SQL_XML:
           if ( handle->row_data[i].data.str_val != NULL ) {
-            free(handle->row_data[i].data.str_val);
+            ruby_xfree(handle->row_data[i].data.str_val);
             handle->row_data[i].data.str_val = NULL;
           }
         }
       }
-      free(handle->row_data);
+      ruby_xfree(handle->row_data);
       handle->row_data = NULL;
     }
 
     /* free column info cache */
     if ( handle->column_info ) {
       for (i=0; i<handle->num_columns; i++) {
-        free(handle->column_info[i].name);
+        ruby_xfree(handle->column_info[i].name);
       }
-      free(handle->column_info);
+      ruby_xfree(handle->column_info);
       handle->column_info = NULL;
       handle->num_columns = 0;
     }
@@ -470,7 +470,7 @@ static void _ruby_ibm_db_free_stmt_struct(stmt_handle *handle)
 
   if ( handle ) {
     _ruby_ibm_db_free_result_struct(handle);
-    free(handle);
+    ruby_xfree(handle);
   }
 }
 /*  */
@@ -1202,16 +1202,23 @@ static VALUE _ruby_ibm_db_connect_helper( int argc, VALUE *argv, int isPersisten
     /* Set SQL_ATTR_REPLACE_QUOTED_LITERALS connection attribute to
      * enable CLI numeric literal feature. This is equivalent to
      * PATCH2=71 in the db2cli.ini file
+     * Note, for backward compatibility with older CLI drivers having a 
+     * different value for SQL_ATTR_REPLACE_QUOTED_LITERALS, we call 
+     * SQLSetConnectAttr() with both the old and new value
      */
 #ifndef PASE
       /* Only enable this feature if we are not connected to an Informix data server */
       if (!is_informix) {
         rc = SQLSetConnectAttr((SQLHDBC)conn_res->hdbc, SQL_ATTR_REPLACE_QUOTED_LITERALS, (SQLPOINTER)(enable_numeric_literals), SQL_IS_INTEGER);
+        if (rc != SQL_SUCCESS)
+           rc = SQLSetConnectAttr((SQLHDBC)conn_res->hdbc, SQL_ATTR_REPLACE_QUOTED_LITERALS_OLDVALUE, (SQLPOINTER)(enable_numeric_literals), SQL_IS_INTEGER);
       }
 #else
       /* Only enable this feature if we are not connected to an Informix data server */
       if (!is_informix) {
         rc = SQLSetConnectAttr((SQLHDBC)conn_res->hdbc, SQL_ATTR_REPLACE_QUOTED_LITERALS, (SQLPOINTER)(&enable_numeric_literals), SQL_IS_INTEGER);
+        if (rc != SQL_SUCCESS)
+           rc = SQLSetConnectAttr((SQLHDBC)conn_res->hdbc, SQL_ATTR_REPLACE_QUOTED_LITERALS_OLDVALUE, (SQLPOINTER)(&enable_numeric_literals), SQL_IS_INTEGER);
       }
 #endif
       if (rc != SQL_SUCCESS) {
@@ -1229,7 +1236,7 @@ static VALUE _ruby_ibm_db_connect_helper( int argc, VALUE *argv, int isPersisten
                 conn_res);
             rb_hash_aset(persistent_list, rb_str_new2(hKey), entry);
     }
-    free(hKey);
+    ruby_xfree(hKey);
   }
 
   if ( rc != SQL_SUCCESS ) {
@@ -1239,7 +1246,7 @@ static VALUE _ruby_ibm_db_connect_helper( int argc, VALUE *argv, int isPersisten
 
     /* free memory */
     if (conn_res != NULL) {
-      free(conn_res);
+      ruby_xfree(conn_res);
     }
 
     return Qfalse;
@@ -1521,7 +1528,7 @@ static void _ruby_ibm_db_add_param_cache( stmt_handle *stmt_res, int param_no, c
     /* Var lengths can be variable and different in both cases. */
     /* This shouldn't happen often anyway */
     if ( varname != NULL) {
-      free(curr->varname);
+      ruby_xfree(curr->varname);
       curr->varname = estrndup(varname, varname_len);
     }
   }
@@ -2502,11 +2509,11 @@ VALUE ibm_db_special_columns(int argc, VALUE *argv, VALUE self)
  *     The name of the table. 
  * 
  * unique
- *     An integer value representing the type of index information to return.
- *     0
- *         Return only the information for unique indexes on the table. 
- *     1
- *         Return the information for all indexes on the table. 
+ *     An boolean value representing the type of index information to return.
+ *      
+ *     False    Return only the information for unique indexes on the table. 
+ *     
+ *     True     Return the information for all indexes on the table. 
  * 
  * ===Return Values
  * 
@@ -2969,7 +2976,7 @@ VALUE ibm_db_exec(int argc, VALUE *argv, VALUE self)
     rc = SQLAllocHandle(SQL_HANDLE_STMT, conn_res->hdbc, &(stmt_res->hstmt));
     if ( rc < SQL_SUCCESS ) {
       _ruby_ibm_db_check_sql_errors(conn_res->hdbc, SQL_HANDLE_DBC, rc, 1, NULL, -1, 1);
-      free(return_str);
+      ruby_xfree(return_str);
       return rc;
     }
 
@@ -2987,11 +2994,11 @@ VALUE ibm_db_exec(int argc, VALUE *argv, VALUE self)
     if ( rc < SQL_SUCCESS ) {
       _ruby_ibm_db_check_sql_errors(stmt_res->hstmt, SQL_HANDLE_STMT, -1, 0, return_str, DB2_ERRMSG, stmt_res->errormsg_recno_tracker);
       SQLFreeHandle( SQL_HANDLE_STMT, stmt_res->hstmt );
-      free(stmt_res);
-      free(return_str);
+      ruby_xfree(stmt_res);
+      ruby_xfree(return_str);
       return Qfalse;
     }
-    free(return_str);
+    ruby_xfree(return_str);
 
     return Data_Wrap_Struct(le_stmt_struct,
       _ruby_ibm_db_mark_stmt_struct, _ruby_ibm_db_free_stmt_struct,
@@ -3449,7 +3456,7 @@ void var_assign(char *name, VALUE value) {
   strcat(statement, "=");
   strcat(statement, expr);
   rb_eval_string(statement);
-  free(statement);
+  ruby_xfree(statement);
 #endif
 }
 
@@ -3630,10 +3637,10 @@ VALUE ibm_db_execute(int argc, VALUE *argv, VALUE self)
 
         /* Free Values */
         if ( prev_ptr->svalue) {
-          free(prev_ptr->svalue);
+          ruby_xfree(prev_ptr->svalue);
         }
 
-        free(prev_ptr);
+        ruby_xfree(prev_ptr);
 
         prev_ptr = curr_ptr;
       }
@@ -4766,11 +4773,11 @@ VALUE ibm_db_result(int argc, VALUE *argv, VALUE self)
           return Qfalse;
         }
         if (out_length == SQL_NULL_DATA) {
-          free(out_ptr);
+          ruby_xfree(out_ptr);
           return Qnil;
         } else {
           return_value = rb_str_new2((char*)out_ptr);
-          free(out_ptr);
+          ruby_xfree(out_ptr);
           return return_value;
         }
         break; 
@@ -5017,7 +5024,7 @@ static VALUE _ruby_ibm_db_bind_fetch_helper(int argc, VALUE *argv, int op)
           }
           rc = _ruby_ibm_db_get_data(stmt_res, i+1, SQL_C_CHAR, out_ptr, tmp_length+1, &out_length);
           if ( rc == SQL_ERROR ) {
-            free(out_ptr);
+            ruby_xfree(out_ptr);
             return Qfalse;
           }
           if (out_length == SQL_NULL_DATA) {
@@ -5161,7 +5168,7 @@ static VALUE _ruby_ibm_db_bind_fetch_helper(int argc, VALUE *argv, int op)
 
                 rc = _ruby_ibm_db_get_data2(stmt_res, i+1, lob_bind_type, (char *)out_ptr, tmp_length, &out_length);
                 if (rc == SQL_ERROR) {
-                  free(out_ptr);
+                  ruby_xfree(out_ptr);
                   out_length = 0;
                 }
 
@@ -5207,7 +5214,7 @@ static VALUE _ruby_ibm_db_bind_fetch_helper(int argc, VALUE *argv, int op)
             }
             rc = _ruby_ibm_db_get_data(stmt_res, i+1, SQL_C_BINARY, out_ptr, tmp_length, &out_length);
             if (rc == SQL_ERROR) {
-              free(out_ptr);
+              ruby_xfree(out_ptr);
               return Qfalse;
             }
 
@@ -5246,7 +5253,7 @@ static VALUE _ruby_ibm_db_bind_fetch_helper(int argc, VALUE *argv, int op)
 
             rc = _ruby_ibm_db_get_data2(stmt_res, i+1, SQL_C_CHAR, out_ptr, tmp_length+1, &out_length);
             if (rc == SQL_ERROR) {
-              free(out_ptr);
+              ruby_xfree(out_ptr);
               tmp_length = 0;
             } else {
               out_ptr[tmp_length] = '\0';
@@ -5423,7 +5430,7 @@ VALUE ibm_db_fetch_object(int argc, VALUE *argv, VALUE self)
         _ruby_ibm_db_mark_row_struct, _ruby_ibm_db_free_row_struct,
         row_res);
   } else {
-    free(row_res);
+    ruby_xfree(row_res);
     return Qfalse;
   }
 }

data/ext/ruby_ibm_db.h

@@ -22,9 +22,15 @@
 #endif
 
 #ifndef SQL_ATTR_REPLACE_QUOTED_LITERALS
-#define SQL_ATTR_REPLACE_QUOTED_LITERALS 116
+#define SQL_ATTR_REPLACE_QUOTED_LITERALS 2586
 #endif
 
+/* CLI v9.1 FP3 and below has a SQL_ATTR_REPLACE_QUOTED_LITERALS value of 116
+ * We need to support both the new and old values for compatibility with older
+ * versions of CLI. CLI v9.1 FP4 and beyond changed this value to 2586
+ */
+#define SQL_ATTR_REPLACE_QUOTED_LITERALS_OLDVALUE 116
+
 /* If using a DB2 CLI version which doesn't support this functionality, explicitly
  * define this. We will rely on DB2 CLI to throw an error when SQLGetStmtAttr is 
  * called.

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: ibm_db
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
-date: 2007-08-08 00:00:00 -04:00
+  version: 0.9.0
+date: 2007-10-15 00:00:00 -04:00
 summary: "Rails Driver and Adapter for IBM Data Servers: {LUW, zOS, i5, IDS}"
 require_paths: 
 - lib