ibm_db 1.5.0-mswin32 → 2.0.0-mswin32

data/ext/ruby_ibm_db.h

@@ -2,11 +2,11 @@
   +----------------------------------------------------------------------+
   |  Licensed Materials - Property of IBM                                |
   |                                                                      |
-  | (C) Copyright IBM Corporation 2006, 2007, 2008, 2009                 |
+  | (C) Copyright IBM Corporation 2006, 2007, 2008, 2009, 2010           |
   +----------------------------------------------------------------------+
   | Authors: Sushant Koduru, Lynh Nguyen, Kanchana Padmanabhan,          |
   |          Dan Scott, Helmut Tessarek, Kellen Bombardier, Sam Ruby     |
-  |          Ambrish Bhargava, Tarun Pasrija                             |
+  |          Ambrish Bhargava, Tarun Pasrija, Praveen Devarao            |
   +----------------------------------------------------------------------+
 */
 
@@ -81,6 +81,10 @@
 #define CONN_ERROR      1
 #define STMT_ERROR      2
 
+/*Used to decide if LITERAL REPLACEMENT should be turned on or not*/
+#define SET_QUOTED_LITERAL_REPLACEMENT_ON  1
+#define SET_QUOTED_LITERAL_REPLACEMENT_OFF 0
+
 /* DB2 instance environment variable */
 #define DB2_VAR_INSTANCE "DB2INSTANCE="
 

data/ext/ruby_ibm_db_cli.c

@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   |  Licensed Materials - Property of IBM                                |
   |                                                                      |
-  | (C) Copyright IBM Corporation 2009                                   |
+  | (C) Copyright IBM Corporation 2009, 2010                             |
   +----------------------------------------------------------------------+
   | Authors: Praveen Devarao                                             |
   +----------------------------------------------------------------------+
@@ -517,7 +517,7 @@ int _ruby_ibm_db_SQLNumParams_helper(row_col_count_args *data) {
 /*
    This function calls SQLRowCount cli call to fetch the number of rows affected by the SQL statement
 */
-int _ruby_ibm_db_SQLRowCount_helper(row_col_count_args *data) {
+int _ruby_ibm_db_SQLRowCount_helper(sql_row_count_args *data) {
   int rc = 0;
 
   data->stmt_res->is_executing = 1;
@@ -626,4 +626,4 @@ void _ruby_ibm_db_Statement_level_UBF(stmt_handle *stmt_res) {
     rc = SQLCancel( (SQLHSTMT) stmt_res->hstmt );
   }
   return;
-}
+}

data/ext/ruby_ibm_db_cli.h

@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   |  Licensed Materials - Property of IBM                                |
   |                                                                      |
-  | (C) Copyright IBM Corporation 2009                                   |
+  | (C) Copyright IBM Corporation 2009, 2010                             |
   +----------------------------------------------------------------------+
   | Authors: Praveen Devarao                                             |
   +----------------------------------------------------------------------+
@@ -29,9 +29,9 @@ typedef struct _param_cache_node {
   int         param_type;             /* Type of param - INP/OUT/INP-OUT/FILE */
   int         size;                   /* Size of param */
   char        *varname;               /* bound variable name */
-  long        ivalue;                 /* Temp storage value */
-  double      fvalue;                 /* Temp storage value */
-  char        *svalue;                /* Temp storage value */
+  SQLBIGINT   ivalue;                 /* Temp storage value */
+  SQLDOUBLE   fvalue;                 /* Temp storage value */
+  SQLCHAR     *svalue;                /* Temp storage value */
   struct _param_cache_node *next; /* Pointer to next node */
 } param_node;
 
@@ -99,6 +99,7 @@ typedef struct _stmt_handle_struct {
   int          file_param;       /* if option passed in is FILE_PARAM */
   int          num_columns;
   int          is_executing;
+  int          is_freed;        /* Indicates if the SQLFreeHandle is been called on the handle or not.*/
 
   ibm_db_result_set_info  *column_info;
   ibm_db_row_type         *row_data;
@@ -195,13 +196,21 @@ typedef struct _ibm_db_next_result_args_struct {
 } next_result_args;
 
 /* 
-    Structure holding the necessary info to be passed to calls SQLNumResultCols/SQLRowcount/SQLNumParams
+    Structure holding the necessary info to be passed to calls SQLNumResultCols/SQLNumParams
 */
 typedef struct _ibm_db_row_col_count_struct {
   stmt_handle    *stmt_res;
-  SQLINTEGER     count;
+  SQLSMALLINT    count;
 } row_col_count_args;
 
+/* 
+    Structure holding the necessary info to be passed to call SQLRowcount
+*/
+typedef struct _ibm_db_row_count_struct {
+  stmt_handle    *stmt_res;
+  SQLINTEGER     count;
+} sql_row_count_args;
+
 /* 
     Structure holding the necessary info to be passed to call SQLColAttributes
 */
@@ -374,7 +383,7 @@ int _ruby_ibm_db_SQLFetchScroll_helper(fetch_data_args *data);
 int _ruby_ibm_db_SQLFetch_helper(fetch_data_args *data);
 int _ruby_ibm_db_SQLNumResultCols_helper(row_col_count_args *data);
 int _ruby_ibm_db_SQLNumParams_helper(row_col_count_args *data);
-int _ruby_ibm_db_SQLRowCount_helper(row_col_count_args *data);
+int _ruby_ibm_db_SQLRowCount_helper(sql_row_count_args *data);
 int _ruby_ibm_db_SQLGetInfo_helper(get_info_args *data);
 int _ruby_ibm_db_SQLGetDiagRec_helper(get_diagRec_args *data);
 int _ruby_ibm_db_SQLSetStmtAttr_helper(set_handle_attr_args *data);
@@ -386,4 +395,4 @@ int _ruby_ibm_db_SQLBindFileToParam_helper(stmt_handle *stmt_res, param_node *cu
 int _ruby_ibm_db_SQLBindParameter_helper(bind_parameter_args *data);
 void _ruby_ibm_db_Statement_level_UBF(stmt_handle *stmt_res);
 
-#endif  /* RUBY_IBM_DB_CLI_H */
+#endif  /* RUBY_IBM_DB_CLI_H */

data/lib/IBM_DB.rb

@@ -1,2 +1,2 @@
-require (RUBY_PLATFORM =~ /mswin32/) ? 'mswin32/ibm_db.so' : 'ibm_db.so'
+require (RUBY_PLATFORM =~ /mswin32/ || RUBY_PLATFORM =~ /mingw32/ ) ? 'mswin32/ibm_db.so' : 'ibm_db.so'
 require 'active_record/connection_adapters/ibm_db_adapter'

data/lib/active_record/connection_adapters/ibm_db_adapter.rb

@@ -1,7 +1,7 @@
 # +----------------------------------------------------------------------+
 # |  Licensed Materials - Property of IBM                                |
 # |                                                                      |
-# | (C) Copyright IBM Corporation 2006, 2007, 2008, 2009                 |
+# | (C) Copyright IBM Corporation 2006, 2007, 2008, 2009, 2010           |
 # +----------------------------------------------------------------------+
 # |  Authors: Antonio Cangiano <cangiano@ca.ibm.com>                     |
 # |         : Mario Ds Briggs  <mario.briggs@in.ibm.com>                 |
@@ -66,24 +66,28 @@ module ActiveRecord
 
             update_query << " WHERE #{self.class.primary_key} = ?"
             values << self[self.class.primary_key.downcase]
-            
-            unless stmt = IBM_DB.prepare(connection.connection, update_query)
-              error_msg = IBM_DB.getErrormsg( connection.connection, IBM_DB::DB_CONN )
-              if error_msg && !error_msg.empty?
-                raise "Statement prepare for updating LOB/XML column failed : #{error_msg}"
-              else
-                raise StandardError.new('An unexpected error occurred during update of LOB/XML column')
+
+            begin
+              unless stmt = IBM_DB.prepare(connection.connection, update_query)
+                error_msg = IBM_DB.getErrormsg( connection.connection, IBM_DB::DB_CONN )
+                if error_msg && !error_msg.empty?
+                  raise "Statement prepare for updating LOB/XML column failed : #{error_msg}"
+                else
+                  raise StandardError.new('An unexpected error occurred during update of LOB/XML column')
+                end
               end
-            end
-            connection.log_query(update_query,'update of LOB/XML field(s)in handle_lobs')
+              connection.log_query(update_query,'update of LOB/XML field(s)in handle_lobs')
 
-            # rollback any failed LOB/XML field updates (and remove associated marker)
-            unless IBM_DB.execute(stmt, values)
-              error_msg = "Failed to insert/update LOB/XML field(s) due to: #{IBM_DB.getErrormsg( stmt, IBM_DB::DB_STMT )}"
-              connection.execute("ROLLBACK")
-              raise error_msg
-            else
-              IBM_DB.free_result stmt
+              # rollback any failed LOB/XML field updates (and remove associated marker)
+              unless IBM_DB.execute(stmt, values)
+                error_msg = "Failed to insert/update LOB/XML field(s) due to: #{IBM_DB.getErrormsg( stmt, IBM_DB::DB_STMT )}"
+                connection.execute("ROLLBACK")
+                raise error_msg
+              end
+            rescue StandardError => error
+              raise error
+            ensure
+              IBM_DB.free_stmt(stmt) if stmt
             end
           end # if clob_sql
         end #connection.sql.each
@@ -103,9 +107,16 @@ module ActiveRecord
         raise LoadError, "Failed to load IBM_DB Ruby driver."
       end
 
+      if( config.has_key?(:parameterized) && config[:parameterized] == true )
+        require 'active_record/connection_adapters/ibm_db_pstmt'
+      end
+
       # Converts all +config+ keys to symbols
       config = config.symbolize_keys
 
+      # Flag to decide if quoted literal replcement should take place. By default it is ON. Set it to OFF if using Pstmt
+      set_quoted_literal_replacement = IBM_DB::QUOTED_LITERAL_REPLACEMENT_ON
+
       # Retrieves the database alias (local catalog name) or remote name
       # (for remote TCP/IP connections) from the +config+ hash
       # or raises ArgumentError in case of failure.
@@ -127,6 +138,10 @@ module ActiveRecord
       # Providing default schema (username) when not specified
       config[:schema] = config.has_key?(:schema) ? config[:schema].to_s : config[:username].to_s
 
+      if(config.has_key?(:parameterized) && config[:parameterized] == true )
+        set_quoted_literal_replacement = IBM_DB::QUOTED_LITERAL_REPLACEMENT_OFF
+      end
+
       # Extract connection options from the database configuration
       # (in support to formatting, audit and billing purposes):
       # Retrieve database objects fields in lowercase
@@ -171,10 +186,10 @@ module ActiveRecord
           conn_string << "AUTHENTICATION=#{config[:authentication]};" if config.has_key?(:authentication)
           conn_string << "CONNECTTIMEOUT=#{config[:timeout]};" if config.has_key?(:timeout)
         
-          connection = IBM_DB.connect conn_string, '', '', conn_options
+          connection = IBM_DB.connect( conn_string, '', '', conn_options, set_quoted_literal_replacement )
         else
           # No host implies a local catalog-based connection: +database+ represents catalog alias
-          connection = IBM_DB.connect( database, username, password, conn_options )
+          connection = IBM_DB.connect( database, username, password, conn_options,  set_quoted_literal_replacement )
         end
       rescue StandardError => connect_err
         raise "Failed to connect to [#{database}] due to: #{connect_err}"
@@ -399,13 +414,18 @@ module ActiveRecord
     #                                    // - to connect to the database server. By default value is SERVER
     #   timeout:         10              // Specifies the time in seconds (0 - 32767) to wait for a reply from server -
     #                                    //- when trying to establish a connection before generating a timeout
+    # == Parameterized Queries Support
+    #   parameterized:  false            // Specifies if the prepared statement support of 
+    #                                    //- the IBM_DB Adapter is to be turned on or off
     # 
     # When schema is not specified, the username value is used instead.
+    # The default setting of parameterized is false.
     # 
     class IBM_DBAdapter < AbstractAdapter
       attr_reader :connection, :servertype
-      attr_accessor :sql,:handle_lobs_triggered
+      attr_accessor :sql,:handle_lobs_triggered, :sql_parameter_values
       attr_reader :schema, :app_user, :account, :application, :workstation
+      attr_reader :pstmt_support_on, :set_quoted_literal_replacement
 
       # Name of the adapter
       def adapter_name
@@ -427,6 +447,14 @@ module ActiveRecord
         @security         = config[:security] || nil
         @authentication   = config[:authentication] || nil
         @timeout          = config[:timeout] || 0  # default timeout value is 0
+
+        if( config.has_key?(:parameterized) && config[:parameterized] == true )
+          @pstmt_support_on = true
+          @set_quoted_literal_replacement = IBM_DB::QUOTED_LITERAL_REPLACEMENT_OFF
+        else
+          @pstmt_support_on = false
+          @set_quoted_literal_replacement = IBM_DB::QUOTED_LITERAL_REPLACEMENT_ON
+        end
         
         # Caching database connection options (auditing and billing support)
         @app_user         = conn_options[:app_user]     if conn_options.has_key?(:app_user)
@@ -434,7 +462,9 @@ module ActiveRecord
         @application      = conn_options[:application]  if conn_options.has_key?(:application)
         @workstation      = conn_options[:workstation]  if conn_options.has_key?(:workstation)
         
-        @sql = []
+        @sql                  = []
+        @sql_parameter_values = [] #Used only if pstmt support is turned on
+
         @handle_lobs_triggered = false
 
         # Calls the parent class +ConnectionAdapters+' initializer
@@ -585,11 +615,11 @@ module ActiveRecord
             @conn_string << "AUTHENTICATION=#{@authentication};" if @authentication
             @conn_string << "CONNECTTIMEOUT=#{@timeout};"
             # Connects and assigns the resulting IBM_DB.Connection to the +@connection+ instance variable
-            @connection = IBM_DB.connect(@conn_string, '', '', @conn_options)
+            @connection = IBM_DB.connect(@conn_string, '', '', @conn_options, @set_quoted_literal_replacement)
           else
             # Connects to the database using the local alias (@database)
             # and assigns the connection object (IBM_DB.Connection) to @connection
-            @connection = IBM_DB.connect(@database, @username, @password, @conn_options)
+            @connection = IBM_DB.connect(@database, @username, @password, @conn_options, @set_quoted_literal_replacement)
           end
         rescue StandardError => connect_err
           warn "Connection to database #{@database} failed: #{connect_err}"
@@ -640,6 +670,73 @@ module ActiveRecord
         end 
       end
 
+      # Returns an array of hashes with the column names as keys and
+      # column values as values. +sql+ is the select query, 
+      # and +name+ is an optional description for logging
+      def prepared_select(sql_param_hash, name = nil)
+        # Replaces {"= NULL" with " IS NULL"} OR {"IN (NULL)" with " IS NULL"}
+
+        results = []
+        # Invokes the method +prepare+ in order prepare the SQL
+        # IBM_DB.Statement is returned from which the statement is executed and results fetched
+        pstmt = prepare(sql_param_hash["sqlSegment"], name)
+        if(execute_prepared_stmt(pstmt, sql_param_hash["paramArray"]))
+          begin
+            @servertype.select(sql_param_hash["sqlSegment"], name, pstmt, results)
+          rescue StandardError => fetch_error # Handle driver fetch errors
+            error_msg = IBM_DB.getErrormsg(pstmt, IBM_DB::DB_STMT )
+            if error_msg && !error_msg.empty?
+              raise StatementInvalid,"Failed to retrieve data: #{error_msg}"
+            else
+              error_msg = "An unexpected error occurred during data retrieval"
+              error_msg = error_msg + ": #{fetch_error.message}" if !fetch_error.message.empty?
+              raise error_msg
+            end
+          ensure
+            # Ensures to free the resources associated with the statement
+            IBM_DB.free_stmt(pstmt) if pstmt
+          end
+        end
+        # The array of record hashes is returned
+        results
+      end
+
+      # Returns an array of hashes with the column names as keys and
+      # column values as values. +sql+ is the select query, 
+      # and +name+ is an optional description for logging
+      def prepared_select_values(sql_param_hash, name = nil)
+        # Replaces {"= NULL" with " IS NULL"} OR {"IN (NULL)" with " IS NULL"}
+
+        results = []
+        # Invokes the method +prepare+ in order prepare the SQL
+        # IBM_DB.Statement is returned from which the statement is executed and results fetched
+        pstmt = prepare(sql_param_hash["sqlSegment"], name)
+        if(execute_prepared_stmt(pstmt, sql_param_hash["paramArray"]))
+          begin
+            @servertype.select_rows(sql_param_hash["sqlSegment"], name, pstmt, results)
+            if results
+              return results.map { |v| v[0] }
+            else
+              nil
+            end
+          rescue StandardError => fetch_error # Handle driver fetch errors
+            error_msg = IBM_DB.getErrormsg(pstmt, IBM_DB::DB_STMT )
+            if error_msg && !error_msg.empty?
+              raise StatementInvalid,"Failed to retrieve data: #{error_msg}"
+            else
+              error_msg = "An unexpected error occurred during data retrieval"
+              error_msg = error_msg + ": #{fetch_error.message}" if !fetch_error.message.empty?
+              raise error_msg
+            end
+          ensure
+            # Ensures to free the resources associated with the statement
+            IBM_DB.free_stmt(pstmt) if pstmt
+          end
+        end
+        # The array of record hashes is returned
+        results
+      end
+
       # Returns an array of hashes with the column names as keys and
       # column values as values. +sql+ is the select query, 
       # and +name+ is an optional description for logging
@@ -665,7 +762,7 @@ module ActiveRecord
             end
           ensure
             # Ensures to free the resources associated with the statement
-            IBM_DB.free_result stmt
+            IBM_DB.free_stmt(stmt) if stmt
           end
         end
         # The array of record hashes is returned
@@ -697,7 +794,7 @@ module ActiveRecord
             end
           ensure
             # Ensures to free the resources associated with the statement
-            IBM_DB.free_result stmt
+            IBM_DB.free_stmt(stmt) if stmt
           end
         end
         # The array of record hashes is returned
@@ -765,9 +862,10 @@ module ActiveRecord
         log(insert_query,'fixture insert') do
           unless IBM_DB.execute(stmt, insert_values)
             error_msg = IBM_DB.getErrormsg(stmt, IBM_DB::DB_STMT )
+            IBM_DB.free_stmt(stmt) if stmt
             raise "Failed to insert due to: #{error_msg}"
           else
-            IBM_DB.free_result stmt
+            IBM_DB.free_stmt(stmt) if stmt
           end
         end
       end
@@ -789,8 +887,67 @@ module ActiveRecord
             return id_value || @servertype.last_generated_id(stmt)
             # Ensures to free the resources associated with the statement
           ensure
-            IBM_DB.free_result(stmt)
+            IBM_DB.free_stmt(stmt) if stmt
+          end
+        end
+      end
+
+      # Praveen
+      # Performs an insert using the prepared statement and returns the last ID generated.
+      # This can be the ID passed to the method or the one auto-generated by the database,
+      # and retrieved by the +last_generated_id+ method.
+      def prepared_insert(pstmt, param_array = nil)
+        if @handle_lobs_triggered  #Ensure the array of sql is cleared if they have been handled in the callback
+          @sql                   = []
+          @sql_parameter_values  = []
+          @handle_lobs_triggered = false
+        end
+
+        clear_query_cache if defined? clear_query_cache
+
+        begin
+          if execute_prepared_stmt(pstmt, param_array)
+            @sql << @prepared_sql
+            @sql_parameter_values << param_array
+            return @servertype.last_generated_id(pstmt)
+          end
+        rescue StandardError => insert_err
+          raise insert_err
+        ensure
+          IBM_DB.free_stmt(pstmt) if pstmt
+        end
+      end
+
+      # Praveen
+      # Prepares and logs +sql+ commands and
+      # returns a +IBM_DB.Statement+ object.
+      def prepare(sql,name = nil)
+        # The +log+ method is defined in the parent class +AbstractAdapter+
+        @prepared_sql = sql
+        log(sql,name) do
+          @servertype.prepare(sql, name)
+        end
+      end
+
+      # Praveen
+      #Executes the prepared statement
+      #ReturnsTrue on success and False on Failure
+      def execute_prepared_stmt(pstmt, param_array = nil)
+        if !param_array.nil? && param_array.size < 1
+          param_array = nil
+        end
+
+        if( !IBM_DB.execute(pstmt, param_array) )
+          error_msg = IBM_DB.getErrormsg(pstmt, IBM_DB::DB_STMT)
+          if !error_msg.empty?
+            error_msg = "Statement execution failed: " + error_msg
+          else
+            error_msg = "Statement execution failed"
           end
+          IBM_DB.free_stmt(pstmt) if pstmt
+          raise StatementInvalid, error_msg
+        else
+          return true
         end
       end
 
@@ -836,15 +993,40 @@ module ActiveRecord
             IBM_DB.num_rows(stmt)
             # Ensures to free the resources associated with the statement
           ensure
-            IBM_DB.free_result(stmt)
+            IBM_DB.free_stmt(stmt) if stmt
           end
         end
       end
 
+      #Praveen
+      def prepared_update(pstmt, param_array = nil )
+        if @handle_lobs_triggered  #Ensure the array of sql is cleared if they have been handled in the callback
+          @sql                   = []
+          @sql_parameter_values  = []
+          @handle_lobs_triggered = false
+        end
+
+        clear_query_cache if defined? clear_query_cache
+
+        begin
+          if execute_prepared_stmt(pstmt, param_array)
+            @sql << @prepared_sql
+            @sql_parameter_values << param_array
+            # Retrieves the number of affected rows
+            IBM_DB.num_rows(pstmt)
+            # Ensures to free the resources associated with the statement
+		  end
+        rescue StandardError => updt_err
+          raise updt_err
+        ensure
+          IBM_DB.free_stmt(pstmt) if pstmt
+        end
+      end
       # The delete method executes the delete
       # statement and returns the number of affected rows.
       # The method is an alias for +update+
       alias_method :delete, :update
+      alias_method :prepared_delete, :prepared_update
 
       # Begins the transaction (and turns off auto-committing)
       def begin_db_transaction
@@ -892,13 +1074,21 @@ module ActiveRecord
           if limit == 0
             # Returns a query that will always generate zero records
             # (e.g. WHERE sys_row_num BETWEEN 1 and 0)
-            sql = @servertype.query_offset_limit(sql, 0, limit)
+            if( @pstmt_support_on )
+              sql = @servertype.query_offset_limit!(sql, 0, limit, options)
+            else
+              sql = @servertype.query_offset_limit(sql, 0, limit)
+            end
           # If there is a non-zero limit
           else
             offset = options[:offset]
             # If an offset is specified builds the query with offset and limit,
             # otherwise retrieves only the first +limit+ rows
-            sql = @servertype.query_offset_limit(sql, offset, limit)
+            if( @pstmt_support_on )
+              sql = @servertype.query_offset_limit!(sql, offset, limit, options)
+            else
+              sql = @servertype.query_offset_limit(sql, offset, limit)
+            end
           end
         end
         # Returns the sql query in any case
@@ -914,6 +1104,35 @@ module ActiveRecord
       # QUOTING
       #==============================================
 
+      #Praveen
+      def quote_value_for_pstmt(value, column=nil)
+
+        return value.quoted_id if value.respond_to?(:quoted_id)
+
+        case value
+          when String, ActiveSupport::Multibyte::Chars then
+            value = value.to_s
+            if column && [:integer, :float].include?(column.type)
+              value = column.type == :integer ? value.to_i : value.to_f
+              value
+            else
+              value
+            end
+          when NilClass                 then nil
+          when TrueClass                then 1
+          when FalseClass               then 0
+          when Float, Fixnum, Bignum    then value
+          # BigDecimals need to be output in a non-normalized form and quoted.
+          when BigDecimal               then value.to_s('F')
+          else
+            if value.acts_like?(:date) || value.acts_like?(:time)
+              quoted_date(value)
+            else
+              value.to_yaml
+            end
+        end
+      end
+
       # Properly quotes the various data types.
       # +value+ contains the data, +column+ is optional and contains info on the field
       def quote(value, column = nil)
@@ -1080,7 +1299,7 @@ module ActiveRecord
               raise error_msg
             end
           ensure
-            IBM_DB.free_result(stmt)  # Free resources associated with the statement
+            IBM_DB.free_stmt(stmt)  if stmt # Free resources associated with the statement
           end
         else # Handle driver execution errors
           error_msg = IBM_DB.getErrormsg(@connection, IBM_DB::DB_CONN )
@@ -1115,7 +1334,7 @@ module ActiveRecord
               raise error_msg
             end
           ensure  # Free resources associated with the statement
-            IBM_DB.free_result(stmt) if stmt
+            IBM_DB.free_stmt(stmt) if stmt
           end
         else
           error_msg = IBM_DB.getErrormsg( @connection, IBM_DB::DB_CONN )
@@ -1171,7 +1390,7 @@ module ActiveRecord
               raise error_msg
             end
           ensure  # Free resources associated with the statement
-            IBM_DB.free_result(stmt) if stmt
+            IBM_DB.free_stmt(stmt) if stmt
           end
         else  # Handle driver execution errors
           error_msg = IBM_DB.getErrormsg(@connection, IBM_DB::DB_CONN )
@@ -1225,7 +1444,7 @@ module ActiveRecord
               raise error_msg
             end
           ensure  # Free resources associated with the statement
-            IBM_DB.free_result(stmt) if stmt
+            IBM_DB.free_stmt(stmt) if stmt
           end
         else  # Handle driver execution errors
           error_msg = IBM_DB.getErrormsg(@connection, IBM_DB::DB_CONN )
@@ -1314,7 +1533,7 @@ module ActiveRecord
               raise error_msg
             end
           ensure  # Free resources associated with the statement
-            IBM_DB.free_result(stmt)
+            IBM_DB.free_stmt(stmt) if stmt
           end
         else  # Handle driver execution errors
           error_msg = IBM_DB.getErrormsg(@connection, IBM_DB::DB_CONN )
@@ -1338,7 +1557,7 @@ module ActiveRecord
         stmt = execute(rename_table_sql)
         # Ensures to free the resources associated with the statement
         ensure
-          IBM_DB.free_result stmt if stmt
+          IBM_DB.free_stmt(stmt) if stmt
       end
 
       # Renames a column.
@@ -1482,8 +1701,6 @@ To remove the column, the table must be dropped and recreated without the #{colu
             error_msg = error_msg + ": #{fetch_error.message}" if !fetch_error.message.empty?
             raise error_msg
           end
-        ensure  # Free resources associated with the statement
-          IBM_DB.free_result(stmt)
         end
       end
 
@@ -1505,8 +1722,24 @@ To remove the column, the table must be dropped and recreated without the #{colu
             error_msg = error_msg + ": #{fetch_error.message}" if !fetch_error.message.empty?
             raise error_msg
           end
-        ensure  # Free resources associated with the statement
-          IBM_DB.free_result(stmt)
+        end
+      end
+
+      # Praveen
+      def prepare(sql,name = nil)
+        begin
+          stmt = IBM_DB.prepare(@adapter.connection, sql)
+          if( stmt )
+            stmt
+          else
+            raise StatementInvalid, IBM_DB.getErrormsg(@adapter.connection, IBM_DB::DB_CONN )
+          end
+        rescue StandardError => prep_err
+          if prep_err && !prep_err.message.empty?
+            raise "Failed to prepare sql #{sql} due to: #{prep_err}"
+          else 
+            raise
+          end
         end
       end
 
@@ -1532,6 +1765,9 @@ To remove the column, the table must be dropped and recreated without the #{colu
 
       def query_offset_limit(sql, offset, limit)
       end
+
+      def query_offset_limit!(sql, offset, limit, options)
+      end
       
       def get_datetime_mapping
       end
@@ -1580,24 +1816,35 @@ To remove the column, the table must be dropped and recreated without the #{colu
       def last_generated_id(stmt)
         # Queries the db to obtain the last ID that was automatically generated
         sql = "SELECT IDENTITY_VAL_LOCAL() FROM SYSIBM.SYSDUMMY1"
-        stmt = IBM_DB.exec(@adapter.connection, sql)
+        stmt = IBM_DB.prepare(@adapter.connection, sql)
         if(stmt)
-          begin
-            # Fetches the only record available (containing the last id)
-            IBM_DB.fetch_row(stmt)
-            # Retrieves and returns the result of the query with the last id.
-            IBM_DB.result(stmt,0)
-          rescue StandardError => fetch_error # Handle driver fetch errors
+          if(IBM_DB.execute(stmt, nil))
+            begin
+              # Fetches the only record available (containing the last id)
+              IBM_DB.fetch_row(stmt)
+              # Retrieves and returns the result of the query with the last id.
+              IBM_DB.result(stmt,0)
+            rescue StandardError => fetch_error # Handle driver fetch errors
+              error_msg = IBM_DB.getErrormsg(stmt, IBM_DB::DB_STMT )
+              if error_msg && !error_msg.empty?
+                raise "Failed to retrieve last generated id: #{error_msg}"
+              else
+                error_msg = "An unexpected error occurred during retrieval of last generated id"
+                error_msg = error_msg + ": #{fetch_error.message}" if !fetch_error.message.empty?
+                raise error_msg
+              end
+            ensure  # Free resources associated with the statement
+              IBM_DB.free_stmt(stmt) if stmt
+            end
+          else
             error_msg = IBM_DB.getErrormsg(stmt, IBM_DB::DB_STMT )
+            IBM_DB.free_stmt(stmt) if stmt
             if error_msg && !error_msg.empty?
               raise "Failed to retrieve last generated id: #{error_msg}"
             else
               error_msg = "An unexpected error occurred during retrieval of last generated id"
-              error_msg = error_msg + ": #{fetch_error.message}" if !fetch_error.message.empty?
               raise error_msg
             end
-          ensure  # Free resources associated with the statement
-            IBM_DB.free_result(stmt) if stmt
           end
         else
           error_msg = IBM_DB.getErrormsg(@adapter.connection, IBM_DB::DB_CONN )
@@ -1640,7 +1887,7 @@ SET WITH DEFAULT #{@adapter.quote(default)}"
         stmt = execute(change_column_sql)
         reorg_table(table_name)
         ensure
-          IBM_DB.free_result stmt if stmt
+          IBM_DB.free_stmt(stmt) if stmt
       end
 
       #DB2 specific ALTER TABLE statement to change the nullability of a column
@@ -1659,7 +1906,7 @@ SET WITH DEFAULT #{@adapter.quote(default)}"
         stmt = execute(change_column_sql)
         reorg_table(table_name)
         ensure
-          IBM_DB.free_result stmt if stmt   
+          IBM_DB.free_stmt(stmt) if stmt   
       end
     
       # This method returns the DB2 SQL type corresponding to the Rails
@@ -1819,11 +2066,39 @@ SET WITH DEFAULT #{@adapter.quote(default)}"
         end
       end
 
+      # Praveen
+      def prepare(sql,name = nil)
+        # Check if there is a limit and/or an offset
+        # If so then make sure and use a static cursor type
+        begin
+          if (!@offset.nil? && @offset >= 0) || (!@limit.nil? && @limit > 0)
+            # Set the cursor type to static so we can later utilize the offset and limit correctly
+            if stmt = IBM_DB.prepare(@adapter.connection, sql, 
+                      {IBM_DB::SQL_ATTR_CURSOR_TYPE => IBM_DB::SQL_CURSOR_STATIC})
+              stmt   # Return the statement object
+            else
+              raise StatementInvalid, IBM_DB.getErrormsg(@adapter.connection, IBM_DB::DB_CONN )
+            end
+          else
+            if stmt = IBM_DB.prepare(@adapter.connection, sql)
+              stmt   # Return the statement object
+            else
+              raise StatementInvalid, IBM_DB.getErrormsg(@adapter.connection, IBM_DB::DB_CONN )
+            end
+          end
+        rescue StandardError => prep_err
+          error_msg = "Failed to prepare sql #{sql}"
+          error_msg = error_msg + ": #{prep_err.message}" if !prep_err.message.empty?     
+          raise error_msg
+        end
+      end
+
+      # Praveen
       def execute(sql, name = nil)
         # Check if there is a limit and/or an offset
         # If so then make sure and use a static cursor type
-        if (!@offset.nil? && @offset >= 0) || (!@limit.nil? && @limit > 0)
-          begin
+        begin
+          if (!@offset.nil? && @offset >= 0) || (!@limit.nil? && @limit > 0)
             # Set the cursor type to static so we can later utilize the offset and limit correctly
             if stmt = IBM_DB.exec(@adapter.connection, sql, 
                       {IBM_DB::SQL_ATTR_CURSOR_TYPE => IBM_DB::SQL_CURSOR_STATIC})
@@ -1831,23 +2106,17 @@ SET WITH DEFAULT #{@adapter.quote(default)}"
             else
               raise StatementInvalid, IBM_DB.getErrormsg(@adapter.connection, IBM_DB::DB_CONN )
             end
-          rescue StandardError => exec_err
-            error_msg = "Failed to execute statement due to"
-            error_msg = error_msg + ": #{exec_err.message}" if !exec_err.message.empty?     
-            raise error_msg
-          end
-        else
-          begin
+          else
             if stmt = IBM_DB.exec(@adapter.connection, sql)
               stmt   # Return the statement object
             else
               raise StatementInvalid, IBM_DB.getErrormsg(@adapter.connection, IBM_DB::DB_CONN )
             end
-          rescue StandardError => exec_err
-            error_msg = "Failed to execute statement due to"
-            error_msg = error_msg + ": #{exec_err.message}" if !exec_err.message.empty?     
-            raise error_msg
           end
+        rescue StandardError => exec_err
+          error_msg = "Failed to execute statement"
+          error_msg = error_msg + ": #{exec_err.message}" if !exec_err.message.empty?     
+          raise error_msg
         end
       end
 
@@ -1859,6 +2128,15 @@ SET WITH DEFAULT #{@adapter.quote(default)}"
         end
       end
 
+      def query_offset_limit!(sql, offset, limit, options)
+        @limit = limit
+        @offset = offset
+        if (offset.nil?)
+           sql << " FETCH FIRST #{limit} ROWS ONLY"
+        end
+        options[:paramArray] = []
+      end
+
       # This method generates the default blob value specified for 
       # DB2 Dataservers
       def set_binary_default(value)
@@ -1904,6 +2182,24 @@ SET WITH DEFAULT #{@adapter.quote(default)}"
         # and retrieve only a LIMIT number of records starting from the OFFSET+1
         sql << ") AS I) AS O WHERE sys_row_num BETWEEN #{offset+1} AND #{last_record}"
       end
+
+      def query_offset_limit!(sql, offset, limit, options)
+        if (offset.nil?)
+           options[:paramArray] = []
+           return sql << " FETCH FIRST #{limit} ROWS ONLY"
+        end
+        # Defines what will be the last record
+        last_record = offset + limit
+        # Transforms the SELECT query in order to retrieve/fetch only
+        # a number of records after the specified offset.
+        # 'select' or 'SELECT' is replaced with the partial query below that adds the sys_row_num column
+        # to select with the condition of this column being between offset+1 and the offset+limit
+        sql.sub!(/SELECT/i,"SELECT O.* FROM (SELECT I.*, ROW_NUMBER() OVER () sys_row_num FROM (SELECT")
+        # The final part of the query is appended to include a WHERE...BETWEEN...AND condition,
+        # and retrieve only a LIMIT number of records starting from the OFFSET+1
+        sql << ") AS I) AS O WHERE sys_row_num BETWEEN ? AND ?"
+        options[:paramArray] = [offset+1, last_record]
+      end
     end # class IBM_DB2_LUW
 
     class IBM_DB2_LUW_COBRA < IBM_DB2_LUW
@@ -1945,7 +2241,7 @@ SET WITH DEFAULT #{@adapter.quote(default)}"
           reorg_table(_table_name)
 
         ensure
-          IBM_DB.free_stmt stmt if stmt
+          IBM_DB.free_stmt(stmt) if stmt
         end #End of begin
       end # End of rename_column
     end #IBM_DB2_LUW_COBRA
@@ -2010,7 +2306,7 @@ SET WITH DEFAULT #{@adapter.quote(default)}"
           reorg_table(_table_name)
 
         ensure
-          IBM_DB.free_stmt stmt if stmt
+          IBM_DB.free_stmt(stmt) if stmt
         end #End of begin
       end # End of rename_column
 
@@ -2097,7 +2393,7 @@ SET WITH DEFAULT #{@adapter.quote(default)}"
           reorg_table(_table_name)
 
         ensure
-          IBM_DB.free_stmt stmt if stmt
+          IBM_DB.free_stmt(stmt) if stmt
         end #End of begin
       end # End of rename_column
 
@@ -2136,7 +2432,7 @@ SET WITH DEFAULT #{@adapter.quote(default)}"
         reorg_table(table_name)
         # Ensures to free the resources associated with the statement
         ensure
-          IBM_DB.free_result stmt if stmt
+          IBM_DB.free_stmt(stmt) if stmt
       end
 
       # IDS specific ALTER TABLE statement to change the nullability of a column
@@ -2160,7 +2456,7 @@ SET WITH DEFAULT #{@adapter.quote(default)}"
         stmt = execute(change_column_sql)
         reorg_table(table_name)
         ensure
-          IBM_DB.free_result stmt if stmt
+          IBM_DB.free_stmt(stmt) if stmt
       end
 
       # Reorganizes the table for column changes
@@ -2202,6 +2498,23 @@ SET WITH DEFAULT #{@adapter.quote(default)}"
         end
       end
 
+      # Handling offset/limit as per Informix requirements
+      def query_offset_limit!(sql, offset, limit, options)
+        if limit != 0
+          if !offset.nil?
+            # Modifying the SQL to utilize the skip and limit amounts
+            sql.gsub!(/SELECT/i,"SELECT SKIP #{offset} LIMIT #{limit}")
+          else
+            # Modifying the SQL to retrieve only the first #{limit} rows
+            sql = sql.gsub!("SELECT","SELECT FIRST #{limit}")
+          end
+        else
+          # Modifying the SQL to ensure that no rows will be returned
+          sql.gsub!(/SELECT/i,"SELECT * FROM (SELECT")
+          sql << ") WHERE 0 = 1"
+        end
+      end
+
       # Method that returns the last automatically generated ID
       # on the given +@connection+. This method is required by the +insert+ 
       # method. IDS returns the last generated serial value in the SQLCA unlike