activerecord-jdbc-adapter 1.3.25 → 5.0.pre1

data/lib/arjdbc/jdbc/column.rb

@@ -25,10 +25,24 @@ module ActiveRecord
             default = args.shift
           end
         end
-        default = default_value(default)
+
+        if ArJdbc::AR50
+          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))
+        elsif ArJdbc::AR42
+          default = args[0].type_cast_from_database(default)
+        else
+          default = default_value(default)
+        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

data/lib/arjdbc/jdbc/connection_methods.rb

@@ -9,7 +9,13 @@ module ArJdbc
     def jdbc_connection(config)
       adapter_class = config[:adapter_class]
       adapter_class ||= ::ActiveRecord::ConnectionAdapters::JdbcAdapter
-      adapter_class.new(nil, logger, config)
+
+      # Once all adapters converted to AR5 then this rescue can be removed
+      begin
+        adapter_class.new(nil, logger, nil, config)
+      rescue ArgumentError
+        adapter_class.new(nil, logger, config)
+      end
     end
 
     def jndi_connection(config); jdbc_connection(config) end

data/lib/arjdbc/jdbc/type_cast.rb

@@ -5,13 +5,25 @@ module ActiveRecord::ConnectionAdapters
     # Type casting methods taken from AR 4.1's Column class.
     # @private Simply to quickly "hack-in" 4.2 compatibility.
     module TypeCast
-
       TRUE_VALUES = Column::TRUE_VALUES if Column.const_defined?(:TRUE_VALUES)
-      FALSE_VALUES = Column.const_defined?(:FALSE_VALUES) ? Column::FALSE_VALUES : ActiveModel::Type::Boolean::FALSE_VALUES
+      FALSE_VALUES = if defined?(ActiveModel::Type::Boolean::FALSE_VALUES)
+        ActiveModel::Type::Boolean::FALSE_VALUES
+      else
+        Column::FALSE_VALUES
+      end
 
       #module Format
-      ISO_DATE = Column::Format::ISO_DATE
-      ISO_DATETIME = Column::Format::ISO_DATETIME
+      ISO_DATE = if defined?(ActiveModel::Type::Date::ISO_DATE)
+        ActiveModel::Type::Date::ISO_DATE
+      else
+        Column::Format::ISO_DATE
+      end
+
+      ISO_DATETIME = if defined?(ActiveModel::Type::Helpers::TimeValue::ISO_DATETIME)
+        ActiveModel::Type::Helpers::TimeValue::ISO_DATETIME
+      else
+        Column::Format::ISO_DATETIME
+      end
       #end
 
       # Used to convert from BLOBs to Strings

data/lib/arjdbc/jdbc/type_converter.rb

@@ -34,7 +34,6 @@ module ActiveRecord
         :text        => [ lambda {|r| TEXT_TYPES.include?(r['data_type'].to_i)},
                           lambda {|r| r['type_name'] =~ /^text$/i},     # For Informix
                           lambda {|r| r['type_name'] =~ /sub_type 1$/i}, # For FireBird
-                          lambda {|r| r['type_name'] =~ /^long varchar$/i}, # Legacy Sybase/SqlAnywhere
                           lambda {|r| r['type_name'] =~ /^(text|clob)$/i},
                           lambda {|r| r['type_name'] =~ /^character large object$/i},
                           lambda {|r| r['sql_data_type'] == 2005}],

data/lib/arjdbc/mssql/adapter.rb

@@ -35,7 +35,7 @@ module ArJdbc
     require 'arjdbc/mssql/column'
     require 'arjdbc/mssql/explain_support'
     require 'arjdbc/mssql/types' if AR42
-    require 'arjdbc/mssql/attributes_for_update'
+    require 'arel/visitors/sql_server'
 
     include LimitHelpers
     include Utils
@@ -102,24 +102,6 @@ module ArJdbc
     # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#jdbc_column_class
     def jdbc_column_class; ::ActiveRecord::ConnectionAdapters::MSSQLColumn end
 
-    # @see ActiveRecord::ConnectionAdapters::Jdbc::ArelSupport
-    def self.arel_visitor_type(config)
-      require 'arel/visitors/sql_server'
-      ( config && config[:sqlserver_version].to_s == '2000' ) ?
-        ::Arel::Visitors::SQLServer2000 : ::Arel::Visitors::SQLServer
-    end
-
-    def self.arel_visitor_type(config)
-      require 'arel/visitors/sql_server'; ::Arel::Visitors::SQLServerNG
-    end if AR42
-
-    # @deprecated no longer used
-    # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#arel2_visitors
-    def self.arel2_visitors(config)
-      visitor = arel_visitor_type(config)
-      { 'mssql' => visitor, 'jdbcmssql' => visitor, 'sqlserver' => visitor }
-    end
-
     def configure_connection
       use_database # config[:database]
     end
@@ -575,7 +557,7 @@ module ArJdbc
     def remove_check_constraints(table_name, column_name)
       clear_cached_table(table_name)
       constraints = select_values "SELECT constraint_name" <<
-        " FROM INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE" <<
+        " FROM information_schema.constraint_column_usage" <<
         " WHERE table_name = '#{table_name}' AND column_name = '#{column_name}'"
       constraints.each do |constraint_name|
         execute "ALTER TABLE #{table_name} DROP CONSTRAINT #{constraint_name}"
@@ -656,7 +638,7 @@ module ArJdbc
       unless primary_column # look for an id column and return it,
         # without changing case, to cover DBs with a case-sensitive collation :
         primary_column = columns.find { |column| column.name =~ /^id$/i }
-        raise "no columns for table: #{table_name}" if columns.empty?
+        raise "no columns for table: #{table_name} (SQL query: ' #{sql} ')" if columns.empty?
       end
       # NOTE: if still no PK column simply get something for ORDER BY ...
       "#{quote_table_name(table_name)}.#{quote_column_name((primary_column || columns.first).name)}"
@@ -808,6 +790,12 @@ module ActiveRecord::ConnectionAdapters
       setup_limit_offset!
     end
 
+    def arel_visitor # :nodoc:
+      ( config && config[:sqlserver_version].to_s == '2000' ) ?
+          ::Arel::Visitors::SQLServer2000.new(self) :
+          ::Arel::Visitors::SQLServer.new(self)
+    end
+
     def self.cs_equality_operator; ::ArJdbc::MSSQL.cs_equality_operator end
     def self.cs_equality_operator=(operator); ::ArJdbc::MSSQL.cs_equality_operator = operator end
 

data/lib/arjdbc/mysql/adapter.rb

@@ -28,7 +28,12 @@ module ArJdbc
     # @private
     def init_connection(jdbc_connection)
       meta = jdbc_connection.meta_data
-      if meta.driver_major_version == 5 && meta.driver_minor_version < 1
+      if meta.driver_major_version == 1 # TODO check in driver code
+        # assumes MariaDB 1.x currently
+      elsif meta.driver_major_version < 5
+        raise ::ActiveRecord::ConnectionNotEstablished,
+          "MySQL adapter requires driver >= 5.0 got: '#{meta.driver_version}'"
+      elsif meta.driver_major_version == 5 && meta.driver_minor_version < 1
         config[:connection_alive_sql] ||= 'SELECT 1' # need 5.1 for JDBC 4.0
       else
         # NOTE: since the loaded Java driver class can't change :
@@ -44,7 +49,7 @@ module ArJdbc
       # Increase timeout so the server doesn't disconnect us.
       wait_timeout = config[:wait_timeout]
       wait_timeout = self.class.type_cast_config_to_integer(wait_timeout)
-      variables[:wait_timeout] = wait_timeout.is_a?(Integer) ? wait_timeout : 2147483
+      variables[:wait_timeout] = wait_timeout.is_a?(Fixnum) ? wait_timeout : 2147483
 
       # Make MySQL reject illegal values rather than truncating or blanking them, see
       # http://dev.mysql.com/doc/refman/5.0/en/server-sql-mode.html#sqlmode_strict_all_tables
@@ -52,15 +57,11 @@ module ArJdbc
       if strict_mode? && ! variables.has_key?(:sql_mode)
         variables[:sql_mode] = 'STRICT_ALL_TABLES' # SET SQL_MODE='STRICT_ALL_TABLES'
       end
-      
+
       # NAMES does not have an equals sign, see
       # http://dev.mysql.com/doc/refman/5.0/en/set-statement.html#id944430
       # (trailing comma because variable_assignments will always have content)
-      if @config[:encoding]
-        encoding = "NAMES #{@config[:encoding]}"
-        encoding << " COLLATE #{@config[:collation]}" if @config[:collation]
-        encoding << ", "
-      end
+      encoding = "NAMES #{config[:encoding]}, " if config[:encoding]
 
       # Gather up all of the SET variables...
       variable_assignments = variables.map do |k, v|
@@ -132,16 +133,6 @@ module ArJdbc
       ADAPTER_NAME
     end
 
-    def self.arel_visitor_type(config = nil)
-      ::Arel::Visitors::MySQL
-    end
-
-    # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#bind_substitution
-    # @private
-    class BindSubstitution < Arel::Visitors::MySQL
-      include Arel::Visitors::BindVisitor
-    end if defined? Arel::Visitors::BindVisitor
-
     def case_sensitive_equality_operator
       "= BINARY"
     end
@@ -849,7 +840,7 @@ module ArJdbc
       case length
       when Hash
         column_names.map { |name| length[name] ? "#{quote_column_name(name)}(#{length[name]})" : quote_column_name(name) }
-      when Integer
+      when Fixnum
         column_names.map { |name| "#{quote_column_name(name)}(#{length})" }
       else
         column_names.map { |name| quote_column_name(name) }
@@ -953,6 +944,10 @@ module ActiveRecord
       include ::ArJdbc::MySQL
       include ::ArJdbc::MySQL::ExplainSupport
 
+      def arel_visitor # :nodoc:
+        Arel::Visitors::MySQL.new(self)
+      end
+
       # By default, the MysqlAdapter will consider all columns of type
       # __tinyint(1)__ as boolean. If you wish to disable this :
       # ```

data/lib/arjdbc/mysql/connection_methods.rb

@@ -63,11 +63,9 @@ ArJdbc::ConnectionMethods.module_eval do
           properties['verifyServerCertificate'] ||= false if mysql_driver
         end
       end
-      properties['verifyServerCertificate'] ||= false if mariadb_driver
-    else
-      # According to MySQL 5.5.45+, 5.6.26+ and 5.7.6+ requirements SSL connection
-      # must be established by default if explicit option isn't set :
-      properties[mariadb_driver ? 'useSsl' : 'useSSL'] ||= false
+      if mariadb_driver
+        properties['verifyServerCertificate'] ||= false
+      end
     end
     if socket = config[:socket]
       properties['localSocket'] ||= socket if mariadb_driver

data/lib/arjdbc/oracle/adapter.rb

@@ -57,25 +57,6 @@ module ArJdbc
     # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#jdbc_column_class
     def jdbc_column_class; ::ActiveRecord::ConnectionAdapters::OracleColumn end
 
-    def configure_connection # mostly oracle-enhanced config compatibility
-      jdbc_connection = nil
-      if time_zone = config[:time_zone] # || ENV['TZ']
-        jdbc_connection ||= jdbc_connection(true)
-        jdbc_connection.setSessionTimeZone(time_zone)
-      end
-
-      cursor_sharing = config[:cursor_sharing] # || 'force'
-      execute "ALTER SESSION SET cursor_sharing = #{cursor_sharing}" if cursor_sharing
-
-      schema = config[:schema] && config[:schema].to_s
-      if schema.blank? # default schema owner
-        # @owner = username.upcase unless username.nil?
-      else
-        self.current_schema = schema
-        # @owner = schema
-      end
-    end
-
     # @private
     @@update_lob_values = true
 
@@ -142,16 +123,6 @@ module ArJdbc
       TableDefinition.new native_database_types, name, temporary, options, as
     end if AR42
 
-    def self.arel_visitor_type(config = nil)
-      ::Arel::Visitors::Oracle
-    end
-
-    # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#bind_substitution
-    # @private
-    class BindSubstitution < ::Arel::Visitors::Oracle
-      include ::Arel::Visitors::BindVisitor
-    end if defined? ::Arel::Visitors::BindVisitor
-
     ADAPTER_NAME = 'Oracle'.freeze
 
     def adapter_name
@@ -921,13 +892,9 @@ module ArJdbc
     # default schema owner
     def schema_owner(force = true)
       unless defined? @schema_owner
-        if !config[:schema].nil?
-          @schema_owner = config[:schema].upcase
-        else
-          username = config[:username] ? config[:username].to_s : nil
-          username = jdbc_connection.meta_data.user_name if force && username.nil?
-          @schema_owner = username.nil? ? nil : username.upcase
-        end
+        username = config[:username] ? config[:username].to_s : nil
+        username = jdbc_connection.meta_data.user_name if force && username.nil?
+        @schema_owner = username.nil? ? nil : username.upcase
       end
       @schema_owner
     end
@@ -966,11 +933,10 @@ module ActiveRecord::ConnectionAdapters
 
     def initialize(*args)
       ::ArJdbc::Oracle.initialize!
+      super # configure_connection happens in super
 
       @use_insert_returning = config.key?(:insert_returning) ?
         self.class.type_cast_config_to_boolean(config[:insert_returning]) : nil
-
-      super # configure_connection happens in super
     end
 
   end

data/lib/arjdbc/oracle/connection_methods.rb

@@ -15,10 +15,6 @@ ArJdbc::ConnectionMethods.module_eval do
     unless config.key?(:statement_escape_processing)
       config[:statement_escape_processing] = true
     end
-    properties = ( config[:properties] ||= {} )
-    if prefetch_rows = config[:prefetch_rows] # || 100 (oracle-enhanced)
-      properties['defaultRowPrefetch'] = prefetch_rows
-    end
     jdbc_connection(config)
   end
   alias_method :jdbcoracle_connection, :oracle_connection

data/lib/arjdbc/postgresql/adapter.rb

@@ -17,6 +17,7 @@ module ArJdbc
     require 'arjdbc/postgresql/column'
     require 'arjdbc/postgresql/explain_support'
     require 'arjdbc/postgresql/schema_creation' # AR 4.x
+    require 'arel/visitors/postgresql_jdbc'
     # @private
     IndexDefinition = ::ActiveRecord::ConnectionAdapters::IndexDefinition
 
@@ -45,18 +46,6 @@ module ArJdbc
       end
     end
 
-    # @see ActiveRecord::ConnectionAdapters::Jdbc::ArelSupport
-    def self.arel_visitor_type(config = nil)
-      require 'arel/visitors/postgresql_jdbc'
-      ::Arel::Visitors::PostgreSQL
-    end
-
-    # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#bind_substitution
-    # @private
-    class BindSubstitution < ::Arel::Visitors::PostgreSQL
-      include ::Arel::Visitors::BindVisitor
-    end if defined? ::Arel::Visitors::BindVisitor
-
     ADAPTER_NAME = 'PostgreSQL'.freeze
 
     def adapter_name
@@ -67,7 +56,7 @@ module ArJdbc
       @postgresql_version ||=
         begin
           version = select_version
-          if version =~ /PostgreSQL (\d+)\.(\d+)(?:\.(\d+))?/
+          if version =~ /PostgreSQL (\d+)\.(\d+)\.(\d+)/
             ($1.to_i * 10000) + ($2.to_i * 100) + $3.to_i
           else
             0
@@ -165,7 +154,7 @@ module ArJdbc
           when 1, 2; 'smallint'
           when 3, 4; 'integer'
           when 5..8; 'bigint'
-          else raise(ActiveRecordError, "No integer type has byte size #{limit}. Use a numeric with scale 0 instead.")
+          else raise(ActiveRecordError, "No integer type has byte size #{limit}. Use a numeric with precision 0 instead.")
         end
       when 'datetime'
         return super unless precision
@@ -286,8 +275,7 @@ module ArJdbc
       :bigserial => "bigserial",
       :bigint => { :name => "bigint" },
       :bit => { :name => "bit" },
-      :bit_varying => { :name => "bit varying" },
-      :citext => { :name => "citext" }
+      :bit_varying => { :name => "bit varying" }
     ) if AR42
 
     def native_database_types
@@ -388,6 +376,12 @@ module ArJdbc
 
     # @override
     def supports_views?; true end
+      
+    if ArJdbc::AR50
+      def views
+        select_values("SELECT table_name FROM INFORMATION_SCHEMA.views WHERE table_schema = ANY (current_schemas(false))")
+      end
+    end
 
     # NOTE: handled by JdbcAdapter we override only to have save-point in logs :
 
@@ -571,8 +565,7 @@ module ArJdbc
       end
 
       if pk && use_insert_returning?
-        returning = Array(pk).map(&method(:quote_table_name)).join(', ')
-        sql = "#{sql} RETURNING (#{returning})"
+        sql = "#{sql} RETURNING #{quote_column_name(pk)}"
       end
 
       [ sql, binds ]
@@ -590,7 +583,7 @@ module ArJdbc
         exec_query(sql, name, binds) # due RETURNING clause returns a result set
       else
         result = super
-        if pk && use_insert_returning?
+        if pk
           unless sequence_name
             table_ref = extract_table_ref_from_insert_sql(sql)
             sequence_name = default_sequence_name(table_ref, pk)
@@ -688,8 +681,7 @@ module ArJdbc
       return result if result.is_a? Integer
       # <ActiveRecord::Result @hash_rows=nil, @columns=["id"], @rows=[[3]]>
       # but it will work with [{ 'id' => 1 }] Hash wrapped results as well
-      row = result.first
-      row && row.first[1] # .first = { "id"=>1 } .first = [ "id", 1 ]
+      result.first.first[1] # .first = { "id"=>1 } .first = [ "id", 1 ]
     end
 
     def last_insert_id(table, sequence_name = nil)
@@ -1021,7 +1013,7 @@ module ArJdbc
     # @override
     def quoted_date(value)
       result = super
-      if value.acts_like?(:time) && value.respond_to?(:usec)
+      if value.acts_like?(:time) && value.respond_to?(:usec) && !AR50
         result = "#{result}.#{sprintf("%06d", value.usec)}"
       end
       result = "#{result.sub(/^-/, '')} BC" if value.year < 0
@@ -1522,6 +1514,10 @@ module ActiveRecord::ConnectionAdapters
         self.class.type_cast_config_to_boolean(@config[:insert_returning]) : nil
     end
 
+    def arel_visitor # :nodoc:
+      Arel::Visitors::PostgreSQL.new(self)
+    end
+
     if ::ArJdbc::AR42
       require 'active_record/connection_adapters/postgresql/schema_definitions'
     else

data/lib/arjdbc/postgresql/connection_methods.rb

@@ -31,16 +31,13 @@ ArJdbc::ConnectionMethods.module_eval do
     end
     sslmode = config.key?(:sslmode) ? config[:sslmode] : config[:requiressl]
     # NOTE: makes not much sense since this needs some JVM options :
-    sslmode = ENV['PGSSLMODE'] || ENV['PGREQUIRESSL'] if sslmode.nil?
+    # sslmode = ENV['PGSSLMODE'] || ENV['PGREQUIRESSL'] if sslmode.nil?
     unless sslmode.nil? # PG :sslmode - disable|allow|prefer|require
       # JRuby/JVM needs to be started with :
       #  -Djavax.net.ssl.trustStore=mystore -Djavax.net.ssl.trustStorePassword=...
       # or a non-validating connection might be used (for testing) :
       #  :sslfactory = 'org.postgresql.ssl.NonValidatingFactory'
-      if sslmode == true || sslmode.to_s == 'require'
-        properties['sslfactory'] ||= 'org.postgresql.ssl.NonValidatingFactory' 
-        properties['ssl'] ||= 'true' 
-      end
+      properties['ssl'] ||= 'true' if sslmode == true || sslmode.to_s == 'require'
     end
     properties['tcpKeepAlive'] ||= config[:keepalives] if config.key?(:keepalives)
     properties['kerberosServerName'] ||= config[:krbsrvname] if config[:krbsrvname]