Merge pull request #144 from praveen-db2/master

Support for Ruby 3.1 and Rails 7.0

Author: praveen-db2

IBM_DB_Adapter/ibm_db/IBM_DB.gemspec

@@ -10,7 +10,7 @@ require 'pathname'
 Gem::Specification.new do |spec|
   # Required spec
   spec.name     = 'ibm_db'
-  spec.version  = '5.3.2'
+  spec.version  = '5.4.0'
   spec.summary  = 'Rails Driver and Adapter for IBM Data Servers: {DB2 on Linux/Unix/Windows, DB2 on zOS, DB2 on i5/OS, Informix (IDS)}'
 
   # Optional spec
@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.homepage = 'https://github.com/ibmdb/ruby-ibmdb'
   spec.required_ruby_version = '>= 2.5.0'
   spec.add_dependency('zip')
-  spec.add_dependency('activerecord', '<6.2')
-  spec.requirements << 'ActiveRecord, at least 6.1'
+  spec.add_dependency('activerecord', '<7.1')
+  spec.requirements << 'ActiveRecord, at least 7.0'
 
   candidates = Dir.glob("**/*")
   spec.files = candidates.delete_if do |item|

IBM_DB_Adapter/ibm_db/README

@@ -1,5 +1,5 @@
 =====================================================================
-README for the IBM_DB Adapter (5.0.0) and Driver (3.0.5)
+README for the IBM_DB Adapter >= 5.0.0 and Driver >= 3.0.5
 For ActiveRecord Version >= 5.0.7 (and Rails >= 5.0.7)
 =====================================================================
 

IBM_DB_Adapter/ibm_db/ext/ibm_db.c

@@ -12,7 +12,7 @@
   +----------------------------------------------------------------------+
 */
 
-#define MODULE_RELEASE "3.0.6"
+#define MODULE_RELEASE "3.1.0"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2507,8 +2507,7 @@ static VALUE _ruby_ibm_db_connect_helper( int argc, VALUE *argv, int isPersisten
   }
   /* Call the function where the actual logic is being run*/
   #ifdef UNICODE_SUPPORT_VERSION_H
-	ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_connect_helper2, helper_args, RUBY_UBF_IO, NULL);	
-	
+    _ruby_ibm_db_connect_helper2( helper_args );
 
     conn_res = helper_args->conn_res;
 
@@ -6988,8 +6987,7 @@ VALUE ibm_db_execute(int argc, VALUE *argv, VALUE self)
     bind_array->error             =  &error;
 
     #ifdef UNICODE_SUPPORT_VERSION_H
-  	  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_execute_helper, bind_array,
-                            RUBY_UBF_IO, NULL );
+      _ruby_ibm_db_execute_helper( bind_array );
 	  ret_value = bind_array->return_value;
     #else
       ret_value = _ruby_ibm_db_execute_helper( bind_array );
@@ -10078,8 +10076,7 @@ VALUE ibm_db_fetch_row(int argc, VALUE *argv, VALUE self)
   helper_args->error       =  &error;
 
   #ifdef UNICODE_SUPPORT_VERSION_H
-	ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_fetch_row_helper, helper_args,
-                        RUBY_UBF_IO, NULL );
+    _ruby_ibm_db_fetch_row_helper( helper_args );
 	ret_val = helper_args->return_value;
   #else
     ret_val = _ruby_ibm_db_fetch_row_helper( helper_args );
@@ -10247,8 +10244,7 @@ VALUE ibm_db_fetch_assoc(int argc, VALUE *argv, VALUE self) {
   helper_args->funcType   =  FETCH_ASSOC;
 
   #ifdef UNICODE_SUPPORT_VERSION_H
-  	ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_bind_fetch_helper, helper_args,
-                         RUBY_UBF_IO, NULL );
+    _ruby_ibm_db_bind_fetch_helper( helper_args );
 	ret_val = helper_args->return_value;
 
   #else

IBM_DB_Adapter/ibm_db/lib/active_record/connection_adapters/ibm_db_adapter.rb

@@ -51,6 +51,12 @@ def create_table
   module ConnectionAdapters
     class SchemaDumper
       private
+        def header(stream)
+          stream.puts <<~HEADER          
+            ActiveRecord::Schema[#{ActiveRecord::Migration.current_version}].define(#{define_params}) do
+          HEADER
+        end
+
         def default_primary_key?(column)
           schema_type(column) == :integer
         end
@@ -75,11 +81,11 @@ def visit_TableDefinition(o)
           end
 
           if supports_foreign_keys?
-            statements.concat(o.foreign_keys.map { |to_table, options| foreign_key_in_create(o.name, to_table, options) })
+            statements.concat(o.foreign_keys.map { |fk| accept fk })
           end
 
           if supports_check_constraints?
-            statements.concat(o.check_constraints.map { |expression, options| check_constraint_in_create(o.name, expression, options) })
+            statements.concat(o.check_constraints.map { |chk| accept chk })
           end
 
           create_sql << "(#{statements.join(', ')})" if statements.present?
@@ -423,7 +429,7 @@ def internal_string_options_for_primary_key # :nodoc:
       end
 
       def drop_table(table_name, options={})
-        puts_log "drop_table"
+        puts_log "drop_table - #{table_name}"
         if options[:if_exists]
           execute("DROP TABLE IF EXISTS #{quote_table_name(table_name)}")
         else
@@ -833,7 +839,9 @@ def get_database_version
 
       def prepared_statements?
         puts_log "prepared_statements?"
-        @prepared_statements && !prepared_statements_disabled_cache.include?(object_id)
+        prepare = @prepared_statements && !prepared_statements_disabled_cache.include?(object_id)
+        puts_log "prepare = #{prepare}"
+        prepare
       end
       alias :prepared_statements :prepared_statements?
 
@@ -1112,21 +1120,43 @@ def fetch_data(stmt)
         end
       end
 
-      def select(sql, name = nil, binds = [])
+      def select(sql, name = nil, binds = [], prepare: false, async: false)
         puts_log "select #{sql}"
+        puts_log "prepare = #{prepare}"
+
         # Replaces {"= NULL" with " IS NULL"} OR {"IN (NULL)" with " IS NULL"
         begin
           sql.gsub( /(=\s*NULL|IN\s*\(NULL\))/i, " IS NULL" )
         rescue
           # ...
         end
 
+        if async && async_enabled?
+          if current_transaction.joinable?
+            raise AsynchronousQueryInsideTransactionError, "Asynchronous queries are not allowed inside transactions"
+          end
+
+          future_result = async.new(
+            pool,
+            sql,
+            name,
+            binds,
+            prepare: prepare,
+          )
+          if supports_concurrent_connections? && current_transaction.closed?
+            future_result.schedule!(ActiveRecord::Base.asynchronous_queries_session)
+          else
+            future_result.execute!(self)
+          end
+          return future_result
+        end
+
         results = []
 
         if(binds.nil? || binds.empty?)
           stmt = execute(sql, name)
         else
-          stmt = exec_query_ret_stmt(sql, name, binds, prepare = false)
+          stmt = exec_query_ret_stmt(sql, name, binds, prepare)
         end
 
         cols = IBM_DB.resultCols(stmt)
@@ -1452,7 +1482,8 @@ def explain(arel, binds = [])
       # the executed +sql+ statement.
       # Here prepare argument is not used, by default this method creates prepared statment and execute.
       def exec_query_ret_stmt(sql, name = 'SQL', binds = [], prepare = false)
-        puts_log "exec_query_ret_stmt"
+        puts_log "exec_query_ret_stmt #{sql}"
+        sql = transform_query(sql)
         check_if_write_query(sql)
         materialize_transactions
         mark_transaction_written_if_write(sql)
@@ -1461,6 +1492,8 @@ def exec_query_ret_stmt(sql, name = 'SQL', binds = [], prepare = false)
           puts_log "Binds = #{binds}"
           param_array = type_casted_binds(binds)
           puts_log "Param array = #{param_array}"
+          puts_log "Prepare flag = #{prepare}"
+          puts_log "#{caller}"
 
           stmt = @servertype.prepare(sql, name)
           if prepare 
@@ -1526,6 +1559,7 @@ def execute(sql, name=nil)
 	    #sql='INSERT INTO ar_internal_metadata (key, value, created_at, updated_at) VALUES ('10', '10', '10', '10')
         puts_log "execute"
         puts_log "#{sql}"
+        sql = transform_query(sql)
         check_if_write_query(sql)
         materialize_transactions
         mark_transaction_written_if_write(sql)
@@ -1725,6 +1759,9 @@ def unquoted_false
 
       def quote_table_name(name)
         puts_log "quote_table_name"
+        if name.start_with?'0', '1', '2', '3', '4', '5', '6', '7', '8', '9'
+          name = "\"#{name}\""
+        end
         name
         #@servertype.check_reserved_words(name).gsub('"', '').gsub("'",'')
       end
@@ -2378,7 +2415,9 @@ def columns(table_name)
               column_nullable = (col["nullable"] == 1) ? true : false
               # Make sure the hidden column (db2_generated_rowid_for_lobs) in DB2 z/OS isn't added to the list
               if !(column_name.match(/db2_generated_rowid_for_lobs/i))
+                puts_log "Column type = #{column_type}"
 				ruby_type = simplified_type(column_type)
+                puts_log "Ruby type after = #{ruby_type}"
 				precision = extract_precision(ruby_type)
 
                 if column_type.match(/timestamp|integer|bigint|date|time|blob/i)
@@ -2429,7 +2468,7 @@ def columns(table_name)
             else
               error_msg = "An unexpected error occurred during retrieval of column metadata"
               error_msg = error_msg + ": #{fetch_error.message}" if !fetch_error.message.empty?
-              raise error_msg
+#             raise error_msg
             end
           ensure  # Free resources associated with the statement
             IBM_DB.free_stmt(stmt) if stmt
@@ -2447,6 +2486,10 @@ def columns(table_name)
         return columns
       end
 
+      def extract_precision(sql_type)
+        $1.to_i if sql_type =~ /\((\d+)(,\d+)?\)/
+      end
+
       def extract_default_function(default_value, default)
         default if has_default_function?(default_value, default)
       end
@@ -2491,7 +2534,7 @@ def foreign_keys(table_name)
             else
               error_msg = "An unexpected error occurred during retrieval of foreign key metadata"
               error_msg = error_msg + ": #{fetch_error.message}" if !fetch_error.message.empty?
-              raise error_msg
+#             raise error_msg
             end
           ensure  # Free resources associated with the statement
             IBM_DB.free_stmt(stmt) if stmt
@@ -2578,6 +2621,7 @@ def add_column(table_name, column_name, type, **options) # :nodoc:
         puts_log "add_column"
         clear_cache!
         puts_log "add_column info #{table_name}, #{column_name}, #{type}, #{options}"
+        puts_log caller
         if (!type.nil? && type.to_s == "primary_key") or (options.key?(:primary_key) and options[:primary_key] == true)
           if !type.nil? and type.to_s != "primary_key"
             execute "ALTER TABLE #{table_name} ADD COLUMN #{column_name} #{type} NOT NULL DEFAULT 0"
@@ -2685,6 +2729,15 @@ def table_options(table_name) # :nodoc:
         end
       end
 
+      def remove_columns(table_name, *column_names, type: nil, **options)
+        if column_names.empty?
+          raise ArgumentError.new("You must specify at least one column name. Example: remove_columns(:people, :first_name)")
+        end
+
+        remove_column_fragments = remove_columns_for_alter(table_name, *column_names, type: type, **options)
+        execute "ALTER TABLE #{quote_table_name(table_name)} #{remove_column_fragments.join(' ')}"
+      end
+
       # Renames a table.
       # ==== Example
       # rename_table('octopuses', 'octopi')
@@ -2782,7 +2835,7 @@ def add_foreign_keyList(fkey_list, table_name, column_name, new_column_name)
         puts_log "add_foreign_keyList = #{table_name}, #{column_name}, #{fkey_list}"
         fkey_list.each do |fkey|
           if fkey.options[:column] == column_name
-            add_foreign_key(table_name, fkey.to_table, column: new_column_name)
+            add_foreign_key(table_name, strip_table_name_prefix_and_suffix(fkey.to_table), column: new_column_name)
           end
         end
       end
@@ -2917,6 +2970,7 @@ def initialize_type_map(m = type_map) # :nodoc:
 
       class SchemaDumper < ConnectionAdapters::SchemaDumper
         def dump(stream)    # Like in abstract class, we no need to call header() & trailer().
+          header(stream)
           extensions(stream)
           tables(stream)
           stream
@@ -3724,7 +3778,7 @@ def visit_Arel_Nodes_ValuesList(o, collector)
           row.each_with_index do |value, k|
           collector << ", " unless k == 0
           case value
-            when Nodes::SqlLiteral, Nodes::BindParam
+            when Nodes::SqlLiteral, Nodes::BindParam, ActiveModel::Attribute
               collector = visit(value, collector)
               #collector << quote(value).to_s
             else