activerecord-jdbc-adapter 1.3.19 → 1.3.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19e56fe06c05f03b099bb62c6d6cad31e533d206
-  data.tar.gz: b48a142b0ed768d61928d393f66f5f23ef104237
+  metadata.gz: 82589d846e5ee11d8bd85ffb825c8b58571ef837
+  data.tar.gz: 9bda0dc210283b928b1c97a8b66e72b17348635c
 SHA512:
-  metadata.gz: f3f2e725dcbaf68da28f4a4dbec5815d350132d8383980adc608a2b269f6a55e2efc90e42169178c432b98d22063abcdd602159b46cf17bb663f3adeb186ad04
-  data.tar.gz: b1c911e93edfcc4f25c9ac0e091541fa0834f1e6b731c0bbcc57e5df6b06014a3b83fb87c11b241a36f9697b6f02a22fa0c709c57eba5d3b350525447325dc4c
+  metadata.gz: 914c271374806217b3e5396036d5e147c7dd56f6fc06515c121715e9abce9a4b91dd70daf91423029d35380d43d20938fd6d75aa9c8295079a0844e93e32202b
+  data.tar.gz: 511b7f9fe9adbc153cf2d1fca7992f63341db16097abeba55563b465e81634429460d35e1118864098e53459192ad07e5fd3c3121c61c6e5f24b7e21a3c00711

data/.travis.yml

@@ -8,10 +8,9 @@ before_script:
 before_install:
   - ((jruby -v | grep 1.8.7) && jruby --1.9 -S gem update --system 2.1.11) || true
 rvm:
-  - jruby-1.7.18
-  #- jruby-head # 9000 ignores --1.8 and --1.9 switches
+  - jruby-1.7.24
 jdk:
-  - openjdk6
+  - openjdk7
 gemfile:
   - gemfiles/rails23.gemfile
   - gemfiles/rails30.gemfile
@@ -46,102 +45,219 @@ branches:
     - /.*-stable$/
     - /^test-.*/
 matrix:
-  #allow_failures:
-  #  - env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=jdbc
-  #  - env: JRUBY_OPTS="--1.9 $JRUBY_OPTS" DB=jdbc PREPARED_STATEMENTS=true
-  include: # testing against MariaDB
+  allow_failures:
+    # yet another BC timestamp issue: <Wed, 31 Dec -0001 22:58:59 +0000> expected but was <Fri, 02 Jan 0000 22:58:59 +0000>
+    - rvm: jruby-9.0.5.0
+      gemfile: gemfiles/rails41.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql
+      jdk: oraclejdk7
+    # ``/system call symlink regression (since JRuby 1.7.19)
+    # + (postgres) database_tasks got updated on 4.2 : https://github.com/rails/rails/commit/07f8a96aa14b642a86
+    - rvm: jruby-1.7.24
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="--1.9 $JRUBY_OPTS" DB=postgresql PREPARED_STATEMENTS=false INSERT_RETURNING=true
+    - rvm: jruby-1.7.24
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="--1.9 $JRUBY_OPTS" DB=postgresql PREPARED_STATEMENTS=true
+    - rvm: jruby-1.7.24
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="--1.9 $JRUBY_OPTS" DB=postgresql PREPARED_STATEMENTS=true INSERT_RETURNING=true
+    - rvm: jruby-1.7.24
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql
+  include:
+    # testing against MariaDB
     - addons:
         mariadb: '5.5'
-      rvm: jruby-1.7.18
+      rvm: jruby-1.7.24
       gemfile: gemfiles/rails32.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql
-      jdk: openjdk7
+      jdk: openjdk6
     - addons:
         mariadb: '10.0'
-      rvm: jruby-1.7.18
+      rvm: jruby-1.7.24
       gemfile: gemfiles/rails40.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=mariadb
       jdk: openjdk7
     - addons:
         mariadb: '10.0'
-      rvm: jruby-1.7.18
+      rvm: jruby-1.7.24
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=mariadb PREPARED_STATEMENTS=true
-      jdk: openjdk7
+      jdk: oraclejdk8
+      # include some tests on JDK 6 :
+    - rvm: jruby-1.7.24
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql
+      jdk: openjdk6
+    - rvm: jruby-1.7.24
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql
+      jdk: openjdk6
+    - rvm: jruby-1.7.24
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=sqlite3
+      jdk: openjdk6
+    - rvm: jruby-1.7.24
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=derby
+      jdk: openjdk6
+    - rvm: jruby-1.7.24
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=h2
+      jdk: openjdk6
+    - rvm: jruby-1.7.24
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=hsqldb
+      jdk: openjdk6
+      # include testing with JRuby 9K (4.2) :
+    - rvm: jruby-9.0.5.0
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql PREPARED_STATEMENTS=true
+      jdk: oraclejdk7
+    - rvm: jruby-9.0.5.0
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql PREPARED_STATEMENTS=true
+      jdk: oraclejdk7
+    - rvm: jruby-9.0.5.0
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=sqlite3
+      jdk: oraclejdk7
+    - rvm: jruby-9.0.5.0
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql
+      jdk: oraclejdk8
+    - rvm: jruby-9.0.5.0
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql
+      jdk: oraclejdk8
+    - rvm: jruby-9.0.5.0
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=sqlite3
+      jdk: oraclejdk8
+    - rvm: jruby-9.0.5.0
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=derby
+      jdk: oraclejdk8
+    - rvm: jruby-9.0.5.0
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=h2
+      jdk: oraclejdk8
+    - rvm: jruby-9.0.5.0
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=hsqldb
+      jdk: oraclejdk8
+      # include testing with JRuby 9K (4.1) :
+    - rvm: jruby-9.0.5.0
+      gemfile: gemfiles/rails41.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql PREPARED_STATEMENTS=true
+      jdk: oraclejdk8
+    - rvm: jruby-9.0.5.0
+      gemfile: gemfiles/rails41.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql PREPARED_STATEMENTS=true
+      jdk: oraclejdk8
+    - rvm: jruby-9.0.5.0
+      gemfile: gemfiles/rails41.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=sqlite3
+      jdk: oraclejdk8
+    - rvm: jruby-9.0.5.0
+      gemfile: gemfiles/rails41.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql
+      jdk: oraclejdk7
+    - rvm: jruby-9.0.5.0
+      gemfile: gemfiles/rails41.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql
+      jdk: oraclejdk7
+    - rvm: jruby-9.0.5.0
+      gemfile: gemfiles/rails41.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=sqlite3
+      jdk: oraclejdk8
+    - rvm: jruby-9.0.5.0
+      gemfile: gemfiles/rails41.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=derby
+      jdk: oraclejdk7
+    - rvm: jruby-9.0.5.0
+      gemfile: gemfiles/rails41.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=h2
+      jdk: oraclejdk7
+    - rvm: jruby-9.0.5.0
+      gemfile: gemfiles/rails41.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=hsqldb
+      jdk: oraclejdk8
   exclude:
     # Rails 4 prefers Ruby 2.0 (or at least >= 1.9.3) :
-    - rvm: jruby-1.7.18
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails40.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=mysql
-    - rvm: jruby-1.7.18
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails40.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=postgresql
-    - rvm: jruby-1.7.18
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails40.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=sqlite3
-    - rvm: jruby-1.7.18
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails40.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=derby
-    - rvm: jruby-1.7.18
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails40.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=h2
-    - rvm: jruby-1.7.18
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails40.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=hsqldb
-    - rvm: jruby-1.7.18
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails40.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=jndi
-    - rvm: jruby-1.7.18
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails40.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=jdbc
     # Rails 4.1 does not support Ruby 1.8 :
-    - rvm: jruby-1.7.18
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=mysql
-    - rvm: jruby-1.7.18
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=postgresql
-    - rvm: jruby-1.7.18
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=sqlite3
-    - rvm: jruby-1.7.18
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=derby
-    - rvm: jruby-1.7.18
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=h2
-    - rvm: jruby-1.7.18
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=hsqldb
-    - rvm: jruby-1.7.18
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=jndi
-    - rvm: jruby-1.7.18
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=jdbc
     # Rails 4.2 will not support Ruby 1.8 :
-    - rvm: jruby-1.7.18
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=mysql
-    - rvm: jruby-1.7.18
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=postgresql
-    - rvm: jruby-1.7.18
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=sqlite3
-    - rvm: jruby-1.7.18
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=derby
-    - rvm: jruby-1.7.18
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=h2
-    - rvm: jruby-1.7.18
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=hsqldb
-    - rvm: jruby-1.7.18
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=jndi
-    - rvm: jruby-1.7.18
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=jdbc
     ## JRuby 9K :
@@ -280,19 +396,19 @@ matrix:
     - rvm: jruby-head
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=sqlite3
-    - rvm: jruby-1.7.18
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=derby
-    - rvm: jruby-1.7.18
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=h2
-    - rvm: jruby-1.7.18
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=hsqldb
-    - rvm: jruby-1.7.18
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=jndi
-    - rvm: jruby-1.7.18
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=jdbc
     # Rails 4.2 (JRuby 9K) :

data/History.md

@@ -1,3 +1,18 @@
+## 1.3.20 (03/09/16)
+
+- Retrieve AM::Type::Boolean::FALSE_VALUES for Rails 5 (#705)
+- [mysql] only mock mysql / mysql2 error under adapter /mysql/
+  and make sure db:create works (#702)
+- use system instead of `` to run dumps (on < 4.0) as it has issues under 1.7.x
+- avoid column.default type_cast-ing on AR 4.2 (#715)
+- [postgres] data_sources support - backport on AR 4.2
+- add support for data sources (backport on AR 4.2) in base (jdbc) adapter
+- [derby] Enable DDL transaction on Derby (#714)
+- [db2] support for DB2 big integer (BIGINT) data type
+- [mysql] Fixed MySQL primary key for MySQL >= 5.7.3 (#695)
+- [sqlite] on AR 4.2 is not supposed to have an implicit string limit: 255
+- [postgres] on AR 4.2 is not supposed to have an implicit string limit: 255
+
 ## 1.3.19 (11/02/15)
 
 - [sqlite] add supports_partial_index? and remove duplicate support_index_sort_order?

data/lib/arjdbc/db2/adapter.rb

@@ -118,6 +118,7 @@ module ArJdbc
     NATIVE_DATABASE_TYPES = {
       :string     => { :name => "varchar", :limit => 255 },
       :integer    => { :name => "integer" },
+      :bigint     => { :name => 'bigint' },
       :float      => { :name => "real" }, # :limit => 24
       :double     => { :name => "double" }, # :limit => 53
       :text       => { :name => "clob" },

data/lib/arjdbc/derby/adapter.rb

@@ -433,6 +433,9 @@ module ArJdbc
       @connection.tables(nil, current_schema)
     end
 
+    # @override
+    def supports_ddl_transactions?; true end
+ 
     # @override
     def supports_foreign_keys?; true end
 

data/lib/arjdbc/jdbc/adapter.rb

@@ -618,6 +618,16 @@ module ActiveRecord
         @connection.table_exists?(name) # schema_name = nil
       end
 
+      # @override
+      def data_sources
+        tables
+      end if ArJdbc::AR42
+
+      # @override
+      def data_source_exists?(name)
+        table_exists?(name)
+      end if ArJdbc::AR42
+
       # @override
       def indexes(table_name, name = nil, schema_name = nil)
         @connection.indexes(table_name, name, schema_name)

data/lib/arjdbc/jdbc/column.rb

@@ -26,7 +26,6 @@ module ActiveRecord
           end
         end
         default = default_value(default)
-        default = args[0].type_cast_from_database(default) if ArJdbc::AR42
 
         # super <= 4.1: (name, default, sql_type = nil, null = true)
         # super >= 4.2: (name, default, cast_type, sql_type = nil, null = true)

data/lib/arjdbc/jdbc/type_cast.rb

@@ -6,8 +6,8 @@ module ActiveRecord::ConnectionAdapters
     # @private Simply to quickly "hack-in" 4.2 compatibility.
     module TypeCast
 
-      TRUE_VALUES = Column::TRUE_VALUES
-      FALSE_VALUES = Column::FALSE_VALUES
+      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
 
       #module Format
       ISO_DATE = Column::Format::ISO_DATE
@@ -58,7 +58,16 @@ module ActiveRecord::ConnectionAdapters
         else
           TRUE_VALUES.include?(value)
         end
-      end
+      end if const_defined?(:TRUE_VALUES) # removed on AR 5.0
+
+      # convert something to a boolean
+      def value_to_boolean(value)
+        if value.is_a?(String) && value.empty?
+          nil
+        else
+          ! FALSE_VALUES.include?(value)
+        end
+      end unless const_defined?(:TRUE_VALUES)
 
       # Used to convert values to integer.
       # handle the case when an integer column is used to store boolean values

data/lib/arjdbc/mysql/adapter.rb

@@ -98,7 +98,7 @@ module ArJdbc
     def self.emulate_booleans=(emulate); @@emulate_booleans = emulate; end
 
     NATIVE_DATABASE_TYPES = {
-      :primary_key => "int(11) DEFAULT NULL auto_increment PRIMARY KEY",
+      :primary_key => "int(11) auto_increment PRIMARY KEY",
       :string => { :name => "varchar", :limit => 255 },
       :text => { :name => "text" },
       :integer => { :name => "int", :limit => 4 },

data/lib/arjdbc/postgresql/adapter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ArJdbc.load_java_part :PostgreSQL
 
 require 'ipaddr'
@@ -281,6 +282,7 @@ module ArJdbc
     }) if AR40
 
     NATIVE_DATABASE_TYPES.update(
+      :string => { :name => "character varying" },
       :bigserial => "bigserial",
       :bigint => { :name => "bigint" },
       :bit => { :name => "bit" },
@@ -1302,7 +1304,9 @@ module ArJdbc
 
     # @private
     TABLES_SQL = 'SELECT tablename FROM pg_tables WHERE schemaname = ANY (current_schemas(false))'
+    private_constant :TABLES_SQL rescue nil
 
+    # @override
     def tables(name = nil)
       select_values(TABLES_SQL, 'SCHEMA')
     end
@@ -1316,6 +1320,7 @@ module ArJdbc
     TABLE_EXISTS_SQL_PREFIX << " WHERE c.relkind IN ('r','v')"
     end
     TABLE_EXISTS_SQL_PREFIX << " AND c.relname = ?"
+    private_constant :TABLE_EXISTS_SQL_PREFIX rescue nil
 
     # Returns true if table exists.
     # If the schema is not specified as part of +name+ then it will only find tables within
@@ -1333,6 +1338,19 @@ module ArJdbc
         @connection.execute_query_raw(sql, binds).first['table_count'] > 0
       end
     end
+    alias data_source_exists? table_exists?
+
+    # @private
+    DATA_SOURCES_SQL =  'SELECT c.relname FROM pg_class c'
+    DATA_SOURCES_SQL << ' LEFT JOIN pg_namespace n ON n.oid = c.relnamespace'
+    DATA_SOURCES_SQL << " WHERE c.relkind IN ('r', 'v','m')" # -- (r)elation/table, (v)iew, (m)aterialized view
+    DATA_SOURCES_SQL << ' AND n.nspname = ANY (current_schemas(false))'
+    private_constant :DATA_SOURCES_SQL rescue nil
+
+    # @override
+    def data_sources
+      select_values(DATA_SOURCES_SQL, 'SCHEMA')
+    end
 
     def drop_table(table_name, options = {})
       execute "DROP TABLE #{quote_table_name(table_name)}#{' CASCADE' if options[:force] == :cascade}"

data/lib/arjdbc/sqlite3/adapter.rb

@@ -128,6 +128,9 @@ module ArJdbc
       :binary => { :name => "blob" },
       :boolean => { :name => "boolean" }
     }
+    NATIVE_DATABASE_TYPES.update(
+      :string => { :name => "varchar" }
+    ) if AR42
 
     # @override
     def native_database_types

data/lib/arjdbc/tasks/databases3.rake

@@ -1,11 +1,3 @@
-# NOTE: fake these for create_database(config)
-module Mysql
-  Error = ActiveRecord::JDBCError unless const_defined?(:Error)
-end
-module Mysql2
-  Error = ActiveRecord::JDBCError unless const_defined?(:Error)
-end
-
 module ArJdbc
   module Tasks
     class << self
@@ -53,7 +45,27 @@ namespace :db do
 
   def create_database(config)
     case config['adapter']
-    when /mysql|postgresql|sqlite/
+    when /mysql2/
+      unless defined? Mysql2::Error
+        # NOTE: fake it for create_database(config)
+        Object.const_set :Mysql2, Module.new
+        Mysql2.const_set :Error, ActiveRecord::JDBCError
+        ActiveRecord::JDBCError.class_eval do
+          def error; self end # Mysql2::Error#error
+        end
+      end
+      _rails_create_database adapt_jdbc_config(config)
+    when /mysql/
+      unless defined? Mysql::Error
+        # NOTE: fake it for create_database(config)
+        Object.const_set :Mysql, Module.new
+        Mysql.const_set :Error, ActiveRecord::JDBCError
+        ActiveRecord::JDBCError.class_eval do
+          def error; self end # Mysql::Error#error
+        end
+      end
+      _rails_create_database adapt_jdbc_config(config)
+    when /postgresql|sqlite/
       _rails_create_database adapt_jdbc_config(config)
     else
       ArJdbc::Tasks.create(config)
@@ -100,13 +112,12 @@ namespace :db do
         unless search_path.blank?
           search_path = search_path.split(",").map{ |part| "--schema=#{Shellwords.escape(part.strip)}" }.join(" ")
         end
-        `pg_dump -i -s -x -O -f #{Shellwords.escape(filename)} #{search_path} #{Shellwords.escape(config['database'])}`
-        raise 'Error dumping database' if $?.exitstatus == 1
+        sh "pg_dump -i -s -x -O -f #{Shellwords.escape(filename)} #{search_path} #{Shellwords.escape(config['database'])}"
 
         File.open(filename, 'a') { |f| f << "SET search_path TO #{ActiveRecord::Base.connection.schema_search_path};\n\n" }
       when /sqlite/
         dbfile = config['database']
-        `sqlite3 #{dbfile} .schema > #{filename}`
+        sh "sqlite3 #{dbfile} .schema > #{filename}"
       else
         ActiveRecord::Base.establish_connection(config)
         ArJdbc::Tasks.structure_dump(config, filename)
@@ -115,10 +126,11 @@ namespace :db do
       if ActiveRecord::Base.connection.supports_migrations?
         File.open(filename, 'a') { |f| f << ActiveRecord::Base.connection.dump_schema_information }
       end
+
     end
 
     redefine_task :load do
-      config = current_config 
+      config = current_config
       filename = structure_sql
 
       case config['adapter']

data/lib/arjdbc/version.rb

@@ -1,5 +1,5 @@
 module ArJdbc
-  VERSION = "1.3.19"
+  VERSION = "1.3.20"
   # @deprecated
   module Version
     # @private 1.2.x compatibility

data/rakelib/02-test.rake

@@ -41,7 +41,7 @@ def test_task_for(adapter, options = {})
   test_task = Rake::TestTask.new(name => prereqs) do |test_task|
     files = options[:files] || begin
       FileList["test/#{adapter}*_test.rb"] +
-        FileList["test/db/#{adapter}/*_test.rb"]
+        FileList["test/db/#{adapter}/**/*_test.rb"]
     end
     test_task.test_files = files
     test_task.libs = []
@@ -56,6 +56,7 @@ def test_task_for(adapter, options = {})
     if defined?(JRUBY_VERSION) && JRUBY_VERSION.index('1.7') == 0
       test_task.ruby_opts << "--#{RUBY_VERSION[/^(\d+\.\d+)/, 1]}"
     end
+    test_task.options = '--use-color=t'
     test_task.verbose = true if $VERBOSE
     yield(test_task) if block_given?
   end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version
-  version: 1.3.19
+  version: 1.3.20
 platform: ruby
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-11-02 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '2.2'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
+  name: activerecord
   prerelease: false
   type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.2'
 description: 'AR-JDBC is a database adapter for Rails'' ActiveRecord component designed
   to be used with JRuby built upon Java''s JDBC API for database access. Provides
   (ActiveRecord) built-in adapters: MySQL, PostgreSQL and SQLite3 as well as adapters
@@ -38,9 +38,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
 - Appraisals
 - CONTRIBUTING.md
 - Gemfile
@@ -233,21 +233,21 @@ licenses:
 metadata: {}
 post_install_message:
 rdoc_options:
-- --main
+- "--main"
 - README.md
-- -SHN
-- -f
+- "-SHN"
+- "-f"
 - darkfish
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []