activerecord-jdbc-adapter 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 928b3af97782b45db074f63a7c5a3242e7223ea9
-  data.tar.gz: ad5a1f8133f58957d7ab2f9678367523b85c29a9
+  metadata.gz: a2ea14fa2985e6b568284ddd24df9db9511f6437
+  data.tar.gz: 72570ca5a15d8f3bd04b3efc5c9b3c7b86911215
 SHA512:
-  metadata.gz: be7f8bbb664f74030fc79097e8f6b673b5ed93acfc348271ccfe6fa9b1e3c3098f34afbb071d597bdb8dad561828c0912a443516848a43dfd56f19653fbe7c4a
-  data.tar.gz: 60516ac2d7c14bb124b8215400368152014ff00e32a8a9b4c7790cdbcb4eaf8fe9c3ffc3510d23e20277850469e9d41a2ab23d8e2640a0ba0206ea41e1bd81c4
+  metadata.gz: 72bbce793d260cfdd46f81007543bd0e6aff6a81149b45e0d21de5cef98e0c96b6cdb1127b1dc7ab03a372510a664c70996dd879ca7d7a53f5a3b32f89466a0e
+  data.tar.gz: 07087ad9b681f0c0d6cb4008fc5f432991baf24fd62615e9864d8c420938c8585767c324493c239888ff50550bd76aa1b5a3e943eb0716d4a14615dbd36ad39d

data/.travis.yml

@@ -2,6 +2,9 @@ language: ruby
 bundler_args: --without development
 script: bundle exec rake test_$DB
 before_script: export JRUBY_OPTS="--server -Xcext.enabled=false -Xcompile.invokedynamic=false"
+before_install:
+  #- gem update --system 2.1.11
+  #- 'ruby -e "puts RUBY_VERSION" | grep ^1\.8 && gem update --system -v 2.1.11 || true'
 rvm:
   - jruby
 gemfile:
@@ -37,8 +40,8 @@ branches:
     - master
     - 1-2-stable
 matrix:
-  allow_failures:
-    - gemfile: gemfiles/rails41.gemfile
+  #allow_failures:
+    #- gemfile: gemfiles/rails41.gemfile
   exclude:
     # Rails 4 prefers Ruby 2.0 (or at least >= 1.9.3) :
     - rvm: jruby

data/Gemfile

@@ -26,6 +26,7 @@ gem 'mocha', '~> 0.13.1', :require => nil, :group => :test
 
 gem 'simplecov', :require => nil, :group => :test
 gem 'bcrypt-ruby', '~> 3.0.0', :require => nil, :group => :test
+#gem 'trinidad_dbpool', :require => nil, :group => :test
 
 group :rails do
   gem 'erubis', :require => nil

data/History.md

@@ -1,3 +1,15 @@
+## 1.3.5 (01/10/14)
+
+We're now green against Rails 4.1 (master), test and report issues if any.
+
+- improved support for `config[:jndi]` with all supported custom adapters
+- [mysql] fix incompatible character encodings: ASCII-8BIT and UTF-8
+- rails 4.1 - create_table_definition changed from 3 to 4 parameters (#522)
+- [firebird] Insert quotes for blobs to prevent failed inserts on not-null cols
+
+Code Contributors: Ray Zane, Gary S. Weaver
+Code Contributors: @rzane, @garysweaver
+
 ## 1.3.4 (12/12/13)
 
 - [postgres] unwrap connection instead of casting when adding custom types (#515)

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2013 Karol Bucek <self@kares.org>
+Copyright (c) 2012-2014 Karol Bucek <self@kares.org>
 Copyright (c) 2006-2012 Nick Sieger <nick@nicksieger.com>
 Copyright (c) 2006-2008 Ola Bini <ola.bini@gmail.com>
 

data/README.md

@@ -95,15 +95,19 @@ development:
   url: jdbc:mysql://localhost:3306/blog_development
 ```
 
-For JNDI data sources, you may simply specify the JNDI location as follows (the
-correct database type will be automatically detected):
+For JNDI data sources, you may simply specify the JNDI location as follows, it's
+recommended to use the same adapter: setting as one would configure when using
+"bare" (JDBC) connections e.g. :
 
 ```yml
 production:
-  adapter: jndi # jdbc
+  adapter: postgresql
   jndi: jdbc/PostgreDS
 ```
 
+**NOTE:** any other settings such as *database:*, *username:*, *properties:* make
+no difference since everything is already configured on the JNDI DataSource end.
+
 JDBC driver specific properties might be set if you use an URL to specify the DB
 or preferably using the *properties:* syntax:
 
@@ -238,8 +242,10 @@ ask on the #JRuby IRC channel on http://freenode.net/ (try [web-chat][6]).
 
 ## Authors
 
-This project was written by Nick Sieger <nick@nicksieger.com> and Ola Bini
-<olabini@gmail.com> with lots of help from the JRuby community.
+This project was originally written by [Nick Sieger](http://github.com/nicksieger)
+and [Ola Bini](http://github.com/olabini) with lots of help from the JRuby community.
+Polished 3.x compatibility and 4.x support (for AR-JDBC >= 1.3.0) was managed by
+[Karol Bucek](http://github.com/kares) among others.
 
 ## License
 

data/activerecord-jdbc-adapter.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |gem|
   gem.name = 'activerecord-jdbc-adapter'
   gem.version = ArJdbc::VERSION
   gem.platform = Gem::Platform::RUBY
-  gem.authors = ['Nick Sieger, Ola Bini and JRuby contributors']
-  gem.email = ['nick@nicksieger.com', 'ola.bini@gmail.com']
+  gem.authors = ['Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors']
+  gem.email = ['nick@nicksieger.com', 'ola.bini@gmail.com', 'self@kares.org']
   gem.homepage = 'https://github.com/jruby/activerecord-jdbc-adapter'
   gem.license = "BSD"
   gem.summary = 'JDBC adapter for ActiveRecord, for use within JRuby on Rails.'

data/lib/arjdbc/db2/adapter.rb

@@ -428,6 +428,11 @@ module ArJdbc
       @connection.execute_update "call sysproc.admin_cmd('RUNSTATS ON TABLE #{tablename} WITH DISTRIBUTION AND DETAILED INDEXES ALL UTIL_IMPACT_PRIORITY #{priority}')"
     end
 
+    def select(sql, name, binds)
+      # DB2 does not like "= NULL", "!= NULL", or "<> NULL".
+      exec_query(to_sql(sql.gsub(/(!=|<>)\s*null/i, "IS NOT NULL").gsub(/=\s*null/i, "IS NULL"), binds), name, binds)
+    end
+
     def add_index(table_name, column_name, options = {})
       if ! zos? || ( table_name.to_s == ActiveRecord::Migrator.schema_migrations_table_name.to_s )
         column_name = column_name.to_s if column_name.is_a?(Symbol)

data/lib/arjdbc/db2/connection_methods.rb

@@ -1,6 +1,10 @@
 ArJdbc::ConnectionMethods.module_eval do
   # @note Assumes DB2 driver (*db2jcc.jar*) is on class-path.
   def db2_connection(config)
+    config[:adapter_spec] ||= ::ArJdbc::DB2
+
+    return jndi_connection(config) if jndi_config?(config)
+
     config[:url] ||= begin
       if config[:host] # Type 4 URL: jdbc:db2://server:port/database
         config[:port] ||= 50000
@@ -10,7 +14,6 @@ ArJdbc::ConnectionMethods.module_eval do
       end
     end
     config[:driver] ||= ::ArJdbc::DB2::DRIVER_NAME
-    config[:adapter_spec] ||= ::ArJdbc::DB2
     config[:connection_alive_sql] ||= 'SELECT 1 FROM syscat.tables FETCH FIRST 1 ROWS ONLY'
     jdbc_connection(config)
   end
@@ -18,6 +21,10 @@ ArJdbc::ConnectionMethods.module_eval do
 
   # @note Assumes AS400 driver (*jt400.jar*) is on class-path.
   def as400_connection(config)
+    config[:adapter_spec] ||= ::ArJdbc::AS400
+
+    return jndi_connection(config) if config[:jndi]
+
     config[:url] ||= begin
       # jdbc:as400://[host]
       url = 'jdbc:as400://'
@@ -30,7 +37,6 @@ ArJdbc::ConnectionMethods.module_eval do
     end
     require 'arjdbc/db2/as400'
     config[:driver] ||= ::ArJdbc::AS400::DRIVER_NAME
-    config[:adapter_spec] ||= ::ArJdbc::AS400
     config[:connection_alive_sql] ||= 'SELECT 1 FROM sysibm.tables FETCH FIRST 1 ROWS ONLY'
     jdbc_connection(config)
   end

data/lib/arjdbc/derby/connection_methods.rb

@@ -1,5 +1,9 @@
 ArJdbc::ConnectionMethods.module_eval do
   def derby_connection(config)
+    config[:adapter_spec] ||= ::ArJdbc::Derby
+
+    return jndi_connection(config) if jndi_config?(config)
+
     begin
       require 'jdbc/derby'
       ::Jdbc::Derby.load_driver(:require) if defined?(::Jdbc::Derby.load_driver)
@@ -9,7 +13,6 @@ ArJdbc::ConnectionMethods.module_eval do
     config[:url] ||= "jdbc:derby:#{config[:database]};create=true"
     config[:driver] ||= defined?(::Jdbc::Derby.driver_name) ?
       ::Jdbc::Derby.driver_name : 'org.apache.derby.jdbc.EmbeddedDriver'
-    config[:adapter_spec] ||= ::ArJdbc::Derby
 
     embedded_driver(config)
   end

data/lib/arjdbc/firebird/adapter.rb

@@ -75,6 +75,24 @@ module ArJdbc
     # @see #emulate_booleans?
     def self.emulate_booleans=(emulate); @@emulate_booleans = emulate; end
 
+
+    @@update_lob_values = true
+
+    # Updating records with LOB values (binary/text columns) in a separate
+    # statement can be disabled using :
+    #
+    #   ArJdbc::Firebird.update_lob_values = false
+    def self.update_lob_values?; @@update_lob_values; end
+    # @see #update_lob_values?
+    def self.update_lob_values=(update); @@update_lob_values = update; end
+
+    # @see #update_lob_values?
+    def update_lob_values?; Firebird.update_lob_values?; end
+
+    # @see #quote
+    # @private
+    BLOB_VALUE_MARKER = "''"
+
     ADAPTER_NAME = 'Firebird'.freeze
 
     def adapter_name
@@ -222,8 +240,15 @@ module ArJdbc
       return value if sql_literal?(value)
 
       type = column && column.type
+
       # BLOBs are updated separately by an after_save trigger.
-      return "NULL" if type == :binary || type == :text
+      if type == :binary || type == :text
+        if update_lob_values?
+          return value.nil? ? "NULL" : BLOB_VALUE_MARKER
+        else
+          return "'#{quote_string(value)}'"
+        end
+      end
 
       case value
       when String, ActiveSupport::Multibyte::Chars
@@ -279,6 +304,11 @@ module ArJdbc
       quote(0)
     end
 
+    # @override
+    def quote_table_name_for_assignment(table, attr)
+      quote_column_name(attr)
+    end if ::ActiveRecord::VERSION::MAJOR >= 4
+
     # @override
     def quote_column_name(column_name)
       column_name = column_name.to_s

data/lib/arjdbc/firebird/connection_methods.rb

@@ -1,5 +1,9 @@
 ArJdbc::ConnectionMethods.module_eval do
   def firebird_connection(config)
+    config[:adapter_spec] ||= ::ArJdbc::Firebird
+
+    return jndi_connection(config) if jndi_config?(config)
+
     begin
       require 'jdbc/firebird'
       ::Jdbc::Firebird.load_driver(:require)
@@ -12,7 +16,6 @@ ArJdbc::ConnectionMethods.module_eval do
       "jdbc:firebirdsql://#{config[:host]}:#{config[:port]}/#{config[:database]}"
     end
     config[:driver] ||= ::Jdbc::Firebird.driver_name
-    config[:adapter_spec] ||= ::ArJdbc::Firebird
 
     jdbc_connection(config)
   end

data/lib/arjdbc/h2/connection_methods.rb

@@ -1,11 +1,16 @@
 ArJdbc::ConnectionMethods.module_eval do
   def h2_connection(config)
+    config[:adapter_spec] ||= ::ArJdbc::H2
+    config[:adapter_class] = ActiveRecord::ConnectionAdapters::H2Adapter unless config.key?(:adapter_class)
+
+    return jndi_connection(config) if jndi_config?(config)
+
     begin
       require 'jdbc/h2'
       ::Jdbc::H2.load_driver(:require) if defined?(::Jdbc::H2.load_driver)
     rescue LoadError # assuming driver.jar is on the class-path
     end
-    
+
     config[:url] ||= begin
       db = config[:database]
       if db[0, 4] == 'mem:' || db[0, 5] == 'file:' || db[0, 5] == 'hsql:'
@@ -15,9 +20,7 @@ ArJdbc::ConnectionMethods.module_eval do
       end
     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
   alias_method :jdbch2_connection, :h2_connection

data/lib/arjdbc/hsqldb/connection_methods.rb

@@ -1,11 +1,16 @@
 ArJdbc::ConnectionMethods.module_eval do
   def hsqldb_connection(config)
+    config[:adapter_spec] ||= ::ArJdbc::HSQLDB
+    config[:adapter_class] = ActiveRecord::ConnectionAdapters::HsqldbAdapter unless config.key?(:adapter_class)
+
+    return jndi_connection(config) if jndi_config?(config)
+
     begin
       require 'jdbc/hsqldb'
       ::Jdbc::HSQLDB.load_driver(:require) if defined?(::Jdbc::HSQLDB.load_driver)
     rescue LoadError # assuming driver.jar is on the class-path
     end
-    
+
     config[:url] ||= begin
       db = config[:database]
       if db[0, 4] == 'mem:' || db[0, 5] == 'file:' || db[0, 5] == 'hsql:'
@@ -15,10 +20,8 @@ ArJdbc::ConnectionMethods.module_eval do
       end
     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)
   end
   alias_method :jdbchsqldb_connection, :hsqldb_connection

data/lib/arjdbc/jdbc/adapter.rb

@@ -699,9 +699,12 @@ module ActiveRecord
       alias table_definition create_table_definition
 
       # `TableDefinition.new native_database_types, name, temporary, options`
+      # and ActiveRecord 4.1 supports optional `as` argument (which defaults
+      # to nil) to provide the SQL to use to generate the table:
+      # `TableDefinition.new native_database_types, name, temporary, options, as`
       # @private
-      def create_table_definition(name, temporary, options)
-        table_definition(name, temporary, options)
+      def create_table_definition(*args)
+        table_definition(*args)
       end
 
       # @note AR-4x arguments expected: `(name, temporary, options)`

data/lib/arjdbc/jdbc/connection.rb

@@ -36,6 +36,10 @@ module ActiveRecord
       # @deprecated no longer used - only kept for compatibility
       def set_native_database_types; end
 
+      def self.jndi_config?(config)
+        config[:jndi] || config[:data_source]
+      end
+
       def jndi?; @jndi; end
       alias_method :jndi_connection?, :jndi?
 
@@ -46,7 +50,7 @@ module ActiveRecord
       # @note this has nothing to do with the configure_connection implemented
       # on some of the concrete adapters (e.g. {#ArJdbc::Postgres})
       def setup_connection_factory
-        if config[:jndi] || config[:data_source]
+        if self.class.jndi_config?(config)
           begin
             setup_jndi_factory
           rescue => e

data/lib/arjdbc/jdbc/connection_methods.rb

@@ -5,19 +5,26 @@ module ArJdbc
     ConnectionMethods = (class << ActiveRecord::Base; self; end)
   end
   ConnectionMethods.module_eval do
-    
+
     def jdbc_connection(config)
       adapter_class = config[:adapter_class]
       adapter_class ||= ::ActiveRecord::ConnectionAdapters::JdbcAdapter
       adapter_class.new(nil, logger, config)
     end
-    alias jndi_connection jdbc_connection
+
+    def jndi_connection(config); jdbc_connection(config) end
 
     def embedded_driver(config)
       config[:username] ||= "sa"
       config[:password] ||= ""
       jdbc_connection(config)
     end
-    
+
+    private
+
+    def jndi_config?(config)
+      ::ActiveRecord::ConnectionAdapters::JdbcConnection.jndi_config?(config)
+    end
+
   end
 end

data/lib/arjdbc/mssql/connection_methods.rb

@@ -11,6 +11,11 @@ ArJdbc::ConnectionMethods.module_eval do
       return sqlserver_connection(config)
     end
 
+    config[:adapter_spec] ||= ::ArJdbc::MSSQL
+    config[:adapter_class] = ActiveRecord::ConnectionAdapters::MSSQLAdapter unless config.key?(:adapter_class)
+
+    return jndi_connection(config) if jndi_config?(config)
+
     begin
       require 'jdbc/jtds'
       # NOTE: the adapter has only support for working with the
@@ -23,8 +28,6 @@ ArJdbc::ConnectionMethods.module_eval do
     config[:host] ||= 'localhost'
     config[:port] ||= 1433
     config[:driver] ||= defined?(::Jdbc::JTDS.driver_name) ? ::Jdbc::JTDS.driver_name : 'net.sourceforge.jtds.jdbc.Driver'
-    config[:adapter_spec] ||= ::ArJdbc::MSSQL
-    config[:adapter_class] = ActiveRecord::ConnectionAdapters::MSSQLAdapter unless config.key?(:adapter_class)
     config[:connection_alive_sql] ||= 'SELECT 1'
 
     config[:url] ||= begin
@@ -49,10 +52,13 @@ ArJdbc::ConnectionMethods.module_eval do
 
   # @note Assumes SQLServer SQL-JDBC driver on the class-path.
   def sqlserver_connection(config)
-    config[:host] ||= 'localhost'
-    config[:driver] ||= 'com.microsoft.sqlserver.jdbc.SQLServerDriver'
     config[:adapter_spec] ||= ::ArJdbc::MSSQL
     config[:adapter_class] = ActiveRecord::ConnectionAdapters::MSSQLAdapter unless config.key?(:adapter_class)
+
+    return jndi_connection(config) if jndi_config?(config)
+
+    config[:host] ||= 'localhost'
+    config[:driver] ||= 'com.microsoft.sqlserver.jdbc.SQLServerDriver'
     config[:connection_alive_sql] ||= 'SELECT 1'
 
     config[:url] ||= begin

data/lib/arjdbc/mysql/adapter.rb

@@ -152,8 +152,8 @@ module ArJdbc
       return value if sql_literal?(value)
       return value.to_s if column && column.type == :primary_key
 
-      if value.kind_of?(String) && column && column.type == :binary && column.class.respond_to?(:string_to_binary)
-        "x'#{column.class.string_to_binary(value).unpack("H*")[0]}'"
+      if value.kind_of?(String) && column && column.type == :binary
+        "x'#{value.unpack("H*")[0]}'"
       elsif value.kind_of?(BigDecimal)
         value.to_s("F")
       else

data/lib/arjdbc/mysql/connection_methods.rb

@@ -1,5 +1,10 @@
 ArJdbc::ConnectionMethods.module_eval do
   def mysql_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/mysql'
       ::Jdbc::MySQL.load_driver(:require) if defined?(::Jdbc::MySQL.load_driver)
@@ -19,8 +24,6 @@ ArJdbc::ConnectionMethods.module_eval do
       config[:url] = url
     end
     config[:driver] ||= defined?(::Jdbc::MySQL.driver_name) ? ::Jdbc::MySQL.driver_name : 'com.mysql.jdbc.Driver'
-    config[:adapter_spec] ||= ::ArJdbc::MySQL
-    config[:adapter_class] = ActiveRecord::ConnectionAdapters::MysqlAdapter unless config.key?(:adapter_class)
 
     properties = ( config[:properties] ||= {} )
     properties['zeroDateTimeBehavior'] ||= 'convertToNull'

data/lib/arjdbc/oracle/connection_methods.rb

@@ -3,11 +3,14 @@ ArJdbc::ConnectionMethods.module_eval do
   # *thin* method to connect to the Oracle DB.
   # @note Oracle's JDBC driver should be on the class-path.
   def oracle_connection(config)
+    config[:adapter_spec] ||= ::ArJdbc::Oracle
+    config[:adapter_class] = ActiveRecord::ConnectionAdapters::OracleAdapter unless config.key?(:adapter_class)
+
+    return jndi_connection(config) if jndi_config?(config)
+
     config[:port] ||= 1521
     config[:url] ||= "jdbc:oracle:thin:@#{config[:host]}:#{config[:port]}:#{config[:database]}"
     config[:driver] ||= "oracle.jdbc.driver.OracleDriver"
-    config[:adapter_spec] ||= ::ArJdbc::Oracle
-    config[:adapter_class] = ActiveRecord::ConnectionAdapters::OracleAdapter unless config.key?(:adapter_class)
     config[:connection_alive_sql] ||= 'SELECT 1 FROM DUAL'
     jdbc_connection(config)
   end

data/lib/arjdbc/postgresql/connection_methods.rb

@@ -1,10 +1,16 @@
 ArJdbc::ConnectionMethods.module_eval do
   def postgresql_connection(config)
+    config[:adapter_spec] ||= ::ArJdbc::PostgreSQL
+    config[:adapter_class] = ActiveRecord::ConnectionAdapters::PostgreSQLAdapter unless config.key?(:adapter_class)
+
+    return jndi_connection(config) if jndi_config?(config)
+
     begin
       require 'jdbc/postgres'
       ::Jdbc::Postgres.load_driver(:require) if defined?(::Jdbc::Postgres.load_driver)
     rescue LoadError # assuming driver.jar is on the class-path
     end
+    config[:driver] ||= defined?(::Jdbc::Postgres.driver_name) ? ::Jdbc::Postgres.driver_name : 'org.postgresql.Driver'
 
     host = config[:host] ||= ( config[:hostaddr] || ENV['PGHOST'] || 'localhost' )
     port = config[:port] ||= ( ENV['PGPORT'] || 5432 )
@@ -36,10 +42,6 @@ ArJdbc::ConnectionMethods.module_eval do
     properties['tcpKeepAlive'] ||= config[:keepalives] if config.key?(:keepalives)
     properties['kerberosServerName'] ||= config[:krbsrvname] if config[:krbsrvname]
 
-    config[:driver] ||= defined?(::Jdbc::Postgres.driver_name) ? ::Jdbc::Postgres.driver_name : 'org.postgresql.Driver'
-    config[:adapter_spec] ||= ::ArJdbc::PostgreSQL
-    config[:adapter_class] = ActiveRecord::ConnectionAdapters::PostgreSQLAdapter unless config.key?(:adapter_class)
-
     jdbc_connection(config)
   end
   alias_method :jdbcpostgresql_connection, :postgresql_connection

data/lib/arjdbc/sqlite3/connection_methods.rb

@@ -1,5 +1,10 @@
 ArJdbc::ConnectionMethods.module_eval do
   def sqlite3_connection(config)
+    config[:adapter_spec] ||= ::ArJdbc::SQLite3
+    config[:adapter_class] = ActiveRecord::ConnectionAdapters::SQLite3Adapter unless config.key?(:adapter_class)
+
+    return jndi_connection(config) if jndi_config?(config)
+
     begin
       require 'jdbc/sqlite3'
       ::Jdbc::SQLite3.load_driver(:require) if defined?(::Jdbc::SQLite3.load_driver)
@@ -10,8 +15,6 @@ ArJdbc::ConnectionMethods.module_eval do
     database = config[:database] # NOTE: "jdbc:sqlite::memory:" syntax is supported
     config[:url] ||= "jdbc:sqlite:#{database == ':memory:' ? '' : database}"
     config[:driver] ||= defined?(::Jdbc::SQLite3.driver_name) ? ::Jdbc::SQLite3.driver_name : 'org.sqlite.JDBC'
-    config[:adapter_spec] ||= ::ArJdbc::SQLite3
-    config[:adapter_class] = ActiveRecord::ConnectionAdapters::SQLite3Adapter unless config.key?(:adapter_class)
     config[:connection_alive_sql] ||= 'SELECT 1'
 
     options = ( config[:properties] ||= {} )

data/lib/arjdbc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
-- Nick Sieger, Ola Bini and JRuby contributors
+- Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -33,6 +33,7 @@ description: 'AR-JDBC is a database adapter for Rails'' ActiveRecord component d
 email:
 - nick@nicksieger.com
 - ola.bini@gmail.com
+- self@kares.org
 executables: []
 extensions: []
 extra_rdoc_files: []