ibm_db 0.9.1 → 0.9.2

data/CHANGES

@@ -1,6 +1,11 @@
 Change Log
 ==============
 
+2007/11/30 (IBM_DB adapter 0.9.2, driver 0.9.1):
+  - Lifted index length limitation (18 chars) and fixed multiple index creation
+  - Fixed [#13294] limit/offset breaks subselect in db2 adapter
+  - Fixed error handling for metadata retrieval (tables, columns, indexes)
+
 2007/11/07 (IBM_DB adapter 0.9.1, driver 0.9.1):
   - Fixed ibm_db driver VC80 runtime issue on Windows
 

data/lib/active_record/connection_adapters/ibm_db_adapter.rb

@@ -62,13 +62,22 @@ module ActiveRecord
           end
           update_query << " WHERE #{self.class.primary_key} = #{id}"
 
-          stmt = IBM_DB::prepare(connection.connection, update_query)
+          unless stmt = IBM_DB::prepare(connection.connection, update_query)
+            error_msg = IBM_DB::conn_errormsg ? IBM_DB::conn_errormsg : IBM_DB::stmt_errormsg
+            if error_msg && !error_msg.empty?
+              raise "Failed to rename table due to error: #{error_msg}"
+            else
+              raise StandardError('Unexpected error during update')
+            end
+          end
           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)
             connection.execute("ROLLBACK")
             raise "Failed to insert/update LOB/XML field(s) due to: #{IBM_DB::stmt_errormsg(stmt)}"
+          else
+            IBM_DB::free_result stmt
           end
         end # if connection.sql
       end # if connection.kind_of?
@@ -737,25 +746,35 @@ requires credentials: username and password"
         128
       end
 
-      # Returns an array of tables within the given shema
+      # Retrieves table's metadata for a specified shema name
       def tables(name = nil)
         # Initializes the tables array
         tables = []
-        # Returns a IBM_DB::Statement used to retrieve the tables
-        if stmt = IBM_DB::tables(@connection, 
-                                 nil, 
+        # Retrieve table's metadata through IBM_DB driver
+        if stmt = IBM_DB::tables(@connection, nil, 
                                  @servertype.set_case(@schema))
-          # Fetches all the records available
-          while tab = IBM_DB::fetch_assoc(stmt)
-            # Adds the lowercase table name to the array
-            tables << tab["table_name"].downcase
+          begin
+            # Fetches all the records available
+            while tab = IBM_DB::fetch_assoc(stmt)
+              # Adds the lowercase table name to the array
+              tables << tab["table_name"].downcase
+            end
+          ensure
+            IBM_DB::free_result(stmt)  # Free resources associated with the statement
+          end
+        else # Handle driver execution errors
+          error_msg = IBM_DB::conn_errormsg ? IBM_DB::conn_errormsg : IBM_DB::stmt_errormsg
+          if error_msg && !error_msg.empty?
+            raise "Failed to retrieve tables metadata due to error: #{error_msg}"
+          else
+            raise StandardError('Unexpected error during table metadata retrieval')
           end
         end
         # Returns the tables array
-        tables
+        return tables
       end
 
-      # Returns an array of non-primary key indexes for the given table
+      # Returns an array of non-primary key indexes for a specified table name
       def indexes(table_name, name = nil)
         # to_s required because +table_name+ may be a symbol.
         table_name = table_name.to_s
@@ -770,28 +789,35 @@ requires credentials: username and password"
         # "NON_UNIQUE:   #{index_stats[3]}"
         # "INDEX_NAME:   #{index_stats[5]}"
         # "COLUMN_NAME:  #{index_stats[8]}"
-        stmt = IBM_DB::statistics( @connection, 
-                                   nil, 
-                                   @servertype.set_case(@schema), 
-                                   @servertype.set_case(table_name), 
-                                   1)
-        while ( index_stats = IBM_DB::fetch_array(stmt) )
-          if index_stats[5]                                          # INDEX_NAME
-            index_name = index_stats[5].downcase
-            # Non-unique index type (not the primary key)
-            unless index_stats[3] == 0                               # NON_UNIQUE
-              index_unique = (index_stats[3] == 0)
-              index_columns = index_stats[8].map{|c| c.downcase}     # COLUMN_NAME
-              # Create an IndexDefinition object and add to the indexes array
-              indexes << IndexDefinition.new(table_name, index_name, index_unique, index_columns)
+        if stmt = IBM_DB::statistics( @connection, nil, 
+                                      @servertype.set_case(@schema), 
+                                      @servertype.set_case(table_name), 1 )
+          begin
+            while ( index_stats = IBM_DB::fetch_array(stmt) )
+              if index_stats[5]                                          # INDEX_NAME
+                index_name = index_stats[5].downcase
+                # Non-unique index type (not the primary key)
+                unless index_stats[3] == 0                               # NON_UNIQUE
+                  index_unique = (index_stats[3] == 0)
+                  index_columns = index_stats[8].map{|c| c.downcase}     # COLUMN_NAME
+                  # Create an IndexDefinition object and add to the indexes array
+                  indexes << IndexDefinition.new(table_name, index_name, index_unique, index_columns)
+                end
+              end
             end
+          ensure  # Free resources associated with the statement
+            IBM_DB::free_result(stmt) if stmt
+          end
+        else  # Handle driver execution errors
+          error_msg = IBM_DB::conn_errormsg ? IBM_DB::conn_errormsg : IBM_DB::stmt_errormsg
+          if error_msg && !error_msg.empty?
+            raise "Failed to retrieve index metadata due to error: #{error_msg}"
+          else
+            raise StandardError('Unexpected error during index retrieval')
           end
         end
         # Returns the indexes array
         return indexes
-        # Ensures to free the resources associated with the statement
-        ensure
-          IBM_DB::free_result(stmt) if stmt
       end
 
       # Returns an array of Column objects for the table specified by +table_name+
@@ -804,10 +830,9 @@ requires credentials: username and password"
         # +columns+ will contain the resulting array
         columns = []
         # Statement required to access all the columns information
-        if stmt = IBM_DB::columns(@connection, 
-                                  nil, 
-                                  @servertype.set_case(@schema), 
-                                  @servertype.set_case(table_name))
+        if stmt = IBM_DB::columns( @connection, nil, 
+                                   @servertype.set_case(@schema), 
+                                   @servertype.set_case(table_name) )
           begin
             # Fetches all the columns and assigns them to col.
             # +col+ is an hash with keys/value pairs for a column
@@ -849,17 +874,26 @@ requires credentials: username and password"
                 columns << IBM_DBColumn.new(column_name, column_default_value, column_type, column_nullable)
               end
             end
-          rescue StandardError
+          rescue StandardError  # Handle driver fetch errors
             error_msg = IBM_DB::conn_errormsg ? IBM_DB::conn_errormsg : IBM_DB::stmt_errormsg
             if error_msg && !error_msg.empty?
-              raise "Failed to retrieve column metadata due to driver error: #{error_msg}"
+              raise "Failed to retrieve column metadata during fetch: #{error_msg}"
             else
               raise
             end
+          ensure  # Free resources associated with the statement
+            IBM_DB::free_result(stmt)
+          end
+        else  # Handle driver execution errors
+          error_msg = IBM_DB::conn_errormsg ? IBM_DB::conn_errormsg : IBM_DB::stmt_errormsg
+          if error_msg && !error_msg.empty?
+            raise "Failed to retrieve column metadata due to error: #{error_msg}"
+          else
+            raise StandardError('Unexpected error during columns metadata retrieval')
           end
         end
         # Returns the columns array
-        columns
+        return columns
       end
 
       # Renames a table.
@@ -909,43 +943,6 @@ requires credentials: username and password"
         @servertype.change_column_default(table_name, column_name, default)
       end
 
-      # Adds a new index to the table.  +column_name+ can be a single Symbol, or
-      # an Array of Symbols.
-      #
-      # The index will be named after the table and the first column names,
-      # unless you pass +:name+ as an option.
-      #
-      # When creating an index on multiple columns, the first column is used as a name
-      # for the index. For example, when you specify an index on two columns
-      # [+:first+, +:last+], the DBMS creates an index for both columns as well as an
-      # index for the first colum +:first+. Using just the first name for this index
-      # makes sense, because you will never have to create a singular index with this
-      # name.
-      #
-      # ===== Examples
-      # ====== Creating a simple index
-      #  add_index(:suppliers, :name)
-      # generates
-      #  CREATE INDEX suppliers_name_index ON suppliers(name)
-      # ====== Creating a unique index
-      #  add_index(:accounts, [:branch_id, :party_id], :unique => true)
-      # generates
-      #  CREATE UNIQUE INDEX accounts_branch_id_index ON accounts(branch_id, party_id)
-      # ====== Creating a named index
-      #  add_index(:accounts, [:branch_id, :party_id], :unique => true, :name => 'by_branch_party')
-      # generates
-      #  CREATE UNIQUE INDEX by_branch_party ON accounts(branch_id, party_id)
-      # Overidden to comply to the 18 characters cross-platform limit on index identifiers.
-      def add_index(table_name, column_name, options = {})
-        index_name = index_name(table_name, options)
-        if Hash === options # legacy support, since this param was a string
-          index_type = options[:unique] ? "UNIQUE" : ""
-        else
-          index_type = options
-        end
-        execute("CREATE #{index_type} INDEX #{index_name} ON #{table_name} (#{Array(column_name).join(", ")})")
-      end
-
       # Remove the given index from the table.
       #
       # Remove the suppliers_name_index in the suppliers table (legacy support, use the second or third forms).
@@ -962,24 +959,6 @@ requires credentials: username and password"
       def remove_index(table_name, options = {})
         execute("DROP INDEX #{index_name(table_name, options)}")
       end
-
-      # Builds an index name from a table_name and column. If an index name has been passed,
-      # the method returns it. Overrides the default method to respect the IBM data servers (cross-platform)
-      # limit on indexes (max of 18 characters)
-      def index_name(table_name, options)
-        if Hash === options and options[:name] 
-          # legacy support
-          # If a name has been specified, this is returned
-          options[:name]
-        else
-          # We reverse the table name to reduce the chance of hitting duplicate
-          # index name errors. For e.g. indexes on table names like accounts,
-          # accounts_favorites
-          "ror_#{table_name.to_s.reverse[0,10]}_idx"
-        end
-      end
-      private :index_name
-
     end # class IBM_DBAdapter
 
     # This class contains common code across DB's (DB2 LUW, zOS, i5 and IDS)
@@ -1093,11 +1072,23 @@ 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)
-        # 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)
+        if stmt = IBM_DB::exec(@adapter.connection, sql)
+          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)
+          ensure  # Free resources associated with the statement
+            IBM_DB::free_result stmt
+          end
+        else
+          error_msg = IBM_DB::conn_errormsg ? IBM_DB::conn_errormsg : IBM_DB::stmt_errormsg
+          if error_msg && !error_msg.empty?
+            raise "Failed to retrieve last generated id due to error: #{error_msg}"
+          else
+            raise StandardError('Unexpected error during last generated id retrieval')
+          end
+        end
       end
 
       def change_column(table_name, column_name, type, options)
@@ -1285,7 +1276,7 @@ SET WITH DEFAULT #{@adapter.quote(default)}"
         # 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.gsub!(/SELECT/i,"SELECT O.* FROM (SELECT I.*, ROW_NUMBER() OVER () sys_row_num FROM (SELECT")
+        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 #{offset+1} AND #{last_record}"

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: ibm_db
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
-date: 2007-11-21 00:00:00 -05:00
+  version: 0.9.2
+date: 2007-11-30 00:00:00 -05:00
 summary: "Rails Driver and Adapter for IBM Data Servers: {LUW, zOS, i5, IDS}"
 require_paths: 
 - lib