activerecord-jdbc-adapter 1.3.11 → 1.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f03faf8d22c162a753fa8ec38946245c02349313
-  data.tar.gz: 30303e6bb6a9a6ce48d40bf9d3ff82e9284a28ba
+  metadata.gz: 2e7fd59bd6f8be3d2d0da36e413324eea6539846
+  data.tar.gz: ca2bb40471a4076ead3ee9476c5edbd53b63a06e
 SHA512:
-  metadata.gz: 669950d37ac2e29a1940ceb0fa4105d760593757d14e90e6bb520bf56332c0935238f82eac066a3948c88fc6d330295f357b9eac7d62029ce87d3c4e5354b73a
-  data.tar.gz: 598604f3136587a838cc500fae9a3b152c5b5a853e29b2bffd5e8e1f4a55c417a6323b4eb1def19cef954fbfa8b2ba5daef827a52e3bba9786e4dd1107edae4e
+  metadata.gz: e14b3b99f73a202f4b494f79ee11af3440965a706c3d6e335292d184c3ea2bbf5166e0a2ba8f59a03ceffb8a40bc98eaa54f23448f40c18c7f1b0ae58e988e65
+  data.tar.gz: 2833ecd5d304e9d99b80d8efd7e7e2be0061d3fef2db16eee749986602a8b361cbe293453c139426cf51034989c3e388b0c0fd564581178143d196cb25ee0aab

data/Appraisals

@@ -17,12 +17,12 @@ end
 
 appraise "rails40" do
   # NOTE: make sure you're using --1.9 with AR-4.0
-  gem "activerecord", "~> 4.0.8", :require => false
+  gem "activerecord", "~> 4.0.10", :require => false
 end
 
 appraise "rails41" do
   # NOTE: make sure you're using --1.9 with AR-4.0
-  gem "activerecord", "~> 4.1.4", :require => false
+  gem "activerecord", "~> 4.1.7", :require => false
 end
 
 appraise "rails42" do

data/Gemfile

@@ -48,6 +48,10 @@ group :rails do
   gem 'actionpack', :require => nil
 end
 
+if sqlite_version = ENV['JDBC_SQLITE_VERSION'] # for testing against different version(s)
+  gem 'jdbc-sqlite3', sqlite_version, :require => nil, :platform => :jruby, :group => :test
+end
+
 gem 'mysql2', :require => nil, :platform => :mri, :group => :test
 gem 'pg', :require => nil, :platform => :mri, :group => :test
 gem 'sqlite3', :require => nil, :platform => :mri, :group => :test

data/History.md

@@ -1,3 +1,14 @@
+## 1.3.12 (11/18/14)
+
+- [sqlite] support for latest JDBC 3.8
+- [mysql] correctly map config[:encoding] into Connector-J characterEncoding
+- [mysql] backport rename_index from Rails (corectly handling MariaDB as well)
+- [mysql] core adapter compat - missing initialize_schema_migrations_table
+- `supports_views?` is now a method available in 4.2 (most DBs support VIEWs)
+- [postgres] table_exists? fully compatible with Rails 4.1
+- handle pre JDBC 4 driver abstract method errors somehow gracefully
+- tune ArJdbc scoped warnings/deprecations (can be off -J-Darjdbc.warn=false)
+
 ## 1.3.11 (10/20/14)
 
 - arjdbc: performance improvement - avodinng JRuby's impl iface generation

data/lib/arjdbc/db2/adapter.rb

@@ -572,6 +572,9 @@ module ArJdbc
       tables.each { |table| drop_table("#{table}") }
     end
 
+    # @override
+    def supports_views?; true end
+
     def execute_table_change(sql, table_name, name = nil)
       outcome = execute(sql, name)
       reorg_table(table_name, name)

data/lib/arjdbc/h2/adapter.rb

@@ -196,10 +196,13 @@ module ArJdbc
       end
     end
 
+    # @override
+    def supports_views?; true end
+
     # EXPLAIN support :
 
     # @override
-    def supports_explain?; true; end
+    def supports_explain?; true end
 
     # @override
     def explain(arel, binds = [])

data/lib/arjdbc/hsqldb/adapter.rb

@@ -237,6 +237,9 @@ module ArJdbc
       execute "DROP INDEX #{quote_column_name(index_name(table_name, options))}"
     end
 
+    # @override
+    def supports_views?; true end
+
     # @override
     def structure_dump
       execute('SCRIPT').map do |result|
@@ -281,6 +284,6 @@ module ActiveRecord::ConnectionAdapters
   class HsqldbAdapter < JdbcAdapter
     include ArJdbc::HSQLDB
   end
-  
+
 end
 

data/lib/arjdbc/jdbc.rb

@@ -1,4 +1,3 @@
-require 'set'
 require 'active_support/deprecation'
 
 module ArJdbc
@@ -9,18 +8,20 @@ module ArJdbc
       super(message) || true if warn?(message, once)
     end
 
-    def deprecate(message, once = nil)
-      ActiveSupport::Deprecation.warn(message, caller) || true if warn?(message, once)
+    def deprecate(message, once = nil) # adds a "DEPRECATION WARNING: " prefix
+      ::ActiveSupport::Deprecation.warn(message, caller) || true if warn?(message, once)
     end
 
     private
 
-    @@warns = Set.new
+    @@warns = nil
+    @@warns = false if ENV_JAVA['arjdbc.warn'].eql? 'false'
 
     def warn?(message, once)
-      return nil unless message
-      return false if @@warns.include?(message)
-      @@warns << message.dup if once
+      return nil if @@warns.equal?(false) || ! message
+      warns = @@warns ||= ( require 'set'; Set.new )
+      return false if warns.include?(message)
+      warns << message.dup if once
       true
     end
 
@@ -28,7 +29,7 @@ module ArJdbc
 
   require 'arjdbc/jdbc/adapter'
 
-  if Java::JavaLang::Boolean.getBoolean('arjdbc.extensions.discover')
+  if ENV_JAVA['arjdbc.extensions.discover'].eql? 'true'
     self.discover_extensions
   else
     require 'arjdbc/discover'

data/lib/arjdbc/jdbc/adapter.rb

@@ -106,9 +106,14 @@ module ActiveRecord
         java_connection = raw_connection.connection
         return java_connection unless unwrap
         connection_class = java.sql.Connection.java_class
-        if java_connection.wrapper_for?(connection_class)
-          java_connection.unwrap(connection_class) # java.sql.Wrapper.unwrap
-        elsif java_connection.respond_to?(:connection)
+        begin
+          if java_connection.wrapper_for?(connection_class)
+            return java_connection.unwrap(connection_class) # java.sql.Wrapper.unwrap
+          end
+        rescue Java::JavaLang::AbstractMethodError => e
+          ArJdbc.warn("driver/pool connection impl does not support unwrapping (#{e})")
+        end
+        if java_connection.respond_to?(:connection)
           # e.g. org.apache.tomcat.jdbc.pool.PooledConnection
           java_connection.connection # getConnection
         else
@@ -413,6 +418,11 @@ module ActiveRecord
         end
       end
 
+      # @override
+      def supports_views?
+        @connection.supports_views?
+      end
+
       # Executes a SQL query in the context of this connection using the bind
       # substitutes.
       # @param sql the query string (or AREL object)
@@ -680,17 +690,6 @@ module ActiveRecord
         end
       end unless defined? ActiveRecord::Result
 
-      # Helper to easily override #table_definition (on AR 3.x/4.0) as :
-      # ```
-      #   def table_definition(*args)
-      #     new_table_definition(TableDefinition, *args)
-      #   end
-      # ```
-      def new_table_definition(table_definition, *args)
-        table_definition.new(self) # args ignored only used for 4.0
-      end
-      private :new_table_definition
-
       # NOTE: make sure if adapter overrides #table_definition that it will
       # work on AR 3.x as well as 4.0
       if ActiveRecord::VERSION::MAJOR > 3
@@ -708,12 +707,19 @@ module ActiveRecord
       end
 
       # @note AR-4x arguments expected: `(name, temporary, options)`
-      # @private documented above
+      # @private documented bellow
       def new_table_definition(table_definition, *args)
         table_definition.new native_database_types, *args
       end
       private :new_table_definition
 
+      # @private
+      def new_index_definition(table, name, unique, columns, lengths,
+          orders = nil, where = nil, type = nil, using = nil)
+        IndexDefinition.new(table, name, unique, columns, lengths, orders, where, type, using)
+      end
+      private :new_index_definition
+
       #
 
       # Provides backwards-compatibility on ActiveRecord 4.1 for DB adapters
@@ -728,6 +734,31 @@ module ActiveRecord
       end
       public :add_column_options!
 
+      else # AR < 4.0
+
+      # Helper to easily override #table_definition (on AR 3.x/4.0) as :
+      # ```
+      #   def table_definition(*args)
+      #     new_table_definition(TableDefinition, *args)
+      #   end
+      # ```
+      def new_table_definition(table_definition, *args)
+        table_definition.new(self) # args ignored only used for 4.0
+      end
+      private :new_table_definition
+
+      # @private (:table, :name, :unique, :columns, :lengths, :orders)
+      def new_index_definition(table, name, unique, columns, lengths,
+          orders = nil, where = nil, type = nil, using = nil)
+        IndexDefinition.new(table, name, unique, columns, lengths, orders)
+      end
+      # @private (:table, :name, :unique, :columns, :lengths)
+      def new_index_definition(table, name, unique, columns, lengths,
+          orders = nil, where = nil, type = nil, using = nil)
+        IndexDefinition.new(table, name, unique, columns, lengths)
+      end if ActiveRecord::VERSION::STRING < '3.2'
+      private :new_index_definition
+
       end
 
       # @return whether `:prepared_statements` are to be used

data/lib/arjdbc/mssql/adapter.rb

@@ -61,9 +61,7 @@ module ArJdbc
     end
 
     # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#jdbc_column_class
-    def jdbc_column_class
-      ::ActiveRecord::ConnectionAdapters::MSSQLColumn
-    end
+    def jdbc_column_class; Column end
 
     # @see ActiveRecord::ConnectionAdapters::Jdbc::ArelSupport
     def self.arel_visitor_type(config)
@@ -255,9 +253,11 @@ module ArJdbc
       end.join(",")
     end
 
-    def supports_ddl_transactions?
-      true
-    end
+    # @override
+    def supports_ddl_transactions?; true end
+
+    # @override
+    def supports_views?; true end
 
     def tables(schema = current_schema)
       @connection.tables(nil, schema)
@@ -738,3 +738,9 @@ module ActiveRecord::ConnectionAdapters
   end
 
 end
+
+module ArJdbc
+  module MSSQL
+    Column = ::ActiveRecord::ConnectionAdapters::MSSQLColumn
+  end
+end

data/lib/arjdbc/mysql/adapter.rb

@@ -2,13 +2,18 @@ ArJdbc.load_java_part :MySQL
 
 require 'bigdecimal'
 require 'active_record/connection_adapters/abstract/schema_definitions'
-require 'arjdbc/mysql/column'
-require 'arjdbc/mysql/bulk_change_table'
-require 'arjdbc/mysql/explain_support'
-require 'arjdbc/mysql/schema_creation' # AR 4.x
 
 module ArJdbc
   module MySQL
+
+    # @private
+    AR42 = ActiveRecord::VERSION::STRING >= '4.2'
+
+    require 'arjdbc/mysql/column'
+    require 'arjdbc/mysql/bulk_change_table'
+    require 'arjdbc/mysql/explain_support'
+    require 'arjdbc/mysql/schema_creation' # AR 4.x
+
     include BulkChangeTable if const_defined? :BulkChangeTable
 
     # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#jdbc_connection_class
@@ -142,10 +147,40 @@ module ArJdbc
       Arel::Nodes::Bin.new(node)
     end
 
+    def case_sensitive_modifier(node, table_attribute)
+      node = Arel::Nodes.build_quoted node, table_attribute
+      Arel::Nodes::Bin.new(node)
+    end if AR42
+
     def limited_update_conditions(where_sql, quoted_table_name, quoted_primary_key)
       where_sql
     end
 
+    def initialize_schema_migrations_table
+      if @config[:encoding] == 'utf8mb4'
+        ActiveRecord::SchemaMigration.create_table(191)
+      else
+        ActiveRecord::SchemaMigration.create_table
+      end
+    end if ::ActiveRecord::VERSION::MAJOR > 3
+
+    # HELPER METHODS ===========================================
+
+    # @private Only for Rails core compatibility.
+    def new_column(field, default, type, null, collation, extra = "")
+      Column.new(field, default, type, null, collation, strict_mode?, extra)
+    end unless AR42
+
+    # @private Only for Rails core compatibility.
+    def new_column(field, default, cast_type, sql_type = nil, null = true, collation = "", extra = "")
+      Column.new(field, default, cast_type, sql_type, null, collation, strict_mode?, extra)
+    end if AR42
+
+    # @private Only for Rails core compatibility.
+    def error_number(exception)
+      exception.error_code if exception.respond_to?(:error_code)
+    end
+
     # QUOTING ==================================================
 
     # @override
@@ -203,9 +238,14 @@ module ArJdbc
       version[0] && version[0] >= 5
     end
 
+    def supports_rename_index?
+      return false if mariadb? || ! version[0]
+      (version[0] == 5 && version[1] >= 7) || version[0] >= 6
+    end
+
     # @override
     def supports_transaction_isolation?(level = nil)
-      version[0] >= 5 # MySQL 5+
+      version[0] && version[0] >= 5 # MySQL 5+
     end
 
     # NOTE: handled by JdbcAdapter we override only to have save-point in logs :
@@ -332,16 +372,15 @@ module ArJdbc
       sql = "SHOW FULL COLUMNS FROM #{quote_table_name(table_name)}"
       columns = execute(sql, name || 'SCHEMA')
       strict = strict_mode?
-      column = ::ActiveRecord::ConnectionAdapters::MysqlAdapter::Column
       pass_cast_type = respond_to?(:lookup_cast_type)
       columns.map! do |field|
         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'])
+          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'])
+          Column.new(field['Field'], field['Default'], sql_type, null, field['Collation'], strict, field['Extra'])
         end
       end
       columns
@@ -377,6 +416,10 @@ module ArJdbc
       super(name, {:options => "ENGINE=InnoDB DEFAULT CHARSET=utf8"}.merge(options))
     end
 
+    def drop_table(table_name, options = {})
+      execute "DROP#{' TEMPORARY' if options[:temporary]} TABLE #{quote_table_name(table_name)}"
+    end
+
     # @override
     def rename_table(table_name, new_name)
       execute "RENAME TABLE #{quote_table_name(table_name)} TO #{quote_table_name(new_name)}"
@@ -389,6 +432,15 @@ module ArJdbc
       execute "DROP INDEX #{quote_column_name(index_name)} ON #{quote_table_name(table_name)}"
     end
 
+    # @override
+    def rename_index(table_name, old_name, new_name)
+      if supports_rename_index?
+        execute "ALTER TABLE #{quote_table_name(table_name)} RENAME INDEX #{quote_table_name(old_name)} TO #{quote_table_name(new_name)}"
+      else
+        super
+      end
+    end
+
     # @override
     def add_column(table_name, column_name, type, options = {})
       add_column_sql = "ALTER TABLE #{quote_table_name(table_name)} ADD #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
@@ -582,6 +634,8 @@ module ArJdbc
       column
     end
 
+    def mariadb?; !! ( full_version =~ /mariadb/i ) end
+
     def version
       return @version ||= begin
         version = []
@@ -591,9 +645,7 @@ module ArJdbc
           version << jdbc_connection.serverMinorVersion
           version << jdbc_connection.serverSubMinorVersion
         else
-          result = execute 'SELECT VERSION()', 'SCHEMA'
-          result = result.first.values.first # [{"VERSION()"=>"5.5.37-0ubuntu..."}]
-          if match = result.match(/^(\d)\.(\d+)\.(\d+)/)
+          if match = full_version.match(/^(\d)\.(\d+)\.(\d+)/)
             version << match[1].to_i
             version << match[2].to_i
             version << match[3].to_i
@@ -603,6 +655,13 @@ module ArJdbc
       end
     end
 
+    def full_version
+      @full_version ||= begin
+        result = execute 'SELECT VERSION()', 'SCHEMA'
+        result.first.values.first # [{"VERSION()"=>"5.5.37-0ubuntu..."}]
+      end
+    end
+
   end
 end
 
@@ -628,7 +687,7 @@ module ActiveRecord
         include ::ArJdbc::MySQL::Column
 
         def initialize(name, default, sql_type = nil, null = true, collation = nil, strict = false, extra = '')
-          if Hash === name
+          if name.is_a?(Hash)
             super # first arg: config
           else
             @strict = strict; @collation = collation; @extra = extra
@@ -638,7 +697,7 @@ module ActiveRecord
         end
 
         def initialize(name, default, cast_type, sql_type = nil, null = true, collation = nil, strict = false, extra = '')
-          if Hash === name
+          if name.is_a?(Hash)
             super # first arg: config
           else
             @strict = strict; @collation = collation; @extra = extra
@@ -686,3 +745,9 @@ module ActiveRecord
 
   end
 end
+
+module ArJdbc
+  module MySQL
+    Column = ::ActiveRecord::ConnectionAdapters::MysqlAdapter::Column
+  end
+end