activerecord-jdbc-adapter 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 124d430b6ebfe8dea7139529cba9765cbbf4bbec
-  data.tar.gz: 8284f14f06a740097c25cdd949acda28a540cb67
+  metadata.gz: a0441e4d8245ad0891db71d08c1d484304c319ab
+  data.tar.gz: a60418477bfbd7ad65c2a1517a6c53dec0158cf1
 SHA512:
-  metadata.gz: 7c8a1b98c72e0f34833754c73776b1b97f2518bead5f39da18ef7ae1f37ef19f1ec9571d7056bcb7d327cb492c0b909736b791ad20e361e392552398df481ee5
-  data.tar.gz: 7d6f465fcc7cf7cf38a560c73dbf75c9ce39337a4bb8fea3a4452811d8df2b4ec6f665a7544734a6cae60e9241a818e05f764cf03a5f8f4698fb575a92b7128f
+  metadata.gz: b0e278d10109cfb86a7eb626dda7ab13f2bd789eb64b9cf71b9f9a8b7d41411a0ec67a9811aa12b0a0fb78490e910292b10c542785045d6346b70ac5f3f2bece
+  data.tar.gz: 8418e4e1f59bc327a899acd31639bb4f4f607f87fc693add1e056cc230f6a44bce189fc657d01be6d3e4f953f5e8826ac40c1f5d69721e32c7ad488bab9a7456

data/History.md

@@ -1,3 +1,23 @@
+## 1.3.2 (10/11/13)
+
+- when "pop-ing" current savepoint name - consider open transaction count (#477)
+- [postgres] we should return "raw" hstore values on AR < 4.0 by default
+  (regression caused by fixing #454 for AR >= 4.0)
+- [postgres] needs ColumnDefinition.array? method used by SchemaCreation (#474)
+- [mysql] backported bulk change table support from Rails (fixes #469)
+- support MySQL's failover host configurations (multiple hosts specified)
+- set JDBC specific config values as properties instead of URL options
+- SQLite3's version object should return a string on `to_s`
+- [sqlite3] support :timeout option as busy_timeout (similar to Rails)
+- [sqlite3] mkdir for sqlite database (path) - just like AR 4.0 now does
+- [postgres] handle :connect_timeout, :sslmode, :keepalives & :krbsrvname
+- [postgres] support :hostaddr, :user and :dbname options just like Rails does
+- fix rake task name **db:structure:load** - missing db: prefix (#465)
+- Prevent rake from throwing an exception when task w/o comment is redefined
+
+Code Contributors (in no particular order): Prathamesh Sonpatki, Stefan Wrobel,
+Micah Jaffe, Rajan Agaskar
+
 ## 1.3.1 (09/17/13)
 
 - helper gems should contain all files from lib/* (#463)

data/README.md

@@ -13,9 +13,9 @@ JRubies) thus Java >= **1.6** is mandatory.
 #### AR-JDBC **1.3.x** is a recommended update for all **1.2.x** users.
 
 Our latest major version **1.3.x** represents a few months of refactoring and
-updates covering (not just) new *ActiveRecord* features. It tries to stay compatible
-with 1.2.9 as much as possible but please be aware that it's not always possible
-(mostly for the best), please read our [migration guide][8] for details.
+updates covering (not just) new/old *ActiveRecord* features. It tries to stay
+compatible with 1.2.9 as much as possible but please be aware that it's not always
+possible(mostly for the best), please read our [migration guide][8] for details.
 
 ## Databases
 
@@ -46,30 +46,26 @@ adapters are available:
   - HSQLDB (`activerecord-jdbchsqldb-adapter`)
   - H2 (`activerecord-jdbch2-adapter`)
   - MSSQL (`activerecord-jdbcmssql-adapter`) - uses the OSS jTDS driver by default
-    which might have issues with the latest SQLServer (does not support SQL Azure)
+    which might have issues with the latest SQLServer (but should work using the
+    Microsoft JDBC Driver for SQL Server - we recommend using 4.0)
 
-2a. For Rails 3, if you're generating a new application, use the
-following command to generate your application:
+2a. If you're generating a new Rails application, use the following command:
 
     jruby -S rails new sweetapp
 
 2b. Otherwise, you might need to perform some extra configuration steps
 to prepare your Rails application for JDBC.
 
-If you're using Rails 3, you'll need to modify your *Gemfile* to use the
-*activerecord-jdbc-adapter* gem under JRuby. Change your *Gemfile* to look
-like the following (using MySQL as an example):
+You'll need to modify your *Gemfile* to use the *activerecord-jdbc-adapter* gem
+(or one of the helper gems) under JRuby. Change your *Gemfile* to look something
+like the following:
 
 ```ruby
-gem 'mysql', platform: :ruby
-
-platforms :jruby do
-  gem 'jruby-openssl'
-  gem 'activerecord-jdbcmysql-adapter'
-end
+gem 'mysql2', platform: :ruby
+gem 'activerecord-jdbcmysql-adapter', platform: :jruby
 ```
 
-If you're using Rails 2.3:
+If you're (stuck) using Rails 2.3, you might need to:
 
     jruby script/generate jdbc
 
@@ -77,11 +73,10 @@ If you're using Rails 2.3:
 
 ```yml
 development:
-  adapter: mysql
+  adapter: mysql2 # or mysql
+  database: blog_development
   username: blog
   password: 1234
-  host: localhost
-  database: blog_development
 ```
 
 **Legacy Configuration:** If you use one of the *activerecord-jdbcxxx-adapter*
@@ -95,22 +90,22 @@ class and URL (do not forget to put the driver .jar(s) on the class-path) e.g.:
 development:
   adapter: jdbc
   username: blog
-  password:
+  password: 1234
   driver: com.mysql.jdbc.Driver
   url: jdbc:mysql://localhost:3306/blog_development
 ```
 
 For JNDI data sources, you may simply specify the JNDI location as follows (the
-correct adapter type will be automatically detected):
+correct database type will be automatically detected):
 
 ```yml
 production:
-  adapter: jdbc
-  jndi: jdbc/PostgreDB
+  adapter: jndi # jdbc
+  jndi: jdbc/PostgreDS
 ```
 
 JDBC driver specific properties might be set if you use an URL to specify the DB
-or using the *properties:* syntax (available since AR-JDBC **1.2.6**):
+or preferably using the *properties:* syntax:
 
 ```yml
 production:
@@ -128,7 +123,6 @@ If you're really old school you might want to use AR-JDBC with a DB2 on z/OS:
 ```yml
 development:
   adapter: jdbc
-  encoding: unicode
   url: jdbc:db2j:net://mightyzoshost:446/RAILS_DBT1
   driver: com.ibm.db2.jcc.DB2Driver
   schema: DB2XB12
@@ -136,23 +130,19 @@ development:
   tablespace: TSDE911
   lob_tablespaces:
     first_table: TSDE912
-  username: scott
-  password: lion
-```
-
-If your SGBD isn't automatically discovered you can force a dialect as well:
-
-```yml
-development:
-  [...]
-  dialect: as400 # For example
+  username: business
+  password: machines
+  encoding: unicode
+  # you can force a (DB2) dialect using:
+  #dialect: as400
 ```
 
 More information on (configuring) AR-JDBC might be found on our [wiki][5].
 
 ### Standalone with ActiveRecord
 
-Once the setup is made (see below) you can establish a JDBC connection like this (e.g. for `activerecord-jdbcderby-adapter`):
+Once the setup is made (see below) you can establish a JDBC connection like this
+(e.g. for `activerecord-jdbcderby-adapter`):
 
 ```ruby
 ActiveRecord::Base.establish_connection(
@@ -161,7 +151,7 @@ ActiveRecord::Base.establish_connection(
 )
 ```
 
-or using (requires that you manually put the driver jar on the classpath):
+or using (requires that you manually put the driver jar on the class-path):
 
 ```ruby
 ActiveRecord::Base.establish_connection(
@@ -173,11 +163,11 @@ ActiveRecord::Base.establish_connection(
 
 #### Using Bundler
 
-Proceed as with Rails; specify the ActiveRecord gem in your Bundle along with
-the chosen (JDBC) adapters this time sample *Gemfile* for MySQL:
+Proceed as with Rails; specify `ActiveRecord` in your Bundle along with the
+chosen JDBC adapter(s), this time sample *Gemfile* for MySQL:
 
 ```ruby
-gem 'activerecord', '~> 3.2.13'
+gem 'activerecord', '~> 3.2.14'
 gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
 ```
 

data/gemfiles/rails23.gemfile

@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "thread_safe", :require=>nil
-gem "jruby-openssl", :platform=>:jruby
 gem "rake", :require=>nil
 gem "appraisal", :require=>nil
 gem "test-unit", "2.5.4", :group=>:test

data/gemfiles/rails23.gemfile.lock

@@ -18,9 +18,6 @@ GEM
     atomic (1.1.10-java)
     bcrypt-ruby (3.0.1)
     bcrypt-ruby (3.0.1-java)
-    bouncy-castle-java (1.5.0147)
-    jruby-openssl (0.8.8)
-      bouncy-castle-java (>= 1.5.0147)
     metaclass (0.0.1)
     mocha (0.13.3)
       metaclass (~> 0.0.1)
@@ -54,7 +51,6 @@ DEPENDENCIES
   activerecord (~> 2.3.18)
   appraisal
   bcrypt-ruby (~> 3.0.0)
-  jruby-openssl
   mocha (~> 0.13.1)
   mysql2
   pg

data/gemfiles/rails30.gemfile

@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "thread_safe", :require=>nil
-gem "jruby-openssl", :platform=>:jruby
 gem "rake", :require=>nil
 gem "appraisal", :require=>nil
 gem "test-unit", "2.5.4", :group=>:test

data/gemfiles/rails30.gemfile.lock

@@ -19,11 +19,8 @@ GEM
     atomic (1.1.10-java)
     bcrypt-ruby (3.0.1)
     bcrypt-ruby (3.0.1-java)
-    bouncy-castle-java (1.5.0147)
     builder (2.1.2)
     i18n (0.5.0)
-    jruby-openssl (0.8.8)
-      bouncy-castle-java (>= 1.5.0147)
     metaclass (0.0.1)
     mocha (0.13.3)
       metaclass (~> 0.0.1)
@@ -53,7 +50,6 @@ DEPENDENCIES
   activerecord (~> 3.0.20)
   appraisal
   bcrypt-ruby (~> 3.0.0)
-  jruby-openssl
   mocha (~> 0.13.1)
   mysql2
   pg

data/gemfiles/rails31.gemfile

@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "thread_safe", :require=>nil
-gem "jruby-openssl", :platform=>:jruby
 gem "rake", :require=>nil
 gem "appraisal", :require=>nil
 gem "test-unit", "2.5.4", :group=>:test

data/gemfiles/rails31.gemfile.lock

@@ -20,11 +20,8 @@ GEM
     atomic (1.1.10-java)
     bcrypt-ruby (3.0.1)
     bcrypt-ruby (3.0.1-java)
-    bouncy-castle-java (1.5.0147)
     builder (3.0.4)
     i18n (0.6.4)
-    jruby-openssl (0.8.8)
-      bouncy-castle-java (>= 1.5.0147)
     metaclass (0.0.1)
     mocha (0.13.3)
       metaclass (~> 0.0.1)
@@ -51,7 +48,6 @@ DEPENDENCIES
   activerecord (~> 3.1.12)
   appraisal
   bcrypt-ruby (~> 3.0.0)
-  jruby-openssl
   mocha (~> 0.13.1)
   mysql2
   pg

data/gemfiles/rails32.gemfile

@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "thread_safe", :require=>nil
-gem "jruby-openssl", :platform=>:jruby
 gem "rake", :require=>nil
 gem "appraisal", :require=>nil
 gem "test-unit", "2.5.4", :group=>:test

data/gemfiles/rails32.gemfile.lock

@@ -20,11 +20,8 @@ GEM
     atomic (1.1.10-java)
     bcrypt-ruby (3.0.1)
     bcrypt-ruby (3.0.1-java)
-    bouncy-castle-java (1.5.0147)
     builder (3.0.4)
     i18n (0.6.4)
-    jruby-openssl (0.8.8)
-      bouncy-castle-java (>= 1.5.0147)
     metaclass (0.0.1)
     mocha (0.13.3)
       metaclass (~> 0.0.1)
@@ -54,7 +51,6 @@ DEPENDENCIES
   activerecord (~> 3.2.13)
   appraisal
   bcrypt-ruby (~> 3.0.0)
-  jruby-openssl
   mocha (~> 0.13.1)
   mysql2
   pg

data/gemfiles/rails40.gemfile

@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "thread_safe", :require=>nil
-gem "jruby-openssl", :platform=>:jruby
 gem "rake", :require=>nil
 gem "appraisal", :require=>nil
 gem "test-unit", "2.5.4", :group=>:test

data/gemfiles/rails40.gemfile.lock

@@ -24,11 +24,8 @@ GEM
     atomic (1.1.10-java)
     bcrypt-ruby (3.0.1)
     bcrypt-ruby (3.0.1-java)
-    bouncy-castle-java (1.5.0147)
     builder (3.1.4)
     i18n (0.6.4)
-    jruby-openssl (0.8.8)
-      bouncy-castle-java (>= 1.5.0147)
     metaclass (0.0.1)
     minitest (4.7.5)
     mocha (0.13.3)
@@ -54,7 +51,6 @@ DEPENDENCIES
   activerecord (~> 4.0.0)
   appraisal
   bcrypt-ruby (~> 3.0.0)
-  jruby-openssl
   mocha (~> 0.13.1)
   mysql2
   pg

data/gemfiles/rails41.gemfile

@@ -4,7 +4,6 @@ source "https://rubygems.org"
 
 gem "activerecord"
 gem "thread_safe", :require=>nil
-gem "jruby-openssl", :platform=>:jruby
 gem "rake", :require=>nil
 gem "appraisal", :require=>nil
 gem "test-unit", "2.5.4", :group=>:test

data/gemfiles/rails41.gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/rails/rails.git
-  revision: 0b3a078a24819fae8b9df0b0f63a264cece70a7c
+  revision: 0941a109fda0a96403fc9b51249ced7b7ca63447
   branch: master
   specs:
     actionmailer (4.1.0.beta)
@@ -55,13 +55,10 @@ GEM
     atomic (1.1.13-java)
     bcrypt-ruby (3.0.1)
     bcrypt-ruby (3.0.1-java)
-    bouncy-castle-java (1.5.0147)
     builder (3.1.4)
     erubis (2.7.0)
     hike (1.2.3)
     i18n (0.6.5)
-    jruby-openssl (0.8.8)
-      bouncy-castle-java (>= 1.5.0147)
     json (1.8.0)
     json (1.8.0-java)
     mail (2.5.4)
@@ -116,7 +113,6 @@ DEPENDENCIES
   activerecord
   appraisal
   bcrypt-ruby (~> 3.0.0)
-  jruby-openssl
   mocha (~> 0.13.1)
   mysql2
   pg

data/lib/arjdbc/jdbc/adapter.rb

@@ -402,8 +402,15 @@ module ActiveRecord
       # @since 1.3.0
       # @override
       def current_savepoint_name(create = nil)
-        return "active_record_#{open_transactions}" if create
-        @connection.marked_savepoint_names.last || "active_record_#{open_transactions}"
+        open_tx = open_transactions
+        return "active_record_#{open_tx}" if create
+
+        sp_names = @connection.marked_savepoint_names
+        unless sp_names.empty?
+          sp_names[ -(sp_names.size - open_tx + 1) ]
+        else
+          "active_record_#{open_tx}"
+        end
       end
 
       # Executes a SQL query in the context of this connection using the bind

data/lib/arjdbc/mssql/utils.rb

@@ -23,12 +23,23 @@ module ArJdbc
 
       # protected
 
+      # See "Delimited Identifiers": http://msdn.microsoft.com/en-us/library/ms176027.aspx
+      def remove_identifier_delimiters(keyword)
+        if /\A(\[|")(.*)/m.match(keyword)
+          delim, rest = $1, $2
+          if delim == '[' && rest =~ /]\z/ || delim == '"' && rest =~ /"\z/
+            return rest.chop
+          end
+        end
+        keyword
+      end
+
       def unquote_table_name(table_name)
-        unquote_column_name(table_name)
+        remove_identifier_delimiters(table_name)
       end
 
       def unquote_column_name(column_name)
-        column_name.to_s.tr('[]', '')
+        remove_identifier_delimiters(column_name)
       end
 
       def unquote_string(string)
@@ -36,16 +47,16 @@ module ArJdbc
       end
 
       def unqualify_table_name(table_name)
-        table_name.to_s.split('.').last.tr('[]', '')
+        remove_identifier_delimiters(table_name.to_s.split('.').last)
       end
 
       def unqualify_table_schema(table_name)
-        table_name.to_s.split('.')[-2].gsub(/[\[\]]/, '') rescue nil
+        remove_identifier_delimiters(table_name.to_s.split('.')[-2]) rescue nil
       end
 
       def unqualify_db_name(table_name)
         table_names = table_name.to_s.split('.')
-        table_names.length == 3 ? table_names.first.tr('[]', '') : nil
+        table_names.length == 3 ? remove_identifier_delimiters(table_names.first) : nil
       end
 
     end

data/lib/arjdbc/mysql/adapter.rb

@@ -3,11 +3,13 @@ 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
+    include BulkChangeTable if const_defined? :BulkChangeTable
 
     # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#jdbc_connection_class
     def self.jdbc_connection_class
@@ -35,8 +37,8 @@ module ArJdbc
 
       # Increase timeout so the server doesn't disconnect us.
       wait_timeout = config[:wait_timeout]
-      wait_timeout = 2147483 unless wait_timeout.is_a?(Fixnum)
-      variables[:wait_timeout] = wait_timeout
+      wait_timeout = self.class.type_cast_config_to_integer(wait_timeout)
+      variables[:wait_timeout] = wait_timeout.is_a?(Fixnum) ? wait_timeout : 2147483
 
       # Make MySQL reject illegal values rather than truncating or blanking them, see
       # http://dev.mysql.com/doc/refman/5.0/en/server-sql-mode.html#sqlmode_strict_all_tables
@@ -65,7 +67,9 @@ module ArJdbc
     end
 
     def strict_mode? # strict_mode is default since AR 4.0
-      config.key?(:strict) ? config[:strict] : ::ActiveRecord::VERSION::MAJOR > 3
+      config.key?(:strict) ?
+        self.class.type_cast_config_to_boolean(config[:strict]) :
+          ::ActiveRecord::VERSION::MAJOR > 3
     end
 
     # @private
@@ -177,11 +181,6 @@ module ArJdbc
       true
     end
 
-    # @override
-    def supports_bulk_alter?
-      true
-    end
-
     # @override
     def supports_index_sort_order?
       # Technically MySQL allows to create indexes with the sort order syntax
@@ -418,7 +417,7 @@ module ArJdbc
       add_column_options!(change_column_sql, options)
       add_column_position!(change_column_sql, options)
       execute(change_column_sql)
-    end unless const_defined? :SchemaCreation
+    end
 
     # @override
     def rename_column(table_name, column_name, new_column_name)
@@ -605,8 +604,6 @@ module ActiveRecord
       class Column < JdbcColumn
         include ::ArJdbc::MySQL::Column
 
-        attr_reader :collation, :strict, :extra
-
         def initialize(name, default, sql_type = nil, null = true, collation = nil, strict = false, extra = "")
           if Hash === name
             super # first arg: config

data/lib/arjdbc/mysql/bulk_change_table.rb

@@ -0,0 +1,107 @@
+module ArJdbc
+  module MySQL
+    module BulkChangeTable
+
+      # @override
+      def supports_bulk_alter?
+        true
+      end
+
+      def bulk_change_table(table_name, operations)
+        sqls = operations.map do |command, args|
+          table, arguments = args.shift, args
+          method = :"#{command}_sql"
+
+          if respond_to?(method, true)
+            send(method, table, *arguments)
+          else
+            raise "Unknown method called : #{method}(#{arguments.inspect})"
+          end
+        end
+        sqls.flatten!
+
+        execute("ALTER TABLE #{quote_table_name(table_name)} #{sqls.join(", ")}")
+      end
+
+      protected
+
+      def add_column_sql(table_name, column_name, type, options = {})
+        add_column_sql = "ADD #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
+        add_column_options!(add_column_sql, options)
+        add_column_position!(add_column_sql, options)
+        add_column_sql
+      end
+
+      def change_column_sql(table_name, column_name, type, options = {})
+        column = column_for(table_name, column_name)
+
+        unless options_include_default?(options)
+          options[:default] = column.default
+        end
+
+        unless options.has_key?(:null)
+          options[:null] = column.null
+        end
+
+        change_column_sql = "CHANGE #{quote_column_name(column_name)} #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
+        add_column_options!(change_column_sql, options)
+        add_column_position!(change_column_sql, options)
+        change_column_sql
+      end
+
+      def rename_column_sql(table_name, column_name, new_column_name)
+        options = {}
+
+        if column = columns(table_name).find { |c| c.name == column_name.to_s }
+          options[:default] = column.default
+          options[:null] = column.null
+          options[:auto_increment] = (column.extra == "auto_increment")
+        else
+          raise ActiveRecordError, "No such column: #{table_name}.#{column_name}"
+        end
+
+        current_type = select_one("SHOW COLUMNS FROM #{quote_table_name(table_name)} LIKE '#{column_name}'", 'SCHEMA')["Type"]
+        rename_column_sql = "CHANGE #{quote_column_name(column_name)} #{quote_column_name(new_column_name)} #{current_type}"
+        add_column_options!(rename_column_sql, options)
+        rename_column_sql
+      end
+
+      def remove_column_sql(table_name, column_name, type = nil, options = {})
+        "DROP #{quote_column_name(column_name)}"
+      end
+
+      def remove_columns_sql(table_name, *column_names)
+        column_names.map {|column_name| remove_column_sql(table_name, column_name) }
+      end
+
+      def add_index_sql(table_name, column_name, options = {})
+        index_name, index_type, index_columns = add_index_options(table_name, column_name, options)
+        "ADD #{index_type} INDEX #{index_name} (#{index_columns})"
+      end
+
+      def remove_index_sql(table_name, options = {})
+        index_name = index_name_for_remove(table_name, options)
+        "DROP INDEX #{index_name}"
+      end
+
+      def add_timestamps_sql(table_name)
+        [add_column_sql(table_name, :created_at, :datetime), add_column_sql(table_name, :updated_at, :datetime)]
+      end
+
+      def remove_timestamps_sql(table_name)
+        [remove_column_sql(table_name, :updated_at), remove_column_sql(table_name, :created_at)]
+      end
+
+      private
+
+      def add_column_position!(sql, options)
+        if options[:first]
+          sql << " FIRST"
+        elsif options[:after]
+          sql << " AFTER #{quote_column_name(options[:after])}"
+        end
+      end
+
+    end
+  end
+end

data/lib/arjdbc/mysql/column.rb

@@ -10,6 +10,8 @@ module ArJdbc
     # @see ActiveRecord::ConnectionAdapters::JdbcColumn
     module Column
 
+      attr_reader :collation, :strict, :extra
+
       def extract_default(default)
         if sql_type =~ /blob/i || type == :text
           if default.blank?

data/lib/arjdbc/mysql/connection_methods.rb

@@ -7,17 +7,26 @@ ArJdbc::ConnectionMethods.module_eval do
     end
 
     config[:username] = 'root' unless config.key?(:username)
-    config[:port] ||= 3306
-    config[:url] ||= "jdbc:mysql://#{config[:host]}:#{config[:port]}/#{config[:database]}"
+    # jdbc:mysql://[host][,failoverhost...][:port]/[database]
+    # - if the host name is not specified, it defaults to 127.0.0.1
+    # - if the port is not specified, it defaults to 3306
+    # - alternate fail-over syntax: [host:port],[host:port]/[database]
+    unless config[:url]
+      host = config[:host]; host = host.join(',') if host.respond_to?(:join)
+      url = "jdbc:mysql://#{host}"
+      url << ":#{config[:port]}" if config[:port]
+      url << "/#{config[:database]}"
+      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)
 
-    options = (config[:options] ||= {})
-    options['zeroDateTimeBehavior'] ||= 'convertToNull'
-    options['jdbcCompliantTruncation'] ||= 'false'
-    options['useUnicode'] ||= 'true'
-    options['characterEncoding'] = config[:encoding] || 'utf8'
+    properties = ( config[:properties] ||= {} )
+    properties['zeroDateTimeBehavior'] ||= 'convertToNull'
+    properties['jdbcCompliantTruncation'] ||= 'false'
+    properties['useUnicode'] ||= 'true'
+    properties['characterEncoding'] = config[:encoding] || 'utf8'
 
     jdbc_connection(config)
   end

data/lib/arjdbc/mysql/explain_support.rb

@@ -1,4 +1,4 @@
-module ::ArJdbc
+module ArJdbc
   module MySQL
     module ExplainSupport
       def supports_explain?

data/lib/arjdbc/postgresql/adapter.rb

@@ -1257,6 +1257,7 @@ module ActiveRecord::ConnectionAdapters
 
     class ColumnDefinition < ActiveRecord::ConnectionAdapters::ColumnDefinition
       attr_accessor :array
+      def array?; !!@array; end
     end
 
     module ColumnMethods
@@ -1385,5 +1386,9 @@ module ActiveRecord::ConnectionAdapters
       ::ActiveRecord::ConnectionAdapters::PostgreSQLColumn
     end
 
+    if ActiveRecord::VERSION::MAJOR < 4 # Rails 3.x compatibility
+      PostgreSQLJdbcConnection.raw_hstore_type = true if PostgreSQLJdbcConnection.raw_hstore_type? == nil
+    end
+
   end
 end

data/lib/arjdbc/postgresql/connection_methods.rb

@@ -6,11 +6,31 @@ ArJdbc::ConnectionMethods.module_eval do
     rescue LoadError # assuming driver.jar is on the class-path
     end
 
-    config[:host] ||= "localhost"
-    config[:port] ||= 5432
-    config[:username] ||= Java::JavaLang::System.get_property("user.name")
-    config[:url] ||= "jdbc:postgresql://#{config[:host]}:#{config[:port]}/#{config[:database]}"
-    config[:url] << config[:pg_params] if config[:pg_params]
+    host = config[:host] ||= ( config[:hostaddr] || 'localhost' )
+    port = config[:port] ||= 5432
+    database = config[:database] || config[:dbname]
+
+    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']
+    properties = ( config[:properties] ||= {} )
+    # PG :connect_timeout - maximum time to wait for connection to succeed
+    if connect_timeout = config[:connect_timeout]
+      properties['socketTimeout'] ||= connect_timeout
+      # NOTE: maybe set options['loginTimeout'] as well?
+    end
+    sslmode = config.key?(:sslmode) ? config[:sslmode] : config[:requiressl]
+    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=...
+      # or a non-validating connection might be used (for testing) :
+      #  :sslfactory = 'org.postgresql.ssl.NonValidatingFactory'
+      properties['ssl'] ||= 'true' if sslmode == true || sslmode.to_s == 'require'
+    end
+    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)

data/lib/arjdbc/sqlite3/adapter.rb

@@ -210,7 +210,7 @@ module ArJdbc
     # @override
     def quote(value, column = nil)
       return value if sql_literal?(value)
-      
+
       if value.kind_of?(String)
         column_type = column && column.type
         if column_type == :binary && column.class.respond_to?(:string_to_binary)
@@ -497,7 +497,7 @@ module ArJdbc
       end
 
       def to_s
-        @version
+        @version.join('.')
       end
 
     end

data/lib/arjdbc/sqlite3/connection_methods.rb

@@ -7,27 +7,31 @@ ArJdbc::ConnectionMethods.module_eval do
     end
 
     parse_sqlite3_config!(config)
-    database = config[:database]
-    database = '' if database == ':memory:'
-    config[:url] ||= "jdbc:sqlite:#{database}"
+    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] ||= {} )
+    # NOTE: configuring from JDBC properties not supported on 3.7.2 :
+    options['busy_timeout'] ||= config[:timeout] if config.key?(:timeout)
+
     jdbc_connection(config)
   end
   alias_method :jdbcsqlite3_connection, :sqlite3_connection
 
   private
-  
+
   def parse_sqlite3_config!(config)
-    config[:database] ||= config[:dbfile]
-    # Allow database path relative to RAILS_ROOT :
-    if config[:database] != ':memory:' && defined?(Rails.root) || Object.const_defined?(:RAILS_ROOT)
+    database = ( config[:database] ||= config[:dbfile] ) # allow Rails relative path :
+    if database != ':memory:' && defined?(Rails.root) || Object.const_defined?(:RAILS_ROOT)
       rails_root = defined?(Rails.root) ? Rails.root : RAILS_ROOT
-      config[:database] = File.expand_path(config[:database], rails_root.to_s)
+      config[:database] = File.expand_path(database, rails_root.to_s)
+      dirname = File.dirname(config[:database])
+      Dir.mkdir(dirname) unless File.directory?(dirname)
     end
   end
-  
+
 end

data/lib/arjdbc/tasks.rb

@@ -1,6 +1,6 @@
 if defined?(Rake.application) && Rake.application
-  skip = ENV["SKIP_AR_JDBC_RAKE_REDEFINES"] # jruby -J-Darjdc.tasks.skip=true -S rake ...
-  if ! Java::JavaLang::Boolean.getBoolean('arjdbc.tasks.skip') || ! ( skip && skip != 'false' )
+  skip = ENV["SKIP_AR_JDBC_RAKE_REDEFINES"] # jruby -J-Darjdbc.tasks.skip=true -S rake ...
+  if !(Java::JavaLang::Boolean.getBoolean('arjdbc.tasks.skip') || ( skip && skip != 'false' ))
     databases_rake = File.expand_path('tasks/databases.rake', File.dirname(__FILE__))
     if Rake.application.lookup("db:create")
       load databases_rake # load the override tasks now
@@ -10,4 +10,4 @@ if defined?(Rake.application) && Rake.application
   end
 else
   warn "ArJdbc: could not load rake tasks - rake not loaded ..."
-end
+end

data/lib/arjdbc/tasks/databases.rake

@@ -27,7 +27,7 @@ Rake::DSL.module_eval do
     end
 
     new_task = task(*args, &block)
-    new_task.comment = old_comment # if old_comment
+    new_task.comment = old_comment if old_comment
     new_task.actions.concat(old_actions) if old_actions
     new_task.prerequisites.concat(old_prereqs) if old_prereqs
     new_task

data/lib/arjdbc/tasks/databases3.rake

@@ -9,9 +9,9 @@ end
 module ArJdbc
   module Tasks
     class << self
-      
+
       # API similar to ActiveRecord::Tasks::DatabaseTasks on AR 4.0
-      
+
       def create(config)
         tasks_instance(config).create
       end
@@ -23,7 +23,7 @@ module ArJdbc
       def purge(config)
         tasks_instance(config).purge
       end
-      
+
       def charset(config)
         tasks_instance(config).charset
       end
@@ -39,18 +39,18 @@ module ArJdbc
       def structure_load(config, filename)
         tasks_instance(config).structure_load(filename)
       end
-      
+
     end
   end
 end
 
 namespace :db do
-  
+
   class << self
     alias_method :_rails_create_database, :create_database
     alias_method :_rails_drop_database,   :drop_database
   end
-  
+
   def create_database(config)
     case config['adapter']
     when /mysql|postgresql|sqlite/
@@ -68,7 +68,7 @@ namespace :db do
       ArJdbc::Tasks.drop(config)
     end
   end
-  
+
   redefine_task :charset do # available on 2.3
     ArJdbc::Tasks.charset ActiveRecord::Base.configurations[rails_env]
   end
@@ -76,25 +76,25 @@ namespace :db do
   redefine_task :collation do # available on 2.3
     ArJdbc::Tasks.collation ActiveRecord::Base.configurations[rails_env]
   end
-  
+
   namespace :structure do
-    
+
     redefine_task :dump do
       config = ActiveRecord::Base.configurations[rails_env] # current_config
       filename = structure_sql
-      
+
       case config['adapter']
       when /mysql/
         ActiveRecord::Base.establish_connection(config)
         File.open(filename, 'w:utf-8') { |f| f << ActiveRecord::Base.connection.structure_dump }
       when /postgresql/
         ActiveRecord::Base.establish_connection(config)
-        
+
         ENV['PGHOST'] = config['host'] if config['host']
         ENV['PGPORT'] = config['port'].to_s if config['port']
         ENV['PGPASSWORD'] = config['password'].to_s if config['password']
         ENV['PGUSER'] = config['username'].to_s if config['username']
-        
+
         require 'shellwords'
         search_path = config['schema_search_path']
         unless search_path.blank?
@@ -102,7 +102,7 @@ namespace :db do
         end
         `pg_dump -i -s -x -O -f #{Shellwords.escape(filename)} #{search_path} #{Shellwords.escape(config['database'])}`
         raise 'Error dumping database' if $?.exitstatus == 1
-        
+
         File.open(filename, 'a') { |f| f << "SET search_path TO #{ActiveRecord::Base.connection.schema_search_path};\n\n" }
       when /sqlite/
         dbfile = config['database']
@@ -120,7 +120,7 @@ namespace :db do
     redefine_task :load do
       config = ActiveRecord::Base.configurations[rails_env] # current_config
       filename = structure_sql
-      
+
       case config['adapter']
       when /mysql/
         ActiveRecord::Base.establish_connection(config)
@@ -142,7 +142,7 @@ namespace :db do
         ArJdbc::Tasks.structure_load(config, filename)
       end
     end
-    
+
     def structure_sql
       ENV['DB_STRUCTURE'] ||= begin
         root = defined?(Rails.root) ? Rails.root : ( RAILS_ROOT rescue nil )
@@ -153,21 +153,21 @@ namespace :db do
         end
       end
     end
-    
+
   end
-  
+
   namespace :test do
-    
+
     # desc "Recreate the test database from an existent structure.sql file"
     redefine_task :load_structure => 'db:test:purge' do # not on 2.3
       begin
         current_config(:config => ActiveRecord::Base.configurations['test'])
-        Rake::Task["structure:load"].invoke
+        Rake::Task["db:structure:load"].invoke
       ensure
         current_config(:config => nil)
       end
     end
-    
+
     # desc "Recreate the test database from a fresh structure.sql file"
     redefine_task :clone_structure => [ "db:structure:dump", "db:test:load_structure" ]
     # same as on 3.2 - but this task gets changed on 2.3 by depending on :load_structure
@@ -197,7 +197,7 @@ namespace :db do
     end
     # only does (:purge => :environment) on AR < 3.2
     task :purge => :load_config if Rake::Task.task_defined?(:load_config)
-    
+
   end
-  
+
 end

data/lib/arjdbc/version.rb

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

data/rakelib/02-test.rake

@@ -105,6 +105,15 @@ test_task_for 'JNDI', :desc => 'Run tests against a JNDI connection (uses Derby)
   test_task.libs << 'jdbc-derby/lib'
 end
 
+test_task_for :MySQL, :name => 'test_jdbc_mysql',
+  :prereqs => 'db:mysql', :database_name => 'MySQL (using adapter: jdbc)' do |test_task|
+  test_task.ruby_opts << '-rdb/jdbc_mysql' # replaces require 'db/mysql'
+end
+test_task_for :PostgreSQL, :name => 'test_jdbc_postgresql', :driver => 'postgres',
+  :prereqs => 'db:postgresql', :database_name => 'PostgreSQL (using adapter: jdbc)' do |test_task|
+  test_task.ruby_opts << '-rdb/jdbc_postgres' # replaces require 'db/postgres'
+end
+
 # TODO Sybase testing is currently broken, please fix it if you're on Sybase :
 #test_task_for :Sybase, :desc => "Run tests against Sybase (using jTDS driver)"
 #task :test_sybase_jtds => :test_sybase # alias

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

@@ -29,6 +29,7 @@ import arjdbc.jdbc.RubyJdbcConnection;
 import arjdbc.jdbc.Callable;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.Proxy;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
@@ -249,10 +250,13 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
             if ( field != null ) {
                 java.util.Timer timer = null;
                 try {
+                    Connection unwrap = connection.unwrap(Connection.class);
+                    // when failover is used (LoadBalancedMySQLConnection)
+                    // we'll end up with a proxy returned not the real thing :
+                    if ( Proxy.isProxyClass(unwrap.getClass()) ) return;
                     // connection likely: com.mysql.jdbc.JDBC4Connection
                     // or (for 3.0) super class: com.mysql.jdbc.ConnectionImpl
-                    timer = (java.util.Timer)
-                        field.get( connection.unwrap(Connection.class) );
+                    timer = (java.util.Timer) field.get( unwrap );
                 }
                 catch (SQLException e) {
                     debugMessage( e.toString() );

data/src/java/arjdbc/postgresql/PostgreSQLRubyJdbcConnection.java

@@ -499,7 +499,7 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
         }
 
         if ( object instanceof Map ) { // hstore
-            if ( rawHstoreType ) {
+            if ( rawHstoreType == Boolean.TRUE ) {
                 return runtime.newString( resultSet.getString(column) );
             }
             // by default we avoid double parsing by driver and than column :
@@ -552,20 +552,25 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
         return str.toString();
     }
 
-    protected static boolean rawHstoreType = Boolean.getBoolean("arjdbc.postgresql.hstore.raw");
+    protected static Boolean rawHstoreType;
+    static {
+        final String hstoreRaw = System.getProperty("arjdbc.postgresql.hstore.raw");
+        if ( hstoreRaw != null ) rawHstoreType = Boolean.parseBoolean(hstoreRaw);
+    }
 
-    @JRubyMethod(name = "raw_hstore_type?")
+    @JRubyMethod(name = "raw_hstore_type?", meta = true)
     public static IRubyObject useRawHstoreType(final ThreadContext context, final IRubyObject self) {
+        if ( rawHstoreType == null ) return context.getRuntime().getNil();
         return context.getRuntime().newBoolean(rawHstoreType);
     }
 
-    @JRubyMethod(name = "raw_hstore_type=")
+    @JRubyMethod(name = "raw_hstore_type=", meta = true)
     public static IRubyObject setRawHstoreType(final IRubyObject self, final IRubyObject value) {
         if ( value instanceof RubyBoolean ) {
-            rawHstoreType = ((RubyBoolean) value).isTrue();
+            rawHstoreType = ((RubyBoolean) value).isTrue() ? Boolean.TRUE : Boolean.FALSE;
         }
         else {
-            rawHstoreType = ! value.isNil();
+            rawHstoreType = value.isNil() ? null : Boolean.TRUE;
         }
         return value;
     }
@@ -579,12 +584,12 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
     // - -1 years -2 days
     protected static boolean rawIntervalType = Boolean.getBoolean("arjdbc.postgresql.iterval.raw");
 
-    @JRubyMethod(name = "raw_interval_type?")
+    @JRubyMethod(name = "raw_interval_type?", meta = true)
     public static IRubyObject useRawIntervalType(final ThreadContext context, final IRubyObject self) {
         return context.getRuntime().newBoolean(rawIntervalType);
     }
 
-    @JRubyMethod(name = "raw_interval_type=")
+    @JRubyMethod(name = "raw_interval_type=", meta = true)
     public static IRubyObject setRawIntervalType(final IRubyObject self, final IRubyObject value) {
         if ( value instanceof RubyBoolean ) {
             rawIntervalType = ((RubyBoolean) value).isTrue();

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Nick Sieger, Ola Bini and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -142,6 +142,7 @@ files:
 - lib/arjdbc/mssql/utils.rb
 - lib/arjdbc/mysql.rb
 - lib/arjdbc/mysql/adapter.rb
+- lib/arjdbc/mysql/bulk_change_table.rb
 - lib/arjdbc/mysql/column.rb
 - lib/arjdbc/mysql/connection_methods.rb
 - lib/arjdbc/mysql/explain_support.rb