activerecord-jdbc-adapter 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0441e4d8245ad0891db71d08c1d484304c319ab
-  data.tar.gz: a60418477bfbd7ad65c2a1517a6c53dec0158cf1
+  metadata.gz: afad2b1bdef2eebe2358aa5de395923a306d3485
+  data.tar.gz: 467e05b0176a944fa16b3011e902e549629ae222
 SHA512:
-  metadata.gz: b0e278d10109cfb86a7eb626dda7ab13f2bd789eb64b9cf71b9f9a8b7d41411a0ec67a9811aa12b0a0fb78490e910292b10c542785045d6346b70ac5f3f2bece
-  data.tar.gz: 8418e4e1f59bc327a899acd31639bb4f4f607f87fc693add1e056cc230f6a44bce189fc657d01be6d3e4f953f5e8826ac40c1f5d69721e32c7ad488bab9a7456
+  metadata.gz: c23850d472d6e6cb0ced6a598ec119cef76c6d1e34257682b37ace3fac27e50488e5bc8629e96bf3d9f7acaafdb0fe22d58179d4a6ad1f9efdf2dccda54abeac
+  data.tar.gz: 36092c2ad04aaa6b1f2da21f6dce1f6fe69ee937b02e68a9db189a97506ff5f2f4ae9e6cff69bd8e80d2125f4d6bcc187dc0b96c436789f2f292419a3649e13c

data/.gitignore

@@ -29,3 +29,4 @@ jndi_test/jdbc/.bindings
 .bundle/config
 gemfiles/.bundle/config
 Gemfile.lock
+/.idea

data/Appraisals

@@ -1,26 +1,27 @@
 appraise "rails23" do
-  gem "activerecord", "~> 2.3.18"
+  gem "activerecord", "~> 2.3.18", :require => false
   gem "rails", "~> 2.3.18"
 end
 
 appraise "rails30" do
-  gem "activerecord", "~> 3.0.20"
+  gem "activerecord", "~> 3.0.20", :require => false
 end
 
 appraise "rails31" do
-  gem "activerecord", "~> 3.1.12"
+  gem "activerecord", "~> 3.1.12", :require => false
 end
 
 appraise "rails32" do
-  gem "activerecord", "~> 3.2.13"
+  gem "activerecord", "~> 3.2.15", :require => false
 end
 
 appraise "rails40" do
   # NOTE: make sure you're using --1.9 with AR-4.0
-  gem "activerecord", "~> 4.0.0"
+  gem "activerecord", "~> 4.0.0", :require => false
 end
 
 appraise "rails41" do
   # NOTE: make sure you're using --1.9 with AR-4.1
+  gem "activerecord", :github => 'rails/rails', :branch => 'master', :require => false
   gem 'rails', :github => 'rails/rails', :branch => 'master'
 end

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'activerecord'
+gem 'activerecord', :require => nil
 gem 'thread_safe', :require => nil
 if defined?(JRUBY_VERSION) && JRUBY_VERSION < '1.7.0'
 gem 'jruby-openssl', :platform => :jruby

data/History.md

@@ -1,3 +1,22 @@
+## 1.3.3 (11/12/13)
+
+- [mysql] allow encoding to be server-detected (using `encoding: false`)
+  due compatibility we still default to `encoding: utf8` if not set (fixes #481)
+- need to match AR 4.0 built-in patterns to re-define (oracle) tasks correctly
+- [postgres] support some of libpg's ENV variables when connecting
+- [derby] allow multiple parallell nested transactions on DERBY
+- [mssql] when using the Microsoft SQL Server driver, fall back to
+  rollback_savepoint when release_savepoint is called (#484)
+- [mysql] only kill the connections cancel timer for driver < 5.1.11
+- [sqlite3] work-around driver ignoring passed schema for table (fixes #483)
+- now using explicit adapter classes with H2/HSQLDB
+- [postgres] Add support for array as root element in JSON (#491)
+- [postgres] MRI compat - make sure we have a `query` method (fixes #486)
+- db:structure:load does not create schema for test db (#480)
+
+Code Contributors (in no particular order): Glenn Goodrich, Joao Carlos,
+Jason Franklin, Dominique d'Argent, Sean McCarthy, Uwe Kubosch
+
 ## 1.3.2 (10/11/13)
 
 - when "pop-ing" current savepoint name - consider open transaction count (#477)

data/README.md

@@ -179,14 +179,15 @@ that case simply setup your *Gemfile* as:
 
 ```ruby
 gem 'activerecord', '~> 4.0.0'
-gem 'activerecord-jdbc-adapter', '~> 1.3.0', platform: :jruby
+gem 'activerecord-jdbc-adapter', '~> 1.3.2', platform: :jruby
 ```
 
 #### Without Bundler
 
-Install the needed gems with JRuby:
+Install the needed gems with JRuby, for example:
 
-    jruby -S gem install activerecord activerecord-jdbc-adapter
+    gem install activerecord -v "~> 3.2.10"
+    gem install activerecord-jdbc-adapter --ignore-dependencies
 
 If you wish to use the adapter for a specific database, you can install it
 directly and the (jdbc-) driver gem (dependency) will be installed as well:

data/gemfiles/rails23.gemfile

@@ -13,6 +13,6 @@ gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
 gem "mysql2", :require=>nil, :platform=>:mri, :group=>:test
 gem "pg", :require=>nil, :platform=>:mri, :group=>:test
 gem "sqlite3", :require=>nil, :platform=>:mri, :group=>:test
-gem "activerecord", "~> 2.3.18"
+gem "activerecord", "~> 2.3.18", :require=>false
 gem "rails", "~> 2.3.18"
 

data/gemfiles/rails30.gemfile

@@ -13,5 +13,5 @@ gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
 gem "mysql2", :require=>nil, :platform=>:mri, :group=>:test
 gem "pg", :require=>nil, :platform=>:mri, :group=>:test
 gem "sqlite3", :require=>nil, :platform=>:mri, :group=>:test
-gem "activerecord", "~> 3.0.20"
+gem "activerecord", "~> 3.0.20", :require=>false
 

data/gemfiles/rails31.gemfile

@@ -13,5 +13,5 @@ gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
 gem "mysql2", :require=>nil, :platform=>:mri, :group=>:test
 gem "pg", :require=>nil, :platform=>:mri, :group=>:test
 gem "sqlite3", :require=>nil, :platform=>:mri, :group=>:test
-gem "activerecord", "~> 3.1.12"
+gem "activerecord", "~> 3.1.12", :require=>false
 

data/gemfiles/rails32.gemfile

@@ -13,5 +13,5 @@ gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
 gem "mysql2", :require=>nil, :platform=>:mri, :group=>:test
 gem "pg", :require=>nil, :platform=>:mri, :group=>:test
 gem "sqlite3", :require=>nil, :platform=>:mri, :group=>:test
-gem "activerecord", "~> 3.2.13"
+gem "activerecord", "~> 3.2.15", :require=>false
 

data/gemfiles/rails32.gemfile.lock

@@ -1,27 +1,27 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.2.14)
-      activesupport (= 3.2.14)
+    activemodel (3.2.15)
+      activesupport (= 3.2.15)
       builder (~> 3.0.0)
-    activerecord (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
+    activerecord (3.2.15)
+      activemodel (= 3.2.15)
+      activesupport (= 3.2.15)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.14)
+    activesupport (3.2.15)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     appraisal (0.5.2)
       bundler
       rake
     arel (3.0.2)
-    atomic (1.1.10)
-    atomic (1.1.10-java)
+    atomic (1.1.14)
+    atomic (1.1.14-java)
     bcrypt-ruby (3.0.1)
     bcrypt-ruby (3.0.1-java)
     builder (3.0.4)
-    i18n (0.6.4)
+    i18n (0.6.5)
     metaclass (0.0.1)
     mocha (0.13.3)
       metaclass (~> 0.0.1)
@@ -37,18 +37,18 @@ GEM
     test-unit (2.5.4)
     test-unit-context (0.3.1)
       test-unit (>= 2.4.0)
-    thread_safe (0.1.2)
+    thread_safe (0.1.3)
       atomic
-    thread_safe (0.1.2-java)
+    thread_safe (0.1.3-java)
       atomic
-    tzinfo (0.3.37)
+    tzinfo (0.3.38)
 
 PLATFORMS
   java
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3.2.13)
+  activerecord (~> 3.2.15)
   appraisal
   bcrypt-ruby (~> 3.0.0)
   mocha (~> 0.13.1)

data/gemfiles/rails40.gemfile

@@ -13,5 +13,5 @@ gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
 gem "mysql2", :require=>nil, :platform=>:mri, :group=>:test
 gem "pg", :require=>nil, :platform=>:mri, :group=>:test
 gem "sqlite3", :require=>nil, :platform=>:mri, :group=>:test
-gem "activerecord", "~> 4.0.0"
+gem "activerecord", "~> 4.0.0", :require=>false
 

data/gemfiles/rails40.gemfile.lock

@@ -19,18 +19,16 @@ GEM
     appraisal (0.5.2)
       bundler
       rake
-    arel (4.0.0)
-    atomic (1.1.10)
-    atomic (1.1.10-java)
-    bcrypt-ruby (3.0.1)
+    arel (4.0.1)
+    atomic (1.1.14-java)
     bcrypt-ruby (3.0.1-java)
     builder (3.1.4)
-    i18n (0.6.4)
+    i18n (0.6.5)
     metaclass (0.0.1)
     minitest (4.7.5)
     mocha (0.13.3)
       metaclass (~> 0.0.1)
-    multi_json (1.7.7)
+    multi_json (1.8.2)
     rake (10.1.0)
     simplecov (0.7.1)
       multi_json (~> 1.0)
@@ -39,13 +37,12 @@ GEM
     test-unit (2.5.4)
     test-unit-context (0.3.1)
       test-unit (>= 2.4.0)
-    thread_safe (0.1.0)
+    thread_safe (0.1.3-java)
       atomic
-    tzinfo (0.3.37)
+    tzinfo (0.3.38)
 
 PLATFORMS
   java
-  ruby
 
 DEPENDENCIES
   activerecord (~> 4.0.0)

data/gemfiles/rails41.gemfile

@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord"
 gem "thread_safe", :require=>nil
 gem "rake", :require=>nil
 gem "appraisal", :require=>nil
@@ -14,5 +13,6 @@ gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
 gem "mysql2", :require=>nil, :platform=>:mri, :group=>:test
 gem "pg", :require=>nil, :platform=>:mri, :group=>:test
 gem "sqlite3", :require=>nil, :platform=>:mri, :group=>:test
+gem "activerecord", :github=>"rails/rails", :branch=>"master", :require=>false
 gem "rails", :github=>"rails/rails", :branch=>"master"
 

data/gemfiles/rails41.gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/rails/rails.git
-  revision: 0941a109fda0a96403fc9b51249ced7b7ca63447
+  revision: 094e31ce6700993759c6f36db52afb0a43bfa71f
   branch: master
   specs:
     actionmailer (4.1.0.beta)
@@ -33,6 +33,7 @@ GIT
       actionmailer (= 4.1.0.beta)
       actionpack (= 4.1.0.beta)
       actionview (= 4.1.0.beta)
+      activemodel (= 4.1.0.beta)
       activerecord (= 4.1.0.beta)
       activesupport (= 4.1.0.beta)
       bundler (>= 1.3.0, < 2.0)
@@ -50,28 +51,23 @@ GEM
     appraisal (0.5.2)
       bundler
       rake
-    arel (4.0.0)
-    atomic (1.1.13)
-    atomic (1.1.13-java)
-    bcrypt-ruby (3.0.1)
+    arel (4.0.1)
+    atomic (1.1.14-java)
     bcrypt-ruby (3.0.1-java)
     builder (3.1.4)
     erubis (2.7.0)
     hike (1.2.3)
     i18n (0.6.5)
-    json (1.8.0)
-    json (1.8.0-java)
+    json (1.8.1-java)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
-    mime-types (1.24)
-    minitest (5.0.6)
+    mime-types (1.25)
+    minitest (5.0.8)
     mocha (0.13.3)
       metaclass (~> 0.0.1)
-    multi_json (1.7.9)
-    mysql2 (0.3.13)
-    pg (0.16.0)
+    multi_json (1.8.2)
     polyglot (0.3.3)
     rack (1.5.2)
     rack-test (0.6.2)
@@ -86,31 +82,27 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.0)
+    sprockets-rails (2.0.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    sqlite3 (1.3.8)
     test-unit (2.5.4)
     test-unit-context (0.3.1)
       test-unit (>= 2.4.0)
     thor (0.18.1)
-    thread_safe (0.1.2)
-      atomic
-    thread_safe (0.1.2-java)
+    thread_safe (0.1.3-java)
       atomic
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
+    tzinfo (0.3.38)
 
 PLATFORMS
   java
-  ruby
 
 DEPENDENCIES
-  activerecord
+  activerecord!
   appraisal
   bcrypt-ruby (~> 3.0.0)
   mocha (~> 0.13.1)

data/lib/arjdbc.rb

@@ -1,15 +1,7 @@
 if defined?(JRUBY_VERSION)
   begin
     require 'active_record/version'
-    if ActiveRecord::VERSION::MAJOR < 2
-      if defined?(RAILS_CONNECTION_ADAPTERS)
-        RAILS_CONNECTION_ADAPTERS << %q(jdbc)
-      else
-        RAILS_CONNECTION_ADAPTERS = %w(jdbc)
-      end
-    else
-      require 'active_record'
-    end
+    require 'active_record'
   rescue LoadError => e
     warn "activerecord-jdbc-adapter requires the activerecord gem at runtime"
     raise e

data/lib/arjdbc/derby/adapter.rb

@@ -147,6 +147,13 @@ module ArJdbc
       NATIVE_DATABASE_TYPES
     end
 
+    # Ensure the savepoint name is unused before creating it.
+    # @override
+    def create_savepoint(name = current_savepoint_name(true))
+      release_savepoint(name) if @connection.marked_savepoint_names.include?(name)
+      super(name)
+    end
+
     # @override
     def quote(value, column = nil)
       return value.quoted_id if value.respond_to?(:quoted_id)

data/lib/arjdbc/h2/adapter.rb

@@ -261,3 +261,11 @@ module ArJdbc
 
   end
 end
+
+module ActiveRecord::ConnectionAdapters
+
+  class H2Adapter < JdbcAdapter
+    include ArJdbc::H2
+  end
+  
+end

data/lib/arjdbc/h2/connection_methods.rb

@@ -16,6 +16,7 @@ ArJdbc::ConnectionMethods.module_eval do
     end
     config[:driver] ||= defined?(::Jdbc::H2.driver_name) ? ::Jdbc::H2.driver_name : 'org.h2.Driver'
     config[:adapter_spec] ||= ::ArJdbc::H2
+    config[:adapter_class] = ActiveRecord::ConnectionAdapters::H2Adapter unless config.key?(:adapter_class)
     
     embedded_driver(config)
   end

data/lib/arjdbc/hsqldb/adapter.rb

@@ -275,3 +275,12 @@ module ArJdbc
 
   end
 end
+
+module ActiveRecord::ConnectionAdapters
+
+  class HsqldbAdapter < JdbcAdapter
+    include ArJdbc::HSQLDB
+  end
+  
+end
+

data/lib/arjdbc/hsqldb/connection_methods.rb

@@ -16,6 +16,7 @@ ArJdbc::ConnectionMethods.module_eval do
     end
     config[:driver] ||= defined?(::Jdbc::HSQLDB.driver_name) ? ::Jdbc::HSQLDB.driver_name : 'org.hsqldb.jdbcDriver'
     config[:adapter_spec] ||= ::ArJdbc::HSQLDB
+    config[:adapter_class] = ActiveRecord::ConnectionAdapters::HsqldbAdapter unless config.key?(:adapter_class)
     config[:connection_alive_sql] ||= 'CALL PI()' # does not like 'SELECT 1'
     
     embedded_driver(config)

data/lib/arjdbc/mssql/adapter.rb

@@ -11,7 +11,6 @@ module ArJdbc
   module MSSQL
     include LimitHelpers
     include Utils
-
     include ExplainSupport
 
     # @private
@@ -578,6 +577,15 @@ module ArJdbc
       end
     end
 
+    # @override
+    def release_savepoint(name = current_savepoint_name)
+      if @connection.jtds_driver?
+        @connection.release_savepoint(name)
+      else # MS invented it's "own" way
+        @connection.rollback_savepoint(name)
+      end
+    end
+
     private
 
     def _execute(sql, name = nil)

data/lib/arjdbc/mssql/connection_methods.rb

@@ -5,6 +5,8 @@ ArJdbc::ConnectionMethods.module_eval do
   # If you'd like to use the "official" MS's SQL-JDBC driver, it's preferable
   # to use the {#sqlserver_connection} method (set `adapter: sqlserver`).
   def mssql_connection(config)
+    # NOTE: this detection ain't perfect and is only meant as a temporary hack
+    # users will get a deprecation eventually to use `adapter: sqlserver` ...
     if config[:driver] =~ /SQLServerDriver$/ || config[:url] =~ /^jdbc:sqlserver:/
       return sqlserver_connection(config)
     end
@@ -68,4 +70,4 @@ ArJdbc::ConnectionMethods.module_eval do
   end
   alias_method :jdbcsqlserver_connection, :sqlserver_connection
 
-end
+end

data/lib/arjdbc/mysql/connection_methods.rb

@@ -25,8 +25,9 @@ ArJdbc::ConnectionMethods.module_eval do
     properties = ( config[:properties] ||= {} )
     properties['zeroDateTimeBehavior'] ||= 'convertToNull'
     properties['jdbcCompliantTruncation'] ||= 'false'
-    properties['useUnicode'] ||= 'true'
-    properties['characterEncoding'] = config[:encoding] || 'utf8'
+    properties['useUnicode'] = 'true' unless properties.key?('useUnicode') # otherwise platform default
+    encoding = config.key?(:encoding) ? config[:encoding] : 'utf8'
+    properties['characterEncoding'] = encoding if encoding
 
     jdbc_connection(config)
   end

data/lib/arjdbc/postgresql/adapter.rb

@@ -552,6 +552,18 @@ module ArJdbc
       end
     end
 
+    # @note Only for "better" AR 4.0 compatibility.
+    # @private
+    def query(sql, name = nil)
+      log(sql, name) do
+        result = []
+        @connection.execute_query_raw(sql, nil) do |*values|
+          result << values
+        end
+        result
+      end
+    end
+
     # Returns an array of schema names.
     def schema_names
       select_values(
@@ -817,6 +829,9 @@ module ArJdbc
         if AR4_COMPAT && column.array? # will be always falsy in AR < 4.0
           column_class = ::ActiveRecord::ConnectionAdapters::PostgreSQLColumn
           "'#{column_class.array_to_string(value, column, self).gsub(/'/, "''")}'"
+        elsif column.type == :json # only in AR-4.0
+          column_class = ::ActiveRecord::ConnectionAdapters::PostgreSQLColumn
+          super(column_class.json_to_string(value), column)
         else super
         end
       when Hash

data/lib/arjdbc/postgresql/column.rb

@@ -362,7 +362,7 @@ module ArJdbc
         end
 
         def json_to_string(object)
-          if Hash === object
+          if Hash === object || Array === object
             ActiveSupport::JSON.encode(object)
           else
             object

data/lib/arjdbc/postgresql/connection_methods.rb

@@ -6,21 +6,24 @@ ArJdbc::ConnectionMethods.module_eval do
     rescue LoadError # assuming driver.jar is on the class-path
     end
 
-    host = config[:host] ||= ( config[:hostaddr] || 'localhost' )
-    port = config[:port] ||= 5432
-    database = config[:database] || config[:dbname]
+    host = config[:host] ||= ( config[:hostaddr] || ENV['PGHOST'] || 'localhost' )
+    port = config[:port] ||= ( ENV['PGPORT'] || 5432 )
+    database = config[:database] || config[:dbname] || ENV['PGDATABASE']
 
     config[:url] ||= "jdbc:postgresql://#{host}:#{port}/#{database}"
     config[:url] << config[:pg_params] if config[:pg_params] # should go away
 
-    config[:username] ||= config[:user] || ENV_JAVA['user.name']
+    config[:username] ||= ( config[:user] || ENV['PGUSER'] || ENV_JAVA['user.name'] )
+    config[:password] ||= ENV['PGPASSWORD'] unless config.key?(:password)
     properties = ( config[:properties] ||= {} )
     # PG :connect_timeout - maximum time to wait for connection to succeed
-    if connect_timeout = config[:connect_timeout]
+    if connect_timeout = ( config[:connect_timeout] || ENV['PGCONNECT_TIMEOUT'] )
       properties['socketTimeout'] ||= connect_timeout
       # NOTE: maybe set options['loginTimeout'] as well?
     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?
     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=...

data/lib/arjdbc/tasks/database_tasks.rb

@@ -1,14 +1,14 @@
 module ArJdbc
   module Tasks
-    
+
     if defined? ActiveRecord::Tasks::DatabaseTasks # AR-4.x
-    
+
       def self.register_tasks(pattern, task)
         ActiveRecord::Tasks::DatabaseTasks.register_task(pattern, task)
       end
-      
+
     else
-      
+
       @@tasks = {}
 
       def self.register_tasks(pattern, task)
@@ -20,9 +20,9 @@ module ArJdbc
         key = @@tasks.keys.detect { |pattern| adapter[pattern] }
         ( @@tasks[key] || JdbcDatabaseTasks ).new(config)
       end
-      
+
     end
-    
+
     require 'arjdbc/tasks/jdbc_database_tasks'
     require 'arjdbc/tasks/db2_database_tasks'
     require 'arjdbc/tasks/derby_database_tasks'
@@ -30,21 +30,22 @@ module ArJdbc
     require 'arjdbc/tasks/hsqldb_database_tasks'
     require 'arjdbc/tasks/mssql_database_tasks'
     require 'arjdbc/tasks/oracle_database_tasks'
-    
+
     # re-invent built-in (but deprecated on 4.0) tasks :
-    register_tasks(/(mssql|sqlserver)/i, MSSQLDatabaseTasks)
-    register_tasks(/(oci|oracle)/i, OracleDatabaseTasks)
+    register_tasks(/sqlserver/, MSSQLDatabaseTasks)
+    register_tasks(/(oci|oracle)/, OracleDatabaseTasks)
+    register_tasks(/mssql/, MSSQLDatabaseTasks) # (built-in) alias
     # tasks for custom (JDBC) adapters :
-    register_tasks(/db2/i, DB2DatabaseTasks)
-    register_tasks(/derby/i, DerbyDatabaseTasks)
-    register_tasks(/h2/i, H2DatabaseTasks)
-    register_tasks(/hsqldb/i, HSQLDBDatabaseTasks)
+    register_tasks(/db2/, DB2DatabaseTasks)
+    register_tasks(/derby/, DerbyDatabaseTasks)
+    register_tasks(/h2/, H2DatabaseTasks)
+    register_tasks(/hsqldb/, HSQLDBDatabaseTasks)
     # (default) generic JDBC task :
-    register_tasks(/^jdbc$/i, JdbcDatabaseTasks)
-    
+    register_tasks(/^jdbc$/, JdbcDatabaseTasks)
+
     # NOTE: no need to register "built-in" adapters such as MySQL
     # - on 4.0 these are registered and will be instantiated
     # - while on 2.3/3.x we keep the AR built-in task behavior
-    
+
   end
 end

data/lib/arjdbc/tasks/databases.rake

@@ -41,6 +41,10 @@ namespace :db do
     defined?(Rails.env) ? Rails.env : ( RAILS_ENV || 'development' )
   end
 
+  if defined? adapt_jdbc_config
+    puts "ArJdbc: double loading #{__FILE__} please delete lib/rasks/jdbc.rake if present!"
+  end
+
   def adapt_jdbc_config(config)
     return config unless config['adapter']
     config.merge 'adapter' => config['adapter'].sub(/^jdbc/, '')

data/lib/arjdbc/tasks/databases3.rake

@@ -118,7 +118,7 @@ namespace :db do
     end
 
     redefine_task :load do
-      config = ActiveRecord::Base.configurations[rails_env] # current_config
+      config = current_config 
       filename = structure_sql
 
       case config['adapter']
@@ -200,4 +200,4 @@ namespace :db do
 
   end
 
-end
+end

data/lib/arjdbc/version.rb

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

data/lib/generators/jdbc/USAGE

@@ -1,10 +1,9 @@
 Description:
-    Creates stubs that ensure activerecord-jdbc is bootstrapped in
-    your Rails application. 
+    Creates stubs that ensure AR-JDBC is bootstrapped in your Rails application.
 
 Example:
     ./script/generate jdbc
 
     This will create:
         config/initializers/jdbc.rb
-	lib/tasks/jdbc.rake
+	    lib/tasks/jdbc.rake

data/lib/generators/jdbc/jdbc_generator.rb

@@ -6,4 +6,12 @@ class JdbcGenerator < Rails::Generators::Base
   def create_jdbc_files
     directory '.', '.'
   end
+
+  def self.desc(description=nil)
+    return super if description
+    "Description:\n" <<
+    "  Creates stubs that ensure AR-JDBC is bootstrapped in your Rails application.\n" <<
+    "  NOTE: you should not need this if you're on Rails >= 3.0 (using Bundler) ..."
+  end
+
 end

data/lib/jdbc_adapter/rake_tasks.rb

@@ -1,3 +1,3 @@
-warn "DEPRECATED: require 'arjdbc/rake_tasks' instead of 'jdbc_adapter/rake_tasks'."
-require 'arjdbc/jdbc/rake_tasks'
-
+# @deprecated
+warn "DEPRECATED: load 'arjdbc/tasks.rb' instead of 'jdbc_adapter/rake_tasks.rb'"
+require 'arjdbc/tasks.rb'

data/lib/jdbc_adapter/version.rb

@@ -1,3 +1,2 @@
 warn "DEPRECATED: require 'arjdbc/version' instead of 'jdbc_adapter/version'."
-require 'arjdbc/version'
-
+require 'arjdbc/version'

data/src/java/arjdbc/jdbc/RubyJdbcConnection.java

@@ -991,32 +991,37 @@ public class RubyJdbcConnection extends RubyObject {
         return context.getRuntime().newArray(primaryKeys);
     }
 
-    private static final int PRIMARY_KEYS_COLUMN_NAME = 4;
+    protected static final int PRIMARY_KEYS_COLUMN_NAME = 4;
 
+    @Deprecated // NOTE: this should go private
     protected List<RubyString> primaryKeys(final ThreadContext context, final String tableName) {
         return withConnection(context, new Callable<List<RubyString>>() {
             public List<RubyString> call(final Connection connection) throws SQLException {
-                final Ruby runtime = context.getRuntime();
                 final String _tableName = caseConvertIdentifierForJdbc(connection, tableName);
-                final DatabaseMetaData metaData = connection.getMetaData();
-                ResultSet resultSet = null;
-                final List<RubyString> keyNames = new ArrayList<RubyString>();
-                try {
-                    TableName components = extractTableName(connection, null, _tableName);
-                    resultSet = metaData.getPrimaryKeys(components.catalog, components.schema, components.name);
-
-                    while (resultSet.next()) {
-                        String columnName = resultSet.getString(PRIMARY_KEYS_COLUMN_NAME);
-                        columnName = caseConvertIdentifierForRails(connection, columnName);
-                        keyNames.add( RubyString.newUnicodeString(runtime, columnName) );
-                    }
-                }
-                finally { close(resultSet); }
-                return keyNames;
+                final TableName table = extractTableName(connection, null, _tableName);
+                return primaryKeys(context, connection, table);
             }
         });
     }
 
+    protected List<RubyString> primaryKeys(final ThreadContext context,
+        final Connection connection, final TableName table) throws SQLException {
+        final DatabaseMetaData metaData = connection.getMetaData();
+        ResultSet resultSet = null;
+        final List<RubyString> keyNames = new ArrayList<RubyString>();
+        try {
+            resultSet = metaData.getPrimaryKeys(table.catalog, table.schema, table.name);
+            final Ruby runtime = context.getRuntime();
+            while ( resultSet.next() ) {
+                String columnName = resultSet.getString(PRIMARY_KEYS_COLUMN_NAME);
+                columnName = caseConvertIdentifierForRails(connection, columnName);
+                keyNames.add( RubyString.newUnicodeString(runtime, columnName) );
+            }
+        }
+        finally { close(resultSet); }
+        return keyNames;
+    }
+
     @JRubyMethod(name = "tables")
     public IRubyObject tables(ThreadContext context) {
         return tables(context, null, null, null, TABLE_TYPE);
@@ -1156,13 +1161,15 @@ public class RubyJdbcConnection extends RubyObject {
 
                 String _tableName = caseConvertIdentifierForJdbc(connection, tableName);
                 String _schemaName = caseConvertIdentifierForJdbc(connection, schemaName);
-                final DatabaseMetaData metaData = connection.getMetaData();
+                final TableName table = extractTableName(connection, _schemaName, _tableName);
+                
+                final List<RubyString> primaryKeys = primaryKeys(context, connection, table);
 
-                final List<RubyString> primaryKeys = primaryKeys(context, _tableName);
                 ResultSet indexInfoSet = null;
                 final List<IRubyObject> indexes = new ArrayList<IRubyObject>();
                 try {
-                    indexInfoSet = metaData.getIndexInfo(null, _schemaName, _tableName, false, true);
+                    final DatabaseMetaData metaData = connection.getMetaData();
+                    indexInfoSet = metaData.getIndexInfo(table.catalog, table.schema, table.name, false, true);
                     String currentIndex = null;
 
                     while ( indexInfoSet.next() ) {
@@ -3445,15 +3452,15 @@ public class RubyJdbcConnection extends RubyObject {
             name = nameParts[2];
         }
 
-        if (schema != null) {
+        if ( schema != null ) {
             schema = caseConvertIdentifierForJdbc(connection, schema);
         }
         name = caseConvertIdentifierForJdbc(connection, name);
 
-        if (schema != null && ! databaseSupportsSchemas()) {
+        if ( schema != null && ! databaseSupportsSchemas() ) {
             catalog = schema;
         }
-        if (catalog == null) catalog = connection.getCatalog();
+        if ( catalog == null ) catalog = connection.getCatalog();
 
         return new TableName(catalog, schema, name);
     }

data/src/java/arjdbc/mssql/MSSQLRubyJdbcConnection.java

@@ -25,6 +25,9 @@
  ***** END LICENSE BLOCK *****/
 package arjdbc.mssql;
 
+import arjdbc.jdbc.Callable;
+import arjdbc.jdbc.RubyJdbcConnection;
+
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
@@ -47,7 +50,7 @@ import org.jruby.util.ByteList;
  *
  * @author nicksieger
  */
-public class MSSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection {
+public class MSSQLRubyJdbcConnection extends RubyJdbcConnection {
 
     protected MSSQLRubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
         super(runtime, metaClass);
@@ -162,4 +165,19 @@ public class MSSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection {
         return columns;
     }
 
+    // internal helper not meant as a "public" API - used in one place thus every
+    @JRubyMethod(name = "jtds_driver?")
+    public IRubyObject jtds_driver_p(final ThreadContext context) throws SQLException {
+        // "jTDS Type 4 JDBC Driver for MS SQL Server and Sybase"
+        // SQLJDBC: "Microsoft JDBC Driver 4.0 for SQL Server"
+        return withConnection(context, new Callable<IRubyObject>() {
+            // NOTE: only used in one place for now (on release_savepoint) ...
+            // might get optimized to only happen once since driver won't change
+            public IRubyObject call(final Connection connection) throws SQLException {
+                final String driver = connection.getMetaData().getDriverName();
+                return context.getRuntime().newBoolean( driver.indexOf("jTDS") >= 0 );
+            }
+        });
+    }
+
 }

data/src/java/arjdbc/mysql/MySQLRubyJdbcConnection.java

@@ -41,6 +41,8 @@ import java.sql.Types;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.TimeZone;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
@@ -232,17 +234,46 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
     @Override
     protected Connection newConnection() throws RaiseException, SQLException {
         final Connection connection = super.newConnection();
-        killCancelTimer(connection);
+        if ( doKillCancelTimer(connection) ) killCancelTimer(connection);
         return connection;
     }
 
+    private static Boolean killCancelTimer;
+    static {
+        final String killTimer = System.getProperty("arjdbc.mysql.kill_cancel_timer");
+        if ( killTimer != null ) killCancelTimer = Boolean.parseBoolean(killTimer);
+    }
+
+    private static boolean doKillCancelTimer(final Connection connection) throws SQLException {
+        if ( killCancelTimer == null ) {
+            synchronized (MySQLRubyJdbcConnection.class) {
+                final String version = connection.getMetaData().getDriverVersion();
+                if ( killCancelTimer == null ) {
+                    String regex = "mysql\\-connector\\-java-(\\d)\\.(\\d)\\.(\\d+)";
+                    Matcher match = Pattern.compile(regex).matcher(version);
+                    if ( match.find() ) {
+                        final int major = Integer.parseInt( match.group(1) );
+                        final int minor = Integer.parseInt( match.group(2) );
+                        if ( major < 5 || ( major == 5 && minor <= 1 ) ) {
+                            final int patch = Integer.parseInt( match.group(3) );
+                            killCancelTimer = patch < 11;
+                        }
+                    }
+                    else {
+                        killCancelTimer = Boolean.FALSE;
+                    }
+                }
+            }
+        }
+        return killCancelTimer;
+    }
+
     /**
      * HACK HACK HACK See http://bugs.mysql.com/bug.php?id=36565
      * MySQL's statement cancel timer can cause memory leaks, so cancel it
      * if we loaded MySQL classes from the same class-loader as JRuby
      *
-     * NOTE: this will likely do nothing on a recent driver esp. since MySQL's
-     * Connector/J supports JDBC 4.0 (Java 6+) which we now require at minimum
+     * NOTE: MySQL Connector/J 5.1.11 (2010-01-21) fixed the issue !
      */
     private void killCancelTimer(final Connection connection) {
         if (connection.getClass().getClassLoader() == getRuntime().getJRubyClassLoader()) {

data/src/java/arjdbc/sqlite3/SQLite3RubyJdbcConnection.java

@@ -116,6 +116,50 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
         return statement;
     }
 
+    @Override
+    protected IRubyObject indexes(final ThreadContext context, String tableName, final String name, String schemaName) {
+        int i = -1;
+        if ( tableName != null ) i = tableName.indexOf('.');
+        if ( i > 0 && schemaName == null ) {
+            schemaName = tableName.substring(0, i);
+            tableName = tableName.substring(i + 1);
+        }
+        return super.indexes(context, tableName, name, schemaName);
+    }
+
+    @Override
+    protected TableName extractTableName(
+            final Connection connection, String catalog, String schema,
+            final String tableName) throws IllegalArgumentException, SQLException {
+
+        final String[] nameParts = tableName.split("\\.");
+        if ( nameParts.length > 3 ) {
+            throw new IllegalArgumentException("table name: " + tableName + " should not contain more than 2 '.'");
+        }
+
+        String name = tableName;
+
+        if ( nameParts.length == 2 ) {
+            schema = nameParts[0];
+            name = nameParts[1];
+        }
+        else if ( nameParts.length == 3 ) {
+            catalog = nameParts[0];
+            schema = nameParts[1];
+            name = nameParts[2];
+        }
+
+        name = caseConvertIdentifierForJdbc(connection, name);
+
+        if ( schema != null ) {
+            schema = caseConvertIdentifierForJdbc(connection, schema);
+            // NOTE: hack to work-around SQLite JDBC ignoring schema :
+            return new TableName(catalog, null, schema + '.' + name);
+        }
+
+        return new TableName(catalog, schema, name);
+    }
+
     @Override
     protected IRubyObject jdbcToRuby(final ThreadContext context,
         final Ruby runtime, final int column, int type, final ResultSet resultSet)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Nick Sieger, Ola Bini and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2013-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -248,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: jruby-extras
-rubygems_version: 2.1.0
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: JDBC adapter for ActiveRecord, for use within JRuby on Rails.