activerecord-jdbc-adapter 1.3.7 → 1.3.8

data/lib/arjdbc/mssql/column.rb

@@ -50,15 +50,15 @@ module ArJdbc
       def type_cast(value)
         return nil if value.nil?
         case type
-        when :integer then value.delete('()').to_i rescue unquote(value).to_i rescue value ? 1 : 0
-        when :primary_key then value == true || value == false ? value == true ? 1 : 0 : value.to_i
+        when :integer then ( value.is_a?(String) ? unquote(value) : (value || 0) ).to_i
+        when :primary_key then value.respond_to?(:to_i) ? value.to_i : ((value && 1) || 0)
         when :decimal   then self.class.value_to_decimal(unquote(value))
         when :date      then self.class.string_to_date(value)
         when :datetime  then self.class.string_to_time(value)
         when :timestamp then self.class.string_to_time(value)
         when :time      then self.class.string_to_dummy_time(value)
         when :boolean   then value == true || (value =~ /^t(rue)?$/i) == 0 || unquote(value) == '1'
-        when :binary    then unquote value
+        when :binary    then unquote(value)
         else value
         end
       end
@@ -156,7 +156,7 @@ module ArJdbc
             super(value)
           end
         end
-        
+
         def string_to_binary(value)
           # this will only allow the adapter to insert binary data with a length
           # of 7K or less because of a SQL Server statement length policy ...

data/lib/arjdbc/mysql/adapter.rb

@@ -19,7 +19,9 @@ module ArJdbc
     # @private
     def init_connection(jdbc_connection)
       meta = jdbc_connection.meta_data
-      if meta.driver_major_version < 5
+      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
@@ -328,11 +330,19 @@ module ArJdbc
     # @override
     def columns(table_name, name = nil)
       sql = "SHOW FULL COLUMNS FROM #{quote_table_name(table_name)}"
-      column = ::ActiveRecord::ConnectionAdapters::MysqlAdapter::Column
       columns = execute(sql, name || 'SCHEMA')
+      strict = strict_mode?
+      column = jdbc_column_class
+      pass_cast_type = respond_to?(:lookup_cast_type)
       columns.map! do |field|
-        column.new(field['Field'], field['Default'], field['Type'],
-          field['Null'] == "YES", field['Collation'], field['Extra'])
+        sql_type = field['Type']
+        null = field['Null'] == "YES"
+        if pass_cast_type
+          cast_type = lookup_cast_type(sql_type)
+          column.new(field['Field'], field['Default'], cast_type, sql_type, null, field['Collation'], strict, field['Extra'])
+        else
+          column.new(field['Field'], field['Default'], sql_type, null, field['Collation'], strict, field['Extra'])
+        end
       end
       columns
     end
@@ -576,14 +586,20 @@ module ArJdbc
       return @version ||= begin
         version = []
         java_connection = jdbc_connection(true)
-        if java_connection.is_a?(Java::ComMysqlJdbc::ConnectionImpl)
+        if java_connection.java_class.name == 'com.mysql.jdbc.ConnectionImpl'
           version << jdbc_connection.serverMajorVersion
           version << jdbc_connection.serverMinorVersion
           version << jdbc_connection.serverSubMinorVersion
         else
-          warn "INFO: failed to resolve MySQL server version using: #{java_connection}"
+          result = execute 'SELECT VERSION()', 'SCHEMA'
+          result = result.first.values.first # [{"VERSION()"=>"5.5.37-0ubuntu..."}]
+          if match = result.match(/^(\d)\.(\d+)\.(\d+)/)
+            version << match[1].to_i
+            version << match[2].to_i
+            version << match[3].to_i
+          end
         end
-        version
+        version.freeze
       end
     end
 
@@ -611,15 +627,26 @@ module ActiveRecord
       class Column < JdbcColumn
         include ::ArJdbc::MySQL::Column
 
-        def initialize(name, default, sql_type = nil, null = true, collation = nil, strict = false, extra = "")
+        def initialize(name, default, sql_type = nil, null = true, collation = nil, strict = false, extra = '')
           if Hash === name
             super # first arg: config
           else
             @strict = strict; @collation = collation; @extra = extra
             super(name, default, sql_type, null)
+            # base 4.1: (name, default, sql_type = nil, null = true)
           end
         end
 
+        def initialize(name, default, cast_type, sql_type = nil, null = true, collation = nil, strict = false, extra = '')
+          if Hash === name
+            super # first arg: config
+          else
+            @strict = strict; @collation = collation; @extra = extra
+            super(name, default, cast_type, sql_type, null)
+            # base 4.2: (name, default, cast_type, sql_type = nil, null = true)
+          end
+        end if ActiveRecord::VERSION::STRING >= '4.2'
+
         # @note {#ArJdbc::MySQL::Column} uses this to check for boolean emulation
         def adapter
           MysqlAdapter
@@ -628,8 +655,7 @@ module ActiveRecord
       end
 
       def initialize(*args)
-        super
-        # configure_connection happens in super
+        super # configure_connection happens in super
       end
 
       def jdbc_connection_class(spec)

data/lib/arjdbc/mysql/column.rb

@@ -13,12 +13,9 @@ module ArJdbc
       attr_reader :collation, :strict, :extra
 
       def extract_default(default)
-        if sql_type =~ /blob/i || type == :text
-          if default.blank?
-            return null ? nil : ''
-          else
-            raise ArgumentError, "#{type} columns cannot have a default value: #{default.inspect}"
-          end
+        if blob_or_text_column?
+          return null || strict ? nil : '' if default.blank?
+          raise ArgumentError, "#{type} columns cannot have a default value: #{default.inspect}"
         elsif missing_default_forged_as_empty_string?(default)
           nil
         else
@@ -27,10 +24,18 @@ module ArJdbc
       end
 
       def has_default?
-        return false if sql_type =~ /blob/i || type == :text #mysql forbids defaults on blob and text columns
+        return false if blob_or_text_column? #mysql forbids defaults on blob and text columns
         super
       end
 
+      def blob_or_text_column?
+        sql_type.index('blob') || type == :text
+      end
+
+      def case_sensitive?
+        collation && !collation.match(/_ci$/)
+      end
+
       def simplified_type(field_type)
         if adapter && adapter.emulate_booleans?
           return :boolean if field_type.downcase.index('tinyint(1)')

data/lib/arjdbc/mysql/connection_methods.rb

@@ -5,11 +5,14 @@ ArJdbc::ConnectionMethods.module_eval do
 
     return jndi_connection(config) if jndi_config?(config)
 
+    driver = config[:driver] ||=
+      defined?(::Jdbc::MySQL.driver_name) ? ::Jdbc::MySQL.driver_name : 'com.mysql.jdbc.Driver'
+
     begin
       require 'jdbc/mysql'
       ::Jdbc::MySQL.load_driver(:require) if defined?(::Jdbc::MySQL.load_driver)
     rescue LoadError # assuming driver.jar is on the class-path
-    end
+    end if mysql_driver = driver[0, 10] == 'com.mysql.'
 
     config[:username] = 'root' unless config.key?(:username)
     # jdbc:mysql://[host][,failoverhost...][:port]/[database]
@@ -23,37 +26,66 @@ ArJdbc::ConnectionMethods.module_eval do
       url << "/#{config[:database]}"
       config[:url] = url
     end
-    config[:driver] ||= defined?(::Jdbc::MySQL.driver_name) ? ::Jdbc::MySQL.driver_name : 'com.mysql.jdbc.Driver'
+
+    mariadb_driver = ! mysql_driver && driver[0, 12] == 'org.mariadb.' # org.mariadb.jdbc.Driver
 
     properties = ( config[:properties] ||= {} )
-    properties['zeroDateTimeBehavior'] ||= 'convertToNull'
-    properties['jdbcCompliantTruncation'] ||= 'false'
-    properties['useUnicode'] = 'true' unless properties.key?('useUnicode') # otherwise platform default
-    encoding = config.key?(:encoding) ? config[:encoding] : 'utf8'
-    properties['characterEncoding'] = encoding if encoding
-    if ! ( reconnect = config[:reconnect] ).nil?
-      properties['autoReconnect'] ||= reconnect.to_s
-      # properties['maxReconnects'] ||= '3'
-      # with reconnect fail-over sets connection read-only (by default)
-      # properties['failOverReadOnly'] ||= 'false'
+    if mysql_driver
+      properties['zeroDateTimeBehavior'] ||= 'convertToNull'
+      properties['jdbcCompliantTruncation'] ||= 'false'
+      properties['useUnicode'] = 'true' unless properties.key?('useUnicode') # otherwise platform default
+      encoding = config.key?(:encoding) ? config[:encoding] : 'utf8'
+      properties['characterEncoding'] = encoding if encoding
+      if ! ( reconnect = config[:reconnect] ).nil?
+        properties['autoReconnect'] ||= reconnect.to_s
+        # properties['maxReconnects'] ||= '3'
+        # with reconnect fail-over sets connection read-only (by default)
+        # properties['failOverReadOnly'] ||= 'false'
+      end
     end
     if config[:sslkey] || sslcert = config[:sslcert] # || config[:use_ssl]
-      properties['useSSL'] ||= true
-      properties['requireSSL'] ||= true
-      properties['clientCertificateKeyStoreUrl'] ||= begin
-        java.io.File.new(sslcert).to_url.to_s
-      end if sslcert
-      if sslca = config[:sslca]
-        properties['trustCertificateKeyStoreUrl'] ||= begin
-          java.io.File.new(sslca).to_url.to_s
+      properties['useSSL'] ||= true # supported by MariaDB as well
+      if mysql_driver
+        properties['requireSSL'] ||= true if mysql_driver
+        properties['clientCertificateKeyStoreUrl'] ||= begin
+          java.io.File.new(sslcert).to_url.to_s
+        end if sslcert
+        if sslca = config[:sslca]
+          properties['trustCertificateKeyStoreUrl'] ||= begin
+            java.io.File.new(sslca).to_url.to_s
+          end
+        else
+          properties['verifyServerCertificate'] ||= false if mysql_driver
         end
-      else
+      end
+      if mariadb_driver
         properties['verifyServerCertificate'] ||= false
       end
     end
+    if socket = config[:socket]
+      properties['localSocket'] ||= socket if mariadb_driver
+    end
 
     jdbc_connection(config)
   end
   alias_method :jdbcmysql_connection, :mysql_connection
   alias_method :mysql2_connection, :mysql_connection
+
+  def mariadb_connection(config)
+    config[:adapter_spec] ||= ::ArJdbc::MySQL
+    config[:adapter_class] = ActiveRecord::ConnectionAdapters::MysqlAdapter unless config.key?(:adapter_class)
+
+    return jndi_connection(config) if jndi_config?(config)
+
+    begin
+      require 'jdbc/mariadb'
+      ::Jdbc::MariaDB.load_driver(:require) if defined?(::Jdbc::MariaDB.load_driver)
+    rescue LoadError # assuming driver.jar is on the class-path
+    end
+
+    config[:driver] ||= 'org.mariadb.jdbc.Driver'
+
+    mysql_connection(config)
+  end
+  alias_method :jdbcmariadb_connection, :mariadb_connection
 end

data/lib/arjdbc/oracle/adapter.rb

@@ -544,9 +544,11 @@ module ArJdbc
       end
 
       if pk && use_insert_returning? # true by default on AR <= 3.0
-        sql = "#{sql} RETURNING #{quote_column_name(pk)}"
+        sql = "#{sql} RETURNING #{quote_column_name(pk)} INTO ?"
+        exec_insert_returning(sql, name, nil, pk)
+      else
+        execute(sql, name)
       end
-      execute(sql, name)
     end
     protected :insert_sql
 
@@ -554,7 +556,7 @@ module ArJdbc
     def sql_for_insert(sql, pk, id_value, sequence_name, binds)
       unless id_value || pk.nil?
         if pk && use_insert_returning?
-          sql = "#{sql} RETURNING #{quote_column_name(pk)}"
+          sql = "#{sql} RETURNING #{quote_column_name(pk)} INTO ?"
         end
       end
       [ sql, binds ]
@@ -577,11 +579,22 @@ module ArJdbc
     # @override
     def exec_insert(sql, name, binds, pk = nil, sequence_name = nil)
       if pk && use_insert_returning?
-        exec_query(sql, name, binds) # due RETURNING clause
+        if sql.is_a?(String) && sql.index('RETURNING')
+          return exec_insert_returning(sql, name, binds, pk)
+        end
+      end
+      super(sql, name, binds) # assume no generated id for table
+    end
+
+    def exec_insert_returning(sql, name, binds, pk = nil)
+      sql = to_sql(sql, binds) if sql.respond_to?(:to_sql)
+      if prepared_statements?
+        log(sql, name, binds) { @connection.execute_insert_returning(sql, binds) }
       else
-        super(sql, name, binds) # assume no generated id for table
+        log(sql, name) { @connection.execute_insert_returning(sql, nil) }
       end
     end
+    # private :exec_insert_returning
 
     def next_id_value(sql, sequence_name = nil)
       # Assume the SQL contains a bind-variable for the ID
@@ -670,6 +683,10 @@ module ActiveRecord::ConnectionAdapters
 
   class OracleColumn < JdbcColumn
     include ::ArJdbc::Oracle::Column
+
+    # def returning_id?; @returning_id ||= nil end
+    # def returning_id!; @returning_id = true end
+
   end
 
 end

data/lib/arjdbc/postgresql/adapter.rb

@@ -158,6 +158,9 @@ module ArJdbc
         when 'point'
           column_class = ::ActiveRecord::ConnectionAdapters::PostgreSQLColumn
           column_class.point_to_string(value)
+        when 'json'
+          column_class = ::ActiveRecord::ConnectionAdapters::PostgreSQLColumn
+          column_class.json_to_string(value)
         else
           return super(value, column) unless column.array?
           column_class = ::ActiveRecord::ConnectionAdapters::PostgreSQLColumn
@@ -822,10 +825,8 @@ module ArJdbc
       when String
         return "E'#{escape_bytea(value)}'::bytea" if column.type == :binary
         return "xml '#{quote_string(value)}'" if column.type == :xml
-        if column.respond_to?(:sql_type) && column.sql_type[0, 3] == 'bit'
-          quote_bit(value)
-        else super
-        end
+        sql_type = column.respond_to?(:sql_type) && column.sql_type
+        sql_type && sql_type[0, 3] == 'bit' ? quote_bit(value) : super
       when Array
         if AR4_COMPAT && column.array? # will be always falsy in AR < 4.0
           column_class = ::ActiveRecord::ConnectionAdapters::PostgreSQLColumn
@@ -833,6 +834,9 @@ module ArJdbc
         elsif column.type == :json # only in AR-4.0
           column_class = ::ActiveRecord::ConnectionAdapters::PostgreSQLColumn
           super(column_class.json_to_string(value), column)
+        elsif column.type == :point # only in AR-4.0
+          column_class = ::ActiveRecord::ConnectionAdapters::PostgreSQLColumn
+          super(column_class.point_to_string(value), column)
         else super
         end
       when Hash
@@ -891,14 +895,13 @@ module ArJdbc
     end if PostgreSQL::AR4_COMPAT
 
     def escape_bytea(string)
-      if string
-        if supports_hex_escaped_bytea?
-          "\\\\x#{string.unpack("H*")[0]}"
-        else
-          result = ''
-          string.each_byte { |c| result << sprintf('\\\\%03o', c) }
-          result
-        end
+      return unless string
+      if supports_hex_escaped_bytea?
+        "\\\\x#{string.unpack("H*")[0]}"
+      else
+        result = ''
+        string.each_byte { |c| result << sprintf('\\\\%03o', c) }
+        result
       end
     end
 
@@ -917,13 +920,23 @@ module ArJdbc
     # @override
     def quote_table_name_for_assignment(table, attr)
       quote_column_name(attr)
-    end if ::ActiveRecord::VERSION::MAJOR > 3
+    end if ::ActiveRecord::VERSION::MAJOR >= 4
 
     # @override
     def quote_column_name(name)
       %("#{name.to_s.gsub("\"", "\"\"")}")
     end
 
+    # @private
+    def quote_default_value(value, column)
+      # Do not quote function default values for UUID columns
+      if column.type == :uuid && value =~ /\(\)/
+        value
+      else
+        quote(value, column)
+      end
+    end
+
     # Quote date/time values for use in SQL input.
     # Includes microseconds if the value is a Time responding to `usec`.
     # @override
@@ -1017,12 +1030,20 @@ module ArJdbc
 
     # Changes the default value of a table column.
     def change_column_default(table_name, column_name, default)
-      execute "ALTER TABLE #{quote_table_name(table_name)} ALTER COLUMN #{quote_column_name(column_name)} SET DEFAULT #{quote(default)}"
+      if column = column_for(table_name, column_name) # (backwards) compatible with AR 3.x - 4.x
+        execute "ALTER TABLE #{quote_table_name(table_name)} ALTER COLUMN #{quote_column_name(column_name)} SET DEFAULT #{quote_default_value(default, column)}"
+      else
+        execute "ALTER TABLE #{quote_table_name(table_name)} ALTER COLUMN #{quote_column_name(column_name)} SET DEFAULT #{quote(default)}"
+      end
     end # unless const_defined? :SchemaCreation
 
     def change_column_null(table_name, column_name, null, default = nil)
       unless null || default.nil?
-        execute("UPDATE #{quote_table_name(table_name)} SET #{quote_column_name(column_name)}=#{quote(default)} WHERE #{quote_column_name(column_name)} IS NULL")
+        if column = column_for(table_name, column_name) # (backwards) compatible with AR 3.x - 4.x
+          execute "UPDATE #{quote_table_name(table_name)} SET #{quote_column_name(column_name)}=#{quote_default_value(default, column)} WHERE #{quote_column_name(column_name)} IS NULL"
+        else
+          execute "UPDATE #{quote_table_name(table_name)} SET #{quote_column_name(column_name)}=#{quote(default)} WHERE #{quote_column_name(column_name)} IS NULL"
+        end
       end
       execute("ALTER TABLE #{quote_table_name(table_name)} ALTER #{quote_column_name(column_name)} #{null ? 'DROP' : 'SET'} NOT NULL")
     end # unless const_defined? :SchemaCreation
@@ -1061,10 +1082,15 @@ module ArJdbc
         elsif default =~ /^\(([-+]?[\d\.]+)\)$/ # e.g. "(-1)" for a negative default
           default = $1
         end
-        klass.new(name, default, oid, type, ! notnull)
+        klass.new(name, default, oid, type, ! notnull, fmod, self)
       end
     end
 
+    # @private
+    def column_for(table_name, column_name)
+      columns(table_name).detect { |c| c.name == column_name.to_s }
+    end
+
     # Returns the list of a table's column names, data types, and default values.
     #
     # If the table name is not prefixed with a schema, the database will
@@ -1237,8 +1263,12 @@ module ActiveRecord::ConnectionAdapters
   class PostgreSQLColumn < JdbcColumn
     include ::ArJdbc::PostgreSQL::Column
 
-    def initialize(name, default, oid_type = nil, sql_type = nil, null = true)
-      if oid_type.is_a?(Integer) then @oid_type = oid_type
+    def initialize(name, default, oid_type = nil, sql_type = nil, null = true,
+        fmod = nil, adapter = nil) # added due resolving #oid_type
+      if oid_type.is_a?(Integer) # the "main" if branch (on AR 4.x)
+        @oid = oid_type; @fmod = fmod; @adapter = adapter # see Column#oid_type
+      elsif oid_type.respond_to?(:type_cast) # MRI compatibility
+        @oid_type = oid_type; # @fmod = fmod; @adapter = adapter
       else # NOTE: AR <= 3.2 : (name, default, sql_type = nil, null = true)
         null, sql_type, oid_type = !! sql_type, oid_type, nil
       end
@@ -1261,11 +1291,17 @@ module ActiveRecord::ConnectionAdapters
 
   end
 
+  # NOTE: seems needed on 4.x due loading of '.../postgresql/oid' which
+  # assumes: class PostgreSQLAdapter < AbstractAdapter
   remove_const(:PostgreSQLAdapter) if const_defined?(:PostgreSQLAdapter)
 
   class PostgreSQLAdapter < JdbcAdapter
     include ::ArJdbc::PostgreSQL
     include ::ArJdbc::PostgreSQL::ExplainSupport
+
+    require 'arjdbc/postgresql/oid_types' if ::ArJdbc::PostgreSQL::AR4_COMPAT
+    include ::ArJdbc::PostgreSQL::OIDTypes if ::ArJdbc::PostgreSQL.const_defined?(:OIDTypes)
+
     include ::ArJdbc::Util::QuotedCache
 
     def initialize(*args)