activerecord-jdbc-alt-adapter 61.0.0-java → 70.0.0.rc1-java

data/lib/arjdbc/abstract/database_statements.rb

@@ -30,7 +30,7 @@ module ArJdbc
 
       # It appears that at this point (AR 5.0) "prepare" should only ever be true
       # if prepared statements are enabled
-      def exec_query(sql, name = nil, binds = NO_BINDS, prepare: false)
+      def exec_query(sql, name = nil, binds = NO_BINDS, prepare: false, async: false)
         if preventing_writes? && write_query?(sql)
           raise ActiveRecord::ReadOnlyError, "Write query attempted while in readonly mode: #{sql}"
         end
@@ -69,7 +69,7 @@ module ArJdbc
       end
       alias :exec_delete :exec_update
 
-      def execute(sql, name = nil)
+      def execute(sql, name = nil, async: false)
         if preventing_writes? && write_query?(sql)
           raise ActiveRecord::ReadOnlyError, "Write query attempted while in readonly mode: #{sql}"
         end
@@ -77,11 +77,11 @@ module ArJdbc
         materialize_transactions
         mark_transaction_written_if_write(sql)
 
-        log(sql, name) { @connection.execute(sql) }
+        log(sql, name, async: async) { @connection.execute(sql) }
       end
 
       # overridden to support legacy binds
-      def select_all(arel, name = nil, binds = NO_BINDS, preparable: nil)
+      def select_all(arel, name = nil, binds = NO_BINDS, preparable: nil, async: false)
         binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
         super
       end

data/lib/arjdbc/discover.rb

@@ -23,26 +23,6 @@ module ArJdbc
     require('arjdbc/sqlite3') || true if name =~ /sqlite/i
   end
   
-  # Other supported adapters :
-
-  extension :Derby do |name, config|
-    if name =~ /derby/i
-      require 'arjdbc/derby'
-
-      if config && config[:username].nil? # set the database schema name (:username) :
-        begin
-          ArJdbc.with_meta_data_from_data_source_if_any(config) do
-            |meta_data| config[:username] = meta_data.getUserName
-          end
-        rescue => e
-          ArJdbc.warn("failed to set :username from (Derby) database meda-data: #{e.inspect}")
-        end
-      end
-
-      true
-    end
-  end
-
   extension :H2 do |name|
     require('arjdbc/h2') || true if name =~ /\.h2\./i
   end
@@ -54,51 +34,4 @@ module ArJdbc
   extension :MSSQL do |name|
     require('arjdbc/mssql') || true if name =~ /sqlserver|tds|Microsoft SQL/i
   end
-
-  extension :DB2 do |name, config|
-    if name =~ /db2/i && name !~ /as\/?400/i && config[:url] !~ /^jdbc:derby:net:/
-      require 'arjdbc/db2'
-      true
-    end
-  end
-  
-  extension :AS400 do |name, config|
-    # The native JDBC driver always returns "DB2 UDB for AS/400"
-    if name =~ /as\/?400/i
-      require 'arjdbc/db2'
-      require 'arjdbc/db2/as400'
-      true
-    end
-  end
-
-  # NOTE: following ones are likely getting deprecated :
-  
-  extension :FireBird do |name|
-    if name =~ /firebird/i
-      require 'arjdbc/firebird'
-      true
-    end
-  end
-
-  extension :Sybase do |name|
-    if name =~ /sybase|tds/i
-      require 'arjdbc/sybase'
-      true
-    end
-  end
-  
-  extension :Informix do |name|
-    if name =~ /informix/i
-      require 'arjdbc/informix'
-      true
-    end
-  end
-
-  extension :Mimer do |name|
-    if name =~ /mimer/i
-      require 'arjdbc/mimer'
-      true
-    end
-  end
-  
 end

data/lib/arjdbc/hsqldb/adapter.rb

@@ -111,7 +111,7 @@ module ArJdbc
         if column_type == :time
           "'#{value.strftime("%H:%M:%S")}'"
         #elsif column_type == :timestamp # || column_type == :datetime
-          #value = ::ActiveRecord::Base.default_timezone == :utc ? value.getutc : value.getlocal
+          #value = ::ActiveRecord.default_timezone == :utc ? value.getutc : value.getlocal
           #"'#{value.strftime("%Y-%m-%d %H:%M:%S")}.#{sprintf("%06d", value.usec)}'"
         else
           super
@@ -127,7 +127,7 @@ module ArJdbc
     def quoted_date(value)
       if value.acts_like?(:time) && value.respond_to?(:usec)
         usec = sprintf("%06d", value.usec)
-        value = ::ActiveRecord::Base.default_timezone == :utc ? value.getutc : value.getlocal
+        value = ::ActiveRecord.default_timezone == :utc ? value.getutc : value.getlocal
         "#{value.strftime("%Y-%m-%d %H:%M:%S")}.#{usec}"
       else
         super

data/lib/arjdbc/jdbc/adapter.rb

@@ -431,12 +431,12 @@ module ActiveRecord
       private
 
       # Helper useful during {#quote} since AREL might pass in it's literals
-      # to be quoted, fixed since AREL 4.0.0.beta1 : http://git.io/7gyTig
+      # to be quoted, fixed since AREL 4.0.0.beta1 : https://github.com/rails/arel/commit/9c514f3
       def sql_literal?(value); ::Arel::Nodes::SqlLiteral === value; end
 
-      # Helper to get local/UTC time (based on `ActiveRecord::Base.default_timezone`).
+      # Helper to get local/UTC time (based on `ActiveRecord::default_timezone`).
       def get_time(value)
-        get = ::ActiveRecord::Base.default_timezone == :utc ? :getutc : :getlocal
+        get = ::ActiveRecord.default_timezone == :utc ? :getutc : :getlocal
         value.respond_to?(get) ? value.send(get) : value
       end
 

data/lib/arjdbc/jdbc/adapter_require.rb

@@ -2,7 +2,9 @@
 
 module ActiveRecord
 
-  if defined? ConnectionAdapters::ConnectionSpecification::Resolver # 4.0
+  if defined? ConnectionAdapters::ConnectionHandler # 6.1
+    ConnectionAdapters::ConnectionHandler
+  elsif defined? ConnectionAdapters::ConnectionSpecification::Resolver # 4.0, # 5.x, # 6.0
     ConnectionAdapters::ConnectionSpecification::Resolver
   elsif defined? Base::ConnectionSpecification::Resolver # 3.2
     Base::ConnectionSpecification::Resolver

data/lib/arjdbc/jdbc/column.rb

@@ -28,21 +28,6 @@ module ActiveRecord
           end
         end
 
-        if ArJdbc::AR52
-          # undefined method `cast' for #<ActiveRecord::ConnectionAdapters::SqlTypeMetadata> on AR52
-        else
-          default = args[0].cast(default)
-
-          sql_type = args.delete_at(1)
-          type = args.delete_at(0)
-
-          args.unshift(SqlTypeMetadata.new(:sql_type => sql_type, :type => type))
-        end
-
-        # super <= 4.1: (name, default, sql_type = nil, null = true)
-        # super >= 4.2: (name, default, cast_type, sql_type = nil, null = true)
-        # super >= 5.0: (name, default, sql_type_metadata = nil, null = true)
-
         super(name, default, *args)
         init_column(name, default, *args)
       end
@@ -80,18 +65,8 @@ module ActiveRecord
       end
 
       class << self
-
-        include Jdbc::TypeCast if ::ActiveRecord::VERSION::STRING >= '4.2'
-
-        if ActiveRecord::VERSION::MAJOR > 3 && ActiveRecord::VERSION::STRING < '4.2'
-
-          # @private provides compatibility between AR 3.x/4.0 API
-          def string_to_date(value); value_to_date(value) end
-
-        end
-
+        include Jdbc::TypeCast
       end
-
     end
   end
 end

data/lib/arjdbc/jdbc/type_cast.rb

@@ -130,9 +130,9 @@ module ActiveRecord::ConnectionAdapters
             return nil unless time
 
             time -= offset
-            ActiveRecord::Base.default_timezone == :utc ? time : time.getlocal
+            ActiveRecord.default_timezone == :utc ? time : time.getlocal
           else
-            timezone = ActiveRecord::Base.default_timezone
+            timezone = ActiveRecord.default_timezone
             Time.public_send(timezone, year, mon, mday, hour, min, sec, microsec) rescue nil
           end
         end

data/lib/arjdbc/jdbc.rb

@@ -1,13 +1,6 @@
 require 'active_support/deprecation'
 
 module ArJdbc
-
-  # @private
-  AR42 = ::ActiveRecord::VERSION::STRING >= '4.2'
-
-  # @private
-  AR52 = ::ActiveRecord::VERSION::STRING >= '5.2'
-
   class << self
 
     # @private Internal API

data/lib/arjdbc/mssql/adapter.rb

@@ -143,13 +143,32 @@ module ActiveRecord
       def supports_insert_on_conflict?
         false
       end
+
       alias supports_insert_on_duplicate_skip? supports_insert_on_conflict?
       alias supports_insert_on_duplicate_update? supports_insert_on_conflict?
       alias supports_insert_conflict_target? supports_insert_on_conflict?
 
+      def supports_insert_returning?
+        true
+      end
+
       def build_insert_sql(insert) # :nodoc:
         # TODO: hope we can implement an upsert like feature
-        "INSERT #{insert.into} #{insert.values_list}"
+        # "INSERT #{insert.into} #{insert.values_list}"
+        sql = +"INSERT #{insert.into}"
+
+        if returning = insert.send(:insert_all).returning
+          returning_sql = if returning.is_a?(String)
+                            returning
+                          else
+                            returning.map { |column| "INSERTED.#{quote_column_name(column)}" }.join(', ')
+                          end
+
+          sql << " OUTPUT #{returning_sql}"
+        end
+
+        sql << " #{insert.values_list}"
+        sql
       end
 
       # Overrides abstract method which always returns false
@@ -158,7 +177,7 @@ module ActiveRecord
       end
 
       def clear_cache!
-        reload_type_map
+        # reload_type_map
         super
       end
 
@@ -309,8 +328,121 @@ module ActiveRecord
         end
       end
 
+      class << self
+        private
+
+        # This method is called indirectly by the abstract method
+        # 'fetch_type_metadata' which then it is called by the java part when
+        # calculating a table's columns.
+        def initialize_type_map(map)
+          # Build the type mapping from SQL Server to ActiveRecord
+
+          # Integer types.
+          map.register_type 'int',      MSSQL::Type::Integer.new(limit: 4)
+          map.register_type 'tinyint',  MSSQL::Type::TinyInteger.new(limit: 1)
+          map.register_type 'smallint', MSSQL::Type::SmallInteger.new(limit: 2)
+          map.register_type 'bigint',   MSSQL::Type::BigInteger.new(limit: 8)
+
+          # Exact Numeric types.
+          map.register_type %r{\Adecimal}i do |sql_type|
+            scale = extract_scale(sql_type)
+            precision = extract_precision(sql_type)
+            if scale == 0
+              MSSQL::Type::DecimalWithoutScale.new(precision: precision)
+            else
+              MSSQL::Type::Decimal.new(precision: precision, scale: scale)
+            end
+          end
+          map.register_type %r{\Amoney\z}i,      MSSQL::Type::Money.new
+          map.register_type %r{\Asmallmoney\z}i, MSSQL::Type::SmallMoney.new
+
+          # Approximate Numeric types.
+          map.register_type %r{\Afloat\z}i,    MSSQL::Type::Float.new
+          map.register_type %r{\Areal\z}i,     MSSQL::Type::Real.new
+
+          # Character strings CHAR and VARCHAR (it can become Unicode UTF-8)
+          map.register_type 'varchar(max)', MSSQL::Type::VarcharMax.new
+          map.register_type %r{\Avarchar\(\d+\)} do |sql_type|
+            limit = extract_limit(sql_type)
+            MSSQL::Type::Varchar.new(limit: limit)
+          end
+          map.register_type %r{\Achar\(\d+\)} do |sql_type|
+            limit = extract_limit(sql_type)
+            MSSQL::Type::Char.new(limit: limit)
+          end
+
+          # Character strings NCHAR and NVARCHAR (by default Unicode UTF-16)
+          map.register_type %r{\Anvarchar\(\d+\)} do |sql_type|
+            limit = extract_limit(sql_type)
+            MSSQL::Type::Nvarchar.new(limit: limit)
+          end
+          map.register_type %r{\Anchar\(\d+\)} do |sql_type|
+            limit = extract_limit(sql_type)
+            MSSQL::Type::Nchar.new(limit: limit)
+          end
+          map.register_type 'nvarchar(max)', MSSQL::Type::NvarcharMax.new
+          map.register_type 'nvarchar(4000)', MSSQL::Type::Nvarchar.new
+
+          # Binary data types.
+          map.register_type              'varbinary(max)',       MSSQL::Type::VarbinaryMax.new
+          register_class_with_limit map, %r{\Abinary\(\d+\)},    MSSQL::Type::BinaryBasic
+          register_class_with_limit map, %r{\Avarbinary\(\d+\)}, MSSQL::Type::Varbinary
+
+          # Miscellaneous types, Boolean, XML, UUID
+          # FIXME The xml data needs to be reviewed and fixed
+          map.register_type 'bit',                     MSSQL::Type::Boolean.new
+          map.register_type %r{\Auniqueidentifier\z}i, MSSQL::Type::UUID.new
+          map.register_type %r{\Axml\z}i,              MSSQL::Type::XML.new
+
+          # Date and time types
+          map.register_type 'date',          MSSQL::Type::Date.new
+          map.register_type 'datetime',      MSSQL::Type::DateTime.new
+          map.register_type 'smalldatetime', MSSQL::Type::SmallDateTime.new
+          register_class_with_precision map, %r{\Atime\(\d+\)}i, MSSQL::Type::Time
+          map.register_type 'time(7)',       MSSQL::Type::Time.new
+          register_class_with_precision map, %r{\Adatetime2\(\d+\)}i, MSSQL::Type::DateTime2
+          # map.register_type 'datetime2(7)',  MSSQL::Type::DateTime2.new
+
+          # TODO: we should have identity separated from the sql_type
+          # let's say in another attribute (this will help to pass more AR tests),
+          # also we add collation attribute per column.
+          # aliases
+          map.alias_type 'int identity',    'int'
+          map.alias_type 'bigint identity', 'bigint'
+          map.alias_type 'integer',         'int'
+          map.alias_type 'integer',         'int'
+          map.alias_type 'INTEGER',         'int'
+          map.alias_type 'TINYINT',         'tinyint'
+          map.alias_type 'SMALLINT',        'smallint'
+          map.alias_type 'BIGINT',          'bigint'
+          map.alias_type %r{\Anumeric}i,    'decimal'
+          map.alias_type %r{\Anumber}i,     'decimal'
+          map.alias_type %r{\Adouble\z}i,   'float'
+          map.alias_type 'string',          'nvarchar(4000)'
+          map.alias_type %r{\Aboolean\z}i,  'bit'
+          map.alias_type 'DATE',            'date'
+          map.alias_type 'DATETIME',        'datetime'
+          map.alias_type 'SMALLDATETIME',   'smalldatetime'
+          map.alias_type %r{\Atime\z}i,     'time(7)'
+          map.alias_type %r{\Abinary\z}i,   'varbinary(max)'
+          map.alias_type %r{\Ablob\z}i,     'varbinary(max)'
+          map.alias_type %r{\Adatetime2\z}i, 'datetime2(7)'
+
+          # Deprecated SQL Server types.
+          map.register_type 'text',  MSSQL::Type::Text.new
+          map.register_type 'ntext', MSSQL::Type::Ntext.new
+          map.register_type 'image', MSSQL::Type::Image.new
+        end
+      end
+
+      TYPE_MAP = Type::TypeMap.new.tap { |m| initialize_type_map(m) }
+
       private
 
+      def type_map
+        TYPE_MAP
+      end
+
       def translate_exception(exception, message:, sql:, binds:)
         case message
         when /no connection available/i
@@ -334,109 +466,6 @@ module ActiveRecord
         end
       end
 
-      # This method is called indirectly by the abstract method
-      # 'fetch_type_metadata' which then it is called by the java part when
-      # calculating a table's columns.
-      def initialize_type_map(map = type_map)
-        # Build the type mapping from SQL Server to ActiveRecord
-
-        # Integer types.
-        map.register_type 'int',      MSSQL::Type::Integer.new(limit: 4)
-        map.register_type 'tinyint',  MSSQL::Type::TinyInteger.new(limit: 1)
-        map.register_type 'smallint', MSSQL::Type::SmallInteger.new(limit: 2)
-        map.register_type 'bigint',   MSSQL::Type::BigInteger.new(limit: 8)
-
-        # Exact Numeric types.
-        map.register_type %r{\Adecimal}i do |sql_type|
-          scale = extract_scale(sql_type)
-          precision = extract_precision(sql_type)
-          if scale == 0
-            MSSQL::Type::DecimalWithoutScale.new(precision: precision)
-          else
-            MSSQL::Type::Decimal.new(precision: precision, scale: scale)
-          end
-        end
-        map.register_type %r{\Amoney\z}i,      MSSQL::Type::Money.new
-        map.register_type %r{\Asmallmoney\z}i, MSSQL::Type::SmallMoney.new
-
-        # Approximate Numeric types.
-        map.register_type %r{\Afloat\z}i,    MSSQL::Type::Float.new
-        map.register_type %r{\Areal\z}i,     MSSQL::Type::Real.new
-
-        # Character strings CHAR and VARCHAR (it can become Unicode UTF-8)
-        map.register_type 'varchar(max)', MSSQL::Type::VarcharMax.new
-        map.register_type %r{\Avarchar\(\d+\)} do |sql_type|
-          limit = extract_limit(sql_type)
-          MSSQL::Type::Varchar.new(limit: limit)
-        end
-        map.register_type %r{\Achar\(\d+\)} do |sql_type|
-          limit = extract_limit(sql_type)
-          MSSQL::Type::Char.new(limit: limit)
-        end
-
-        # Character strings NCHAR and NVARCHAR (by default Unicode UTF-16)
-        map.register_type %r{\Anvarchar\(\d+\)} do |sql_type|
-          limit = extract_limit(sql_type)
-          MSSQL::Type::Nvarchar.new(limit: limit)
-        end
-        map.register_type %r{\Anchar\(\d+\)} do |sql_type|
-          limit = extract_limit(sql_type)
-          MSSQL::Type::Nchar.new(limit: limit)
-        end
-        map.register_type 'nvarchar(max)', MSSQL::Type::NvarcharMax.new
-        map.register_type 'nvarchar(4000)', MSSQL::Type::Nvarchar.new
-
-        # Binary data types.
-        map.register_type              'varbinary(max)',       MSSQL::Type::VarbinaryMax.new
-        register_class_with_limit map, %r{\Abinary\(\d+\)},    MSSQL::Type::BinaryBasic
-        register_class_with_limit map, %r{\Avarbinary\(\d+\)}, MSSQL::Type::Varbinary
-
-        # Miscellaneous types, Boolean, XML, UUID
-        # FIXME The xml data needs to be reviewed and fixed
-        map.register_type 'bit',                     MSSQL::Type::Boolean.new
-        map.register_type %r{\Auniqueidentifier\z}i, MSSQL::Type::UUID.new
-        map.register_type %r{\Axml\z}i,              MSSQL::Type::XML.new
-
-        # Date and time types
-        map.register_type 'date',          MSSQL::Type::Date.new
-        map.register_type 'datetime',      MSSQL::Type::DateTime.new
-        map.register_type 'smalldatetime', MSSQL::Type::SmallDateTime.new
-        register_class_with_precision map, %r{\Atime\(\d+\)}i, MSSQL::Type::Time
-        map.register_type 'time(7)',       MSSQL::Type::Time.new
-        register_class_with_precision map, %r{\Adatetime2\(\d+\)}i, MSSQL::Type::DateTime2
-        map.register_type 'datetime2(7)',  MSSQL::Type::DateTime2.new
-
-        # TODO: we should have identity separated from the sql_type
-        # let's say in another attribute (this will help to pass more AR tests),
-        # also we add collation attribute per column.
-        # aliases
-        map.alias_type 'int identity',    'int'
-        map.alias_type 'bigint identity', 'bigint'
-        map.alias_type 'integer',         'int'
-        map.alias_type 'integer',         'int'
-        map.alias_type 'INTEGER',         'int'
-        map.alias_type 'TINYINT',         'tinyint'
-        map.alias_type 'SMALLINT',        'smallint'
-        map.alias_type 'BIGINT',          'bigint'
-        map.alias_type %r{\Anumeric}i,    'decimal'
-        map.alias_type %r{\Anumber}i,     'decimal'
-        map.alias_type %r{\Adouble\z}i,   'float'
-        map.alias_type 'string',          'nvarchar(4000)'
-        map.alias_type %r{\Aboolean\z}i,  'bit'
-        map.alias_type 'DATE',            'date'
-        map.alias_type 'DATETIME',        'datetime'
-        map.alias_type 'SMALLDATETIME',   'smalldatetime'
-        map.alias_type %r{\Atime\z}i,     'time(7)'
-        map.alias_type %r{\Abinary\z}i,   'varbinary(max)'
-        map.alias_type %r{\Ablob\z}i,     'varbinary(max)'
-        map.alias_type %r{\Adatetime2\z}i, 'datetime2(7)'
-
-        # Deprecated SQL Server types.
-        map.register_type 'text',  MSSQL::Type::Text.new
-        map.register_type 'ntext', MSSQL::Type::Ntext.new
-        map.register_type 'image', MSSQL::Type::Image.new
-      end
-
       # Returns an array of Column objects for the table specified by +table_name+.
       # See the concrete implementation for details on the expected parameter values.
       # NOTE: This is ready, all implemented in the java part of adapter,

data/lib/arjdbc/mssql/quoting.rb

@@ -4,8 +4,30 @@ module ActiveRecord
   module ConnectionAdapters
     module MSSQL
       module Quoting
-        QUOTED_TRUE  = '1'.freeze
-        QUOTED_FALSE = '0'.freeze
+        QUOTED_TRUE  = '1'
+        QUOTED_FALSE = '0'
+
+        def quote(value)
+          # FIXME: this needs improvements to handle other custom types.
+          # Also check if it's possible insert integer into a NVARCHAR
+          case value
+          when ActiveRecord::Type::Binary::Data
+            "0x#{value.hex}"
+          # when SomeOtherBinaryData then BLOB_VALUE_MARKER
+          # when SomeOtherData then "yyy"
+          when String, ActiveSupport::Multibyte::Chars
+            "N'#{quote_string(value)}'"
+          # when OnlyTimeType then "'#{quoted_time(value)}'"
+          when Date, Time
+            "'#{quoted_date(value)}'"
+          when TrueClass
+            quoted_true
+          when FalseClass
+            quoted_false
+          else
+            super
+          end
+        end
 
         # Quote date/time values for use in SQL input, includes microseconds
         # with three digits only if the value is a Time responding to usec.
@@ -15,7 +37,7 @@ module ActiveRecord
             value = time_with_db_timezone(value)
           end
 
-          result = value.to_s(:db)
+          result = value.to_fs(:db)
 
           if value.respond_to?(:usec) && value.usec > 0
             "#{result}.#{sprintf("%06d", value.usec)}"
@@ -105,7 +127,7 @@ module ActiveRecord
         private
 
         def time_with_db_timezone(value)
-          zone_conv_method = if ActiveRecord::Base.default_timezone == :utc
+          zone_conv_method = if ActiveRecord.default_timezone == :utc
                                :getutc
                              else
                                :getlocal
@@ -117,29 +139,6 @@ module ActiveRecord
             value
           end
         end
-
-        # @override
-        # FIXME: it need to be improved to handle other custom types.
-        # Also check if it's possible insert integer into a NVARCHAR
-        def _quote(value)
-          case value
-          when ActiveRecord::Type::Binary::Data
-            "0x#{value.hex}"
-          # when SomeOtherBinaryData then BLOB_VALUE_MARKER
-          # when SomeOtherData then "yyy"
-          when String, ActiveSupport::Multibyte::Chars
-            "N'#{quote_string(value)}'"
-          # when OnlyTimeType then "'#{quoted_time(value)}'"
-          when Date, Time
-            "'#{quoted_date(value)}'"
-          when TrueClass
-            quoted_true
-          when FalseClass
-            quoted_false
-          else
-            super
-          end
-        end
       end
     end
   end

data/lib/arjdbc/mssql/schema_creation.rb

@@ -29,7 +29,7 @@ module ActiveRecord
             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
 
             create_sql << "(#{statements.join(', ')})" if statements.present?