activerecord-jdbc-adapter 1.3.6 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebdc2f21df1a1fbe848c242a5a9c6e351a20056e
-  data.tar.gz: 67e764365675757678fc29d3a2422faaa0b2920a
+  metadata.gz: 23a7dd04ff60809e25a4e3353934e7333eb95f85
+  data.tar.gz: 5e5f2405ab90b8162afb541ca07149b1c1905359
 SHA512:
-  metadata.gz: 006bb63ddde830d1b02a26c5780349d1ad7e6204dbcd9195583fcf65b11f102a22e4e9dab43a6e242c344293503dd56140b6fa55f7b48e967289785b74bec88a
-  data.tar.gz: e9e05577e5fb7965d0a5b38b64f1b7985d9412a31f5d0c7d414a4e8c1b865293ca8e77c120ee7402b7088c70c4a0b9c3f93a07c77868cde11a27ed9406b61e52
+  metadata.gz: 2f7e7f103b585be60afc053e89c60f4826409740b8a223380292ab57dd4d141a22e7ac2974b2c4c9b06e6ddb2f5971e32c5a01a20d73fc011f227adc5086322a
+  data.tar.gz: bd7e172e76bb7e2f492f4735124361060a5ddde25f036a67d80d9422e6b69d793ce270e19c33ddf74f659b820aa85eb4ea62c346ad9ddcbb104c4ac45cd84a34

data/Appraisals

@@ -12,16 +12,20 @@ appraise "rails31" do
 end
 
 appraise "rails32" do
-  gem "activerecord", "~> 3.2.16", :require => false
+  gem "activerecord", "~> 3.2.17", :require => false
 end
 
 appraise "rails40" do
   # NOTE: make sure you're using --1.9 with AR-4.0
-  gem "activerecord", "~> 4.0.2", :require => false
+  gem "activerecord", "~> 4.0.4", :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
+  if branch = ENV['rails_branch']
+    gem "activerecord", :github => 'rails/rails', :branch => branch, :require => false
+    gem 'rails', :github => 'rails/rails', :branch => branch
+  else
+    gem "activerecord", '4.1.0.rc1', :require => false
+  end
+end

data/Gemfile

@@ -1,6 +1,10 @@
 source "https://rubygems.org"
 
-gem 'activerecord', :require => nil
+if version = ENV['AR_VERSION']
+  gem 'activerecord', version, :require => nil
+else
+  gem 'activerecord', :require => nil
+end
 gem 'thread_safe', :require => nil # "optional" - we can roll without it
 if defined?(JRUBY_VERSION) && JRUBY_VERSION < '1.7.0'
 gem 'jruby-openssl', :platform => :jruby
@@ -15,8 +19,12 @@ group :development do
   end
 end
 
-gem 'rake', :require => nil
-gem 'appraisal', :require => nil
+if RUBY_VERSION < '1.9'
+  gem 'rake', '< 10.2.0', :require => nil
+else
+  gem 'rake', :require => nil
+end
+gem 'appraisal', '~> 0.5.2', :require => nil
 
 # appraisal ignores group block declarations :
 

data/History.md

@@ -1,3 +1,21 @@
+## 1.3.7 (04/14/14)
+
+- [postgres] set prepared values with array columns on AR < 4.0 correctly
+- [postgres] handle null values in array columns with AR < 4.0 (fixes #548)
+- [mysql] support for config[:reconnect] (might need some fine tuning to match mysql2)
+- fix ordering on an aggregate in MSSQL (#532) (should fix #437 for good)
+- introduce a deprecation (warn) method for AR-JDBC and start using it
+- [mysql] do not set defaults for text/blob columns on rename/change (#543)
+- try resolving config 'database' (if missing) from JDBC url: in rake tasks
+- [mysql] needs to `reconnect!` when recreating database (fixes #539)
+- remove_column compatibility with Rails 4.x for Oracle, Derby and MSSQL (#541)
+- Fix connection without user and password (#542)
+- fix db2 remove_column for ActiveRecord 4 (#537)
+- FireBird's DB meta-identifier is 31 chars maximum, thanks @mariuz (#538)
+- [derby] add emulate booleans option for derby adapter
+
+Code Contributors (in no particular order): mark100net, Pierrick Rouxel, @iaddict
+
 ## 1.3.6 (02/04/14)
 
 - fix rails 4-0-stable compatibility (see #530)

data/Rakefile

@@ -42,28 +42,36 @@ end
 # DRIVERS
 
 desc "Build drivers"
+task "build:drivers" => DRIVERS.map { |name| "#{name}:build" }
 task "drivers:build" => DRIVERS.map { |name| "#{name}:build" }
 
 desc "Install drivers"
+task "install:drivers" => DRIVERS.map { |name| "#{name}:install" }
 task "drivers:install" => DRIVERS.map { |name| "#{name}:install" }
 
 desc "Release drivers"
+task "release:drivers" => DRIVERS.map { |name| "#{name}:release" }
 task "drivers:release" => DRIVERS.map { |name| "#{name}:release" }
 
 # ADAPTERS
 
 desc "Build adapters"
+task "build:adapters" => [ 'build' ] + ADAPTERS.map { |name| "#{name}:build" }
 task "adapters:build" => [ 'build' ] + ADAPTERS.map { |name| "#{name}:build" }
 
 desc "Install adapters"
+task "install:adapters" => [ 'install' ] + ADAPTERS.map { |name| "#{name}:install" }
 task "adapters:install" => [ 'install' ] + ADAPTERS.map { |name| "#{name}:install" }
 
 desc "Release adapters"
+task "release:adapters" => [ 'release' ] + ADAPTERS.map { |name| "#{name}:release" }
 task "adapters:release" => [ 'release' ] + ADAPTERS.map { |name| "#{name}:release" }
 
 # ALL
 
+task "build:all" => [ 'build' ] + TARGETS.map { |name| "#{name}:build" }
 task "all:build" => [ 'build' ] + TARGETS.map { |name| "#{name}:build" }
+task "install:all" => [ 'install' ] + TARGETS.map { |name| "#{name}:install" }
 task "all:install" => [ 'install' ] + TARGETS.map { |name| "#{name}:install" }
 
 task :filelist do

data/lib/arjdbc/db2/adapter.rb

@@ -350,6 +350,13 @@ module ArJdbc
       super(type, limit, precision, scale)
     end
 
+    def add_column(table_name, column_name, type, options = {})
+      # The keyword COLUMN allows to use reserved names for columns (ex: date)
+      add_column_sql = "ALTER TABLE #{quote_table_name(table_name)} ADD COLUMN #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
+      add_column_options!(add_column_sql, options)
+      execute(add_column_sql)
+    end
+
     def add_column_options!(sql, options)
       # handle case of defaults for CLOB columns,
       # which might get incorrect if we write LOBs in the after_save callback
@@ -498,17 +505,26 @@ module ArJdbc
       end
     end
 
+    if ActiveRecord::VERSION::MAJOR >= 4
+
+    def remove_column(table_name, column_name, type = nil, options = {})
+      db2_remove_column(table_name, column_name)
+    end
+
+    else
+
     def remove_column(table_name, *column_names)
       # http://publib.boulder.ibm.com/infocenter/db2luw/v9r7/topic/com.ibm.db2.luw.admin.dbobj.doc/doc/t0020132.html
       outcome = nil
       column_names = column_names.flatten
       for column_name in column_names
-        sql = "ALTER TABLE #{table_name} DROP COLUMN #{column_name}"
-        outcome = execute_table_change(sql, table_name, 'Remove Column')
+        outcome = db2_remove_column(table_name, column_name)
       end
       column_names.size == 1 ? outcome : nil
     end
 
+    end
+
     def rename_table(name, new_name)
       # http://publib.boulder.ibm.com/infocenter/db2luw/v9r7/topic/com.ibm.db2.luw.sql.ref.doc/doc/r0000980.html
       execute_table_change("RENAME TABLE #{name} TO #{new_name}", new_name, 'Rename Table')
@@ -646,6 +662,11 @@ module ArJdbc
         end
     end
 
+    def db2_remove_column(table_name, column_name)
+      sql = "ALTER TABLE #{quote_table_name(table_name)} DROP COLUMN #{quote_column_name(column_name)}"
+      execute_table_change(sql, table_name, 'Remove Column')
+    end
+
   end
 end
 

data/lib/arjdbc/derby/adapter.rb

@@ -25,6 +25,19 @@ module ArJdbc
       [ /derby/i, lambda { |config, column| column.extend(Column) } ]
     end
 
+ 	# @private
+    @@emulate_booleans = true
+
+    # Boolean emulation can be disabled using :
+    #
+    #   ArJdbc::Derby.emulate_booleans = false
+    #
+    def self.emulate_booleans?; @@emulate_booleans; end
+    # @deprecated Use {#emulate_booleans?} instead.
+    def self.emulate_booleans; @@emulate_booleans; end
+    # @see #emulate_booleans?
+    def self.emulate_booleans=(emulate); @@emulate_booleans = emulate; end
+
     # @note Part of this module is implemented in "native" Java.
     # @see ActiveRecord::ConnectionAdapters::JdbcColumn
     module Column
@@ -53,7 +66,7 @@ module ArJdbc
 
       def simplified_type(field_type)
         case field_type
-        when /^smallint/i    then :boolean
+        when /^smallint/i    then Derby.emulate_booleans? ? :boolean : :integer
         when /^bigint|int/i  then :integer
         when /^real|double/i then :float
         when /^dec/i         then # DEC is a DECIMAL alias
@@ -282,12 +295,29 @@ module ArJdbc
       super
     end unless const_defined? :SchemaCreation
 
+    if ActiveRecord::VERSION::MAJOR >= 4
+
+    # @override
+    def remove_column(table_name, column_name, type = nil, options = {})
+      do_remove_column(table_name, column_name)
+    end
+
+    else
+
     # @override
     def remove_column(table_name, *column_names)
       for column_name in column_names.flatten
-        execute "ALTER TABLE #{quote_table_name(table_name)} DROP COLUMN #{quote_column_name(column_name)} RESTRICT"
+        do_remove_column(table_name, column_name)
       end
-    end unless const_defined? :SchemaCreation
+    end
+    alias remove_columns remove_column
+
+    end
+
+    def do_remove_column(table_name, column_name)
+      execute "ALTER TABLE #{quote_table_name(table_name)} DROP COLUMN #{quote_column_name(column_name)} RESTRICT"
+    end
+    private :do_remove_column
 
     # @override
     def change_column(table_name, column_name, type, options = {})

data/lib/arjdbc/firebird/adapter.rb

@@ -193,8 +193,16 @@ module ArJdbc
       columns(table_name).count { |column| column.primary } == 1
     end
 
-    def default_sequence_name(table_name, column=nil)
-      "#{table_name}_seq"
+    IDENTIFIER_LENGTH = 31 # usual DB meta-identifier: 31 chars maximum
+
+    def table_alias_length; IDENTIFIER_LENGTH; end
+    def table_name_length;  IDENTIFIER_LENGTH; end
+    def index_name_length;  IDENTIFIER_LENGTH; end
+    def column_name_length; IDENTIFIER_LENGTH; end
+
+    def default_sequence_name(table_name, column = nil)
+      # TODO: remove schema prefix if present (before truncating)
+      "#{table_name.to_s[0, IDENTIFIER_LENGTH - 4]}_seq"
     end
 
     # Set the sequence to the max value of the table's column.

data/lib/arjdbc/jdbc.rb

@@ -1,6 +1,36 @@
-require 'arjdbc/jdbc/adapter'
-if Java::JavaLang::Boolean.getBoolean('arjdbc.extensions.discover')
-  module ArJdbc; self.discover_extensions; end
-else
-  require 'arjdbc/discover'
+require 'set'
+require 'active_support/deprecation'
+
+module ArJdbc
+
+  class << self
+
+    def warn(message, once = nil)
+      super(message) || true if warn?(message, once)
+    end
+
+    def deprecate(message, once = nil)
+      ActiveSupport::Deprecation.warn(message, caller) || true if warn?(message, once)
+    end
+
+    private
+
+    @@warns = Set.new
+
+    def warn?(message, once)
+      return nil unless message
+      return false if @@warns.include?(message)
+      @@warns << message.dup if once
+      true
+    end
+
+  end
+
+  require 'arjdbc/jdbc/adapter'
+
+  if Java::JavaLang::Boolean.getBoolean('arjdbc.extensions.discover')
+    self.discover_extensions
+  else
+    require 'arjdbc/discover'
+  end
 end

data/lib/arjdbc/jdbc/connection.rb

@@ -34,7 +34,9 @@ module ActiveRecord
       end
 
       # @deprecated no longer used - only kept for compatibility
-      def set_native_database_types; end
+      def set_native_database_types
+        ArJdbc.deprecate "set_native_database_types is no longer used and does nothing override native_database_types instead"
+      end
 
       def self.jndi_config?(config)
         config[:jndi] || config[:data_source]
@@ -74,12 +76,13 @@ module ActiveRecord
 
       def setup_jdbc_factory
         if ! config[:url] || ( ! config[:driver] && ! config[:driver_instance] )
-          raise ::ActiveRecord::ConnectionNotEstablished, "jdbc adapter requires :driver class and :url"
+          msg = config[:url] ? ":url = #{config[:url]}" : ":driver = #{config[:driver]}"
+          raise ::ActiveRecord::ConnectionNotEstablished, "jdbc adapter requires :driver and :url (got #{msg})"
         end
 
         url = jdbc_url
-        username = config[:username].to_s
-        password = config[:password].to_s
+        username = config[:username]
+        password = config[:password]
         jdbc_driver = ( config[:driver_instance] ||=
             JdbcDriver.new(config[:driver].to_s, config[:properties]) )
 
@@ -93,8 +96,9 @@ module ActiveRecord
 
       def jdbc_url
         url = config[:url].to_s
-        if Hash === config[:options]
-          options = config[:options].map { |key, val| "#{key}=#{val}" }.join('&')
+        if options = config[:options]
+          ArJdbc.deprecate "use config[:properties] to specify connection URL properties instead of config[:options]"
+          options = options.map { |key, val| "#{key}=#{val}" }.join('&') if Hash === options
           url = url['?'] ? "#{url}&#{options}" : "#{url}?#{options}" unless options.empty?
           config[:url] = url; config[:options] = nil
         end

data/lib/arjdbc/jdbc/connection_methods.rb

@@ -1,5 +1,5 @@
 module ArJdbc
-  if defined? ActiveRecord::ConnectionHandling # 4.0
+  if ActiveRecord.const_defined? :ConnectionHandling # 4.0
     ConnectionMethods = ActiveRecord::ConnectionHandling
   else # 3.x
     ConnectionMethods = (class << ActiveRecord::Base; self; end)
@@ -27,4 +27,4 @@ module ArJdbc
     end
 
   end
-end
+end

data/lib/arjdbc/jdbc/driver.rb

@@ -34,8 +34,8 @@ module ActiveRecord
       def connection(url, user, pass)
         # bypass DriverManager to get around problem with dynamically loaded jdbc drivers
         properties = self.properties.clone
-        properties.setProperty("user", user) if user
-        properties.setProperty("password", pass) if pass
+        properties.setProperty("user", user.to_s) if user
+        properties.setProperty("password", pass.to_s) if pass
         @driver.connect(url, properties)
       end
     end

data/lib/arjdbc/jdbc/jdbc.rake

@@ -1,3 +1,4 @@
-# @deprecated
-warn "DEPRECATED: load 'arjdbc/tasks.rb' (or 'arjdbc/tasks/database.rake') instead of 'arjdbc/jdbc/jdbc.rake'"
-load 'arjdbc/tasks.rb'
+load 'arjdbc/tasks.rb'
+
+require 'arjdbc'
+ArJdbc.deprecate "load 'arjdbc/tasks.rb' (or 'arjdbc/tasks/database.rake') instead of 'arjdbc/jdbc/jdbc.rake'"

data/lib/arjdbc/jdbc/railtie.rb

@@ -1,2 +1,2 @@
-warn "DEPRECATED: require 'arjdbc/railtie' instead of 'arjdbc/jdbc/railtie' "
 require 'arjdbc/railtie'
+ArJdbc.deprecate "require 'arjdbc/railtie' instead of 'arjdbc/jdbc/railtie'"

data/lib/arjdbc/jdbc/rake_tasks.rb

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

data/lib/arjdbc/jdbc/serialized_attributes_helper.rb

@@ -1,3 +1,3 @@
-# @deprecated
-warn "DEPRECATED: require 'arjdbc/util/serialized_attributes' instead of 'arjdbc/jdbc/serialized_attributes_helper'"
-require 'arjdbc/util/serialized_attributes'
+require 'arjdbc/util/serialized_attributes'
+
+ArJdbc.deprecate "require 'arjdbc/util/serialized_attributes' instead of 'arjdbc/jdbc/serialized_attributes_helper'"

data/lib/arjdbc/mssql/adapter.rb

@@ -423,18 +423,38 @@ module ArJdbc
       end
     end
 
-    def remove_column(table_name, *column_names)
+    def remove_columns(table_name, *column_names)
       raise ArgumentError.new("You must specify at least one column name. Example: remove_column(:people, :first_name)") if column_names.empty?
       # remove_columns(:posts, :foo, :bar) old syntax : remove_columns(:posts, [:foo, :bar])
       clear_cached_table(table_name)
+
+      return do_remove_column(table_name, column_names.first) if column_names.size == 1
       column_names.flatten.each do |column_name|
-        remove_check_constraints(table_name, column_name)
-        remove_default_constraint(table_name, column_name)
-        remove_indexes(table_name, column_name) unless sqlserver_2000?
-        execute "ALTER TABLE #{quote_table_name(table_name)} DROP COLUMN #{quote_column_name(column_name)}"
+        do_remove_column(table_name, column_name)
       end
     end
 
+    def do_remove_column(table_name, column_name)
+      remove_check_constraints(table_name, column_name)
+      remove_default_constraint(table_name, column_name)
+      remove_indexes(table_name, column_name) unless sqlserver_2000?
+      execute "ALTER TABLE #{quote_table_name(table_name)} DROP COLUMN #{quote_column_name(column_name)}"
+    end
+    private :do_remove_column
+
+    if ActiveRecord::VERSION::MAJOR >= 4
+
+    # @override
+    def remove_column(table_name, column_name, type = nil, options = {})
+      remove_columns(table_name, column_name)
+    end
+
+    else
+
+    def remove_column(table_name, *column_names); remove_columns(table_name, *column_names) end
+
+    end
+
     def remove_default_constraint(table_name, column_name)
       clear_cached_table(table_name)
       if sqlserver_2000?

data/lib/arjdbc/mssql/limit_helpers.rb

@@ -4,6 +4,7 @@ module ArJdbc
 
       # @private
       FIND_SELECT = /\b(SELECT(\s+DISTINCT)?)\b(.*)/mi
+      FIND_AGGREGATE_FUNCTIONS = /AVG|COUNT|COUNT_BIG|MAX|MIN|SUM|STDDEV|STDEVP|VAR|VARP/
 
       module SqlServerReplaceLimitOffset
 
@@ -28,8 +29,10 @@ module ArJdbc
             #   ActiveRecord::StatementInvalid: ActiveRecord::JDBCError: Column 'users.id' is invalid in the select list because it is not contained in either an aggregate function or the GROUP BY clause.
             #   SELECT t.* FROM ( SELECT ROW_NUMBER() OVER(ORDER BY users.id) AS _row_num, [users].[lft], COUNT([users].[lft]) FROM [users] GROUP BY [users].[lft] HAVING COUNT([users].[lft]) > 1 ) AS t WHERE t._row_num BETWEEN 1 AND 1
             if rest_of_query.downcase.include?('group by')
-              if order.count(',') == 0
-                order.gsub!(/ORDER BY (.*)/, 'ORDER BY MIN(\1)')
+              if order.match(/^ORDER +BY +(#{FIND_AGGREGATE_FUNCTIONS})\(/i)
+                # do nothing
+              elsif order.count(',') == 0
+                order.gsub!(/ORDER +BY +([^\s]+)(\s+ASC|\s+DESC)?/i, 'ORDER BY MIN(\1)\2')
               else
                 raise('Only one order condition allowed.')
               end

data/lib/arjdbc/mysql/adapter.rb

@@ -341,6 +341,7 @@ module ArJdbc
     def recreate_database(name, options = {})
       drop_database(name)
       create_database(name, options)
+      reconnect!
     end
 
     # @override
@@ -406,7 +407,8 @@ module ArJdbc
       column = column_for(table_name, column_name)
 
       unless options_include_default?(options)
-        options[:default] = column.default
+        # NOTE: no defaults for BLOB/TEXT columns with MySQL
+        options[:default] = column.default if type != :text && type != :binary
       end
 
       unless options.has_key?(:null)
@@ -422,17 +424,22 @@ module ArJdbc
     # @override
     def rename_column(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
+        type = column.type
+        options[:default] = column.default if type != :text && type != :binary
+        options[:null] = column.null
       else
         raise ActiveRecord::ActiveRecordError, "No such column: #{table_name}.#{column_name}"
       end
+
       current_type = select_one("SHOW COLUMNS FROM #{quote_table_name(table_name)} LIKE '#{column_name}'")["Type"]
+
       rename_column_sql = "ALTER TABLE #{quote_table_name(table_name)} CHANGE #{quote_column_name(column_name)} #{quote_column_name(new_column_name)} #{current_type}"
       add_column_options!(rename_column_sql, options)
       execute(rename_column_sql)
       rename_column_indexes(table_name, column_name, new_column_name) if respond_to?(:rename_column_indexes) # AR-4.0 SchemaStatements
-    end # unless const_defined? :SchemaCreation
+    end
 
     def add_column_position!(sql, options)
       if options[:first]

data/lib/arjdbc/mysql/connection_methods.rb

@@ -31,6 +31,26 @@ ArJdbc::ConnectionMethods.module_eval do
     properties['useUnicode'] = 'true' unless properties.key?('useUnicode') # otherwise platform default
     encoding = config.key?(:encoding) ? config[:encoding] : 'utf8'
     properties['characterEncoding'] = encoding if encoding
+    if ! ( reconnect = config[:reconnect] ).nil?
+      properties['autoReconnect'] ||= reconnect.to_s
+      # properties['maxReconnects'] ||= '3'
+      # with reconnect fail-over sets connection read-only (by default)
+      # properties['failOverReadOnly'] ||= 'false'
+    end
+    if config[:sslkey] || sslcert = config[:sslcert] # || config[:use_ssl]
+      properties['useSSL'] ||= true
+      properties['requireSSL'] ||= true
+      properties['clientCertificateKeyStoreUrl'] ||= begin
+        java.io.File.new(sslcert).to_url.to_s
+      end if sslcert
+      if sslca = config[:sslca]
+        properties['trustCertificateKeyStoreUrl'] ||= begin
+          java.io.File.new(sslca).to_url.to_s
+        end
+      else
+        properties['verifyServerCertificate'] ||= false
+      end
+    end
 
     jdbc_connection(config)
   end

data/lib/arjdbc/oracle/adapter.rb

@@ -278,12 +278,29 @@ module ArJdbc
         "RENAME COLUMN #{quote_column_name(column_name)} TO #{quote_column_name(new_column_name)}"
     end
 
+    if ActiveRecord::VERSION::MAJOR >= 4
+
+    # @override
+    def remove_column(table_name, column_name, type = nil, options = {})
+      do_remove_column(table_name, column_name)
+    end
+
+    else
+
     # @override
     def remove_column(table_name, *column_names)
       for column_name in column_names.flatten
-        execute "ALTER TABLE #{quote_table_name(table_name)} DROP COLUMN #{quote_column_name(column_name)}"
+        do_remove_column(table_name, column_name)
       end
     end
+    alias remove_columns remove_column
+
+    end
+
+    def do_remove_column(table_name, column_name)
+      execute "ALTER TABLE #{quote_table_name(table_name)} DROP COLUMN #{quote_column_name(column_name)}"
+    end
+    private :do_remove_column
 
     # SELECT DISTINCT clause for a given set of columns and a given ORDER BY clause.
     #

data/lib/arjdbc/tasks/databases.rake

@@ -42,7 +42,7 @@ namespace :db do
   end
 
   if defined? adapt_jdbc_config
-    puts "ArJdbc: double loading #{__FILE__} please delete lib/tasks/jdbc.rake if present!"
+    ArJdbc.warn "double loading #{__FILE__} please delete lib/tasks/jdbc.rake if present!"
   end
 
   def adapt_jdbc_config(config)

data/lib/arjdbc/tasks/derby_database_tasks.rb

@@ -8,28 +8,28 @@ module ArJdbc
         establish_connection(config)
         ActiveRecord::Base.connection
       end
-      
+
       def drop
-        db_dir = expand_path(config['database'])
+        db_dir = expand_path resolve_database(config, true)
         if File.exist?(db_dir)
           FileUtils.rm_r(db_dir)
           FileUtils.rmdir(db_dir) rescue nil
         end
       end
-      
+
       SIZEABLE = %w( VARCHAR CLOB BLOB )
 
       def structure_dump(filename)
         establish_connection(config)
         dump = File.open(filename, "w:utf-8")
-        
+
         meta_data = connection.jdbc_connection.meta_data
         tables_rs = meta_data.getTables(nil, nil, nil, ["TABLE"].to_java(:String))
-        
+
         while tables_rs.next
           table_name = tables_rs.getString('TABLE_NAME') # getString(3)
           dump << "CREATE TABLE #{connection.quote_table_name(table_name)} (\n"
-          
+
           columns_rs = meta_data.getColumns(nil, nil, table_name, nil)
           first_col = true
           while columns_rs.next
@@ -43,7 +43,7 @@ module ArJdbc
             type = columns_rs.getString(6)
             column_size = columns_rs.getString(7)
             nulling = ( columns_rs.getString(18) == 'NO' ? " NOT NULL" : nil )
-            
+
             create_column = connection.quote_column_name(column_name)
             create_column << " #{type}"
             create_column << ( SIZEABLE.include?(type) ? "(#{column_size})" : "" )
@@ -57,15 +57,15 @@ module ArJdbc
           end
           dump << "\n);\n\n"
         end
-        
+
         dump.close
       end
-      
+
       def structure_load(filename)
         establish_connection(config)
         IO.read(filename).split(/;\n*/m).each { |ddl| connection.execute(ddl) }
       end
-      
+
       private
 
       AUTO_INCREMENT_SQL = '' <<
@@ -89,7 +89,7 @@ module ArJdbc
         end
         ''
       end
-      
+
     end
   end
 end

data/lib/arjdbc/tasks/h2_database_tasks.rb

@@ -3,27 +3,27 @@ require 'arjdbc/tasks/hsqldb_database_tasks'
 module ArJdbc
   module Tasks
     class H2DatabaseTasks < HSQLDBDatabaseTasks
-      
+
       protected
-      
+
       # @override
       def do_drop_database(config)
-        # ActiveRecord::JDBCError: org.h2.jdbc.JdbcSQLException: 
-        # Database is already closed (to disable automatic closing at VM 
-        # shutdown, add ";DB_CLOSE_ON_EXIT=FALSE" to the db URL) [90121-170]: 
+        # ActiveRecord::JDBCError: org.h2.jdbc.JdbcSQLException:
+        # Database is already closed (to disable automatic closing at VM
+        # shutdown, add ";DB_CLOSE_ON_EXIT=FALSE" to the db URL) [90121-170]:
         # SHUTDOWN COMPACT
-        # 
+        #
         # connection.shutdown
-        connection.drop_database config['database']
+        connection.drop_database resolve_database(config)
       end
-      
+
       # @override
       def delete_database_files(config)
         return unless db_base = database_base_name(config)
         db_files = [ "#{db_base}.h2.db", "#{db_base}.lock.db", "#{db_base}.trace.db" ]
         db_files.each { |file| File.delete(file) if File.exist?(file) }
       end
-      
+
     end
   end
 end

data/lib/arjdbc/tasks/hsqldb_database_tasks.rb

@@ -8,7 +8,7 @@ module ArJdbc
         establish_connection(config)
         ActiveRecord::Base.connection
       end
-      
+
       def drop
         error = nil
         begin
@@ -27,14 +27,14 @@ module ArJdbc
         end
       end
       alias :purge :drop
-      
+
       protected
-      
+
       def do_drop_database(config)
-        connection.drop_database config['database']
+        connection.drop_database resolve_database(config)
         connection.shutdown
       end
-      
+
       def delete_database_files(config)
         return unless db_base = database_base_name(config)
         Dir.glob("#{db_base}.*").each do |file|
@@ -55,16 +55,16 @@ module ArJdbc
           FileUtils.rmdir(db_base)
         end
       end
-      
+
       private
-      
+
       def database_base_name(config)
-        db = config['database']
+        db = resolve_database(config, true)
         db[0, 4] == 'mem:' ? nil : begin
-          expand_path db[0, 4] == 'file:' ? db[4..-1] : db
+          expand_path db[0, 5] == 'file:' ? db[5..-1] : db
         end
       end
-      
+
     end
   end
 end

data/lib/arjdbc/tasks/jdbc_database_tasks.rb

@@ -1,18 +1,18 @@
 module ArJdbc
   module Tasks
     # Sharing task related code between AR 3.x and 4.x
-    # 
+    #
     # @note this class needs to conform to the API available since AR 4.0
     # mostly to be usable with ActiveRecord::Tasks::DatabaseTasks module
     class JdbcDatabaseTasks
-      
+
       attr_reader :configuration
       alias_method :config, :configuration
-      
+
       def initialize(configuration)
         @configuration = configuration
       end
-      
+
       delegate :connection, :establish_connection, :to => ActiveRecord::Base
 
       def create
@@ -25,14 +25,14 @@ module ArJdbc
         rescue #=> error # database does not exists :
           url = config['url']
           url = $1 if url && url =~ /^(.*(?<!\/)\/)(?=\w)/
-          
+
           establish_connection(config.merge('database' => nil, 'url' => url))
-          
+
           unless connection.respond_to?(:create_database)
             raise "AR-JDBC adapter '#{adapter_with_spec}' does not support create_database"
           end
-          connection.create_database(config['database'], config)
-          
+          connection.create_database(resolve_database(config), config)
+
           establish_connection(config)
         end
       end
@@ -42,7 +42,7 @@ module ArJdbc
         unless ActiveRecord::Base.connection.respond_to?(:drop_database)
           raise "AR-JDBC adapter '#{adapter_with_spec}' does not support drop_database"
         end
-        connection.drop_database config['database']
+        connection.drop_database resolve_database(config)
       end
 
       def purge
@@ -73,7 +73,7 @@ module ArJdbc
           raise "AR-JDBC adapter '#{adapter_with_spec}' does not support collation"
         end
       end
-      
+
       def structure_dump(filename)
         establish_connection(config)
         if connection.respond_to?(:structure_dump)
@@ -94,29 +94,76 @@ module ArJdbc
           raise "AR-JDBC adapter '#{adapter_with_spec}' does not support structure_load"
         end
       end
-      
-      private
-      
-      def adapter_with_spec
-        adapter, spec = config['adapter'], config['adapter_spec']
-        spec ? "#{adapter} (#{spec})" : adapter
-      end
-      
+
       protected
-      
+
       def expand_path(path)
         require 'pathname'
         path = Pathname.new path
         return path.to_s if path.absolute?
         rails_root ? File.join(rails_root, path) : File.expand_path(path)
       end
-      
+
+      def resolve_database(config, file_paths = false)
+        config['database'] || resolve_database_from_url(config['url'] || '', file_paths)
+      end
+
+      def resolve_database_from_url(url, file_paths = false)
+        ( config = config_from_url(url, file_paths) ) ? config['database'] : nil
+      end
+
       private
-      
+
+      def config_from_url(url, file_paths = false)
+        match = url.match %r{
+          ^ jdbc:
+          ( [\w]+ ):         # $1 protocol
+          (?: ([\w]+) : )?   # $2 (sub-protocol)
+          (?://)?
+          (?: ([\w\-]*) (?: [/:] ([\w\-]*) )? @ (?://)? )?  # user[:password]@ or user[/password]@ ($3 $4)
+          ( [\w\.\-]+ )?   # $5 host (or database if there's nothing left)
+          (?: : (\d+) )?   # $6 port if any
+          (?: :? (/?[\w\-\./~]+) [\?;]? )? ([^/]*?) $
+          # $7 database part (ends with '?' or ';') and $8 query string - properties
+        }x
+
+        return nil unless match
+
+        config = {}
+        config['_protocol'] = match[1]
+        config['_sub_protocol'] = match[2] if match[2]
+        config['username'] = match[3] if match[3]
+        config['password'] = match[4] if match[4]
+        host = match[5]; port = match[6]
+        database = match[7]
+        if database.nil? && port.nil?
+          config['database'] = database = host
+        else
+          config['host'] = host if host
+          config['port'] = port if port
+          config['database'] = database
+        end
+        if database && ! file_paths && database[0...1] == '/'
+          config['database'] = database[1..-1]
+        end
+        if query_string = match[8]
+          properties = query_string.split('&').inject({}) do |memo, pair|
+            pair = pair.split("="); memo[ pair[0] ] = pair[1]; memo
+          end
+          config['properties'] = properties
+        end
+        config
+      end
+
+      def adapter_with_spec
+        adapter, spec = config['adapter'], config['adapter_spec']
+        spec ? "#{adapter} (#{spec})" : adapter
+      end
+
       def rails_root
         defined?(Rails.root) ? Rails.root : ( RAILS_ROOT )
       end
-      
+
     end
   end
 end

data/lib/arjdbc/tasks/mssql_database_tasks.rb

@@ -6,22 +6,32 @@ module ArJdbc
 
       def purge
         test = deep_dup(configuration)
-        test_database = test['database']
+        test_database = resolve_database(test)
         test['database'] = 'master'
         establish_connection(test)
         connection.recreate_database!(test_database)
       end
 
       def structure_dump(filename)
+        config = config_from_url_if_needed
         `smoscript -s #{config['host']} -d #{config['database']} -u #{config['username']} -p #{config['password']} -f #{filename} -A -U`
       end
 
       def structure_load(filename)
+        config = config_from_url_if_needed
         `sqlcmd -S #{config['host']} -d #{config['database']} -U #{config['username']} -P #{config['password']} -i #{filename}`
       end
-      
+
       private
-      
+
+      def config_from_url_if_needed
+        config = self.config
+        if config['url'] && ! config.key?('database')
+          config = config_from_url(config['url'])
+        end
+        config
+      end
+
       def deep_dup(hash)
         dup = hash.dup
         dup.each_pair do |k,v|
@@ -30,7 +40,7 @@ module ArJdbc
         end
         dup
       end
-      
+
     end
   end
 end

data/lib/arjdbc/tasks/oracle_database_tasks.rb

@@ -8,6 +8,9 @@ module ArJdbc
         print "Please provide the SYSTEM password for your oracle installation\n>"
         system_password = $stdin.gets.strip
         establish_connection(config.merge('username' => 'SYSTEM', 'password' => system_password))
+        unless ( config = self.config ).key?('username')
+          config = config_from_url(config['url']) if config['url']
+        end
         begin
           connection.execute "CREATE USER #{config['username']} IDENTIFIED BY #{config['password']}"
         rescue => e
@@ -22,13 +25,13 @@ module ArJdbc
         connection.execute "GRANT create table TO #{config['username']}"
         connection.execute "GRANT create sequence TO #{config['username']}"
       end
-      
+
       def drop
         self.class.load_enhanced_structure_dump
         establish_connection(config)
         connection.execute_structure_dump(connection.full_drop)
       end
-      
+
       def purge
         self.class.load_enhanced_structure_dump
         establish_connection(:test)
@@ -47,7 +50,7 @@ module ArJdbc
         establish_connection(config)
         connection.execute_structure_dump(File.read(filename))
       end
-      
+
       def self.load_enhanced_structure_dump
         unless defined? ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter
           ActiveRecord::ConnectionAdapters.module_eval do
@@ -56,7 +59,7 @@ module ArJdbc
         end
         require 'arjdbc/tasks/oracle/enhanced_structure_dump'
       end
-      
+
     end
   end
 end

data/lib/arjdbc/version.rb

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

data/lib/jdbc_adapter.rb

@@ -1,2 +1,2 @@
-warn "DEPRECATED: require 'arjdbc' instead of 'jdbc_adapter'."
 require 'arjdbc'
+ArJdbc.deprecate "require 'arjdbc' instead of 'jdbc_adapter'"

data/lib/jdbc_adapter/rake_tasks.rb

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

data/lib/jdbc_adapter/version.rb

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

data/rakelib/02-test.rake

@@ -47,6 +47,16 @@ task 'test_appraisal_hint' do
   end
 end
 
+desc "Run unit tests (not connecting to a DB)."
+Rake::TestTask.new(:test_unit) do |test_task|
+  test_task.test_files = FileList["test/unit*_test.rb"] + FileList["test/unit/*_test.rb"]
+  test_task.libs << 'lib' if defined?(JRUBY_VERSION)
+  test_task.libs << 'test'
+  test_task.verbose = true if $VERBOSE
+  set_test_task_compat_version test_task
+end
+task :test_units => :test_unit # alias
+
 Rake::TestTask.class_eval { attr_reader :test_files }
 
 def test_task_for(adapter, options = {})

data/rakelib/db.rake

@@ -4,6 +4,7 @@ namespace :db do
 
   desc "Creates the test database for MySQL"
   task :mysql do
+    fail "could not create test database: mysql executable not found" unless mysql = which('mysql')
     load 'test/db/mysql_config.rb' # rescue nil
     script = sql_script <<-SQL, 'mysql'
 DROP DATABASE IF EXISTS `#{MYSQL_CONFIG[:database]}`;
@@ -19,12 +20,13 @@ SQL
       params['--password'] = password
     end
     puts "Creating MySQL (test) database: #{MYSQL_CONFIG[:database]}"
-    sh "cat #{script.path} | mysql #{params.to_a.join(' ')}", :verbose => $VERBOSE # so password is not echoed
+    sh "cat #{script.path} | #{mysql} #{params.to_a.join(' ')}", :verbose => $VERBOSE # so password is not echoed
   end
 
   desc "Creates the test database for PostgreSQL"
   task :postgresql do
-    fail unless PostgresHelper.have_postgres?
+    fail 'could not create test database: psql executable not found' unless psql = which('psql')
+    fail 'could not create test database: missing "postgres" role' unless PostgresHelper.postgres_role?
     load 'test/db/postgres_config.rb' # rescue nil
     script = sql_script <<-SQL, 'psql'
 DROP DATABASE IF EXISTS #{POSTGRES_CONFIG[:database]};
@@ -35,7 +37,7 @@ SQL
     params = { '-U' => ENV['PSQL_USER'] || 'postgres' }
     params['-q'] = nil unless $VERBOSE
     puts "Creating PostgreSQL (test) database: #{POSTGRES_CONFIG[:database]}"
-    sh "cat #{script.path} | psql #{params.to_a.join(' ')}", :verbose => $VERBOSE
+    sh "cat #{script.path} | #{psql} #{params.to_a.join(' ')}", :verbose => $VERBOSE
   end
   task :postgres => :postgresql
 

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

@@ -35,7 +35,6 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Timestamp;
 import java.sql.Types;
-import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
@@ -43,6 +42,7 @@ import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyBoolean;
 import org.jruby.RubyClass;
+import org.jruby.RubyFixnum;
 import org.jruby.RubyFloat;
 import org.jruby.RubyHash;
 import org.jruby.RubyIO;
@@ -56,6 +56,8 @@ import org.jruby.util.ByteList;
 
 import org.postgresql.PGConnection;
 import org.postgresql.PGStatement;
+import org.postgresql.core.BaseConnection;
+import org.postgresql.jdbc4.Jdbc4Array;
 import org.postgresql.util.PGInterval;
 import org.postgresql.util.PGobject;
 
@@ -204,25 +206,50 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
     private static final ByteList INTERVAL =
         new ByteList( new byte[] { 'i','n','t','e','r','v','a','l' }, false );
 
+    private static final ByteList ARRAY_END = new ByteList( new byte[] { '[',']' }, false );
+
     @Override
     protected void setStringParameter(final ThreadContext context,
         final Connection connection, final PreparedStatement statement,
         final int index, final IRubyObject value,
         final IRubyObject column, final int type) throws SQLException {
-        if ( value.isNil() ) statement.setNull(index, Types.VARCHAR);
+        final RubyString sqlType;
+        if ( column != null && ! column.isNil() ) {
+            sqlType = (RubyString) column.callMethod(context, "sql_type");
+        }
         else {
-            if ( column != null && ! column.isNil() ) {
-                final RubyString sqlType = column.callMethod(context, "sql_type").asString();
+            sqlType = null;
+        }
 
+        if ( value.isNil() ) {
+            if ( rawArrayType == Boolean.TRUE ) { // array's type is :string
+                if ( sqlType != null && sqlType.getByteList().endsWith( ARRAY_END ) ) {
+                    statement.setNull(index, Types.ARRAY); return;
+                }
+                statement.setNull(index, type); return;
+            }
+            statement.setNull(index, Types.VARCHAR);
+        }
+        else {
+            final String valueStr = value.asString().toString();
+            if ( sqlType != null ) {
+                if ( rawArrayType == Boolean.TRUE && sqlType.getByteList().endsWith( ARRAY_END ) ) {
+                    final Array valueArr = new Jdbc4Array(connection.unwrap(BaseConnection.class), oidType(column), valueStr);
+                    statement.setArray(index, valueArr); return;
+                }
                 if ( sqlType.getByteList().startsWith( INTERVAL ) ) {
-                    statement.setObject( index, new PGInterval( value.asString().toString() ) );
-                    return;
+                    statement.setObject( index, new PGInterval( valueStr ) ); return;
                 }
             }
-            statement.setString( index, value.asString().toString() );
+            statement.setString( index, valueStr );
         }
     }
 
+    private static int oidType(final IRubyObject column) {
+        final IRubyObject oid_type = column.getInstanceVariables().getInstanceVariable("@oid_type");
+        return RubyFixnum.fix2int(oid_type);
+    }
+
     @Override
     protected void setObjectParameter(final ThreadContext context,
         final Connection connection, final PreparedStatement statement,
@@ -463,7 +490,7 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
         final Ruby runtime, final ResultSet resultSet, final int column)
         throws SQLException {
         if ( rawArrayType == Boolean.TRUE ) { // pre AR 4.0 compatibility
-            return runtime.newString( resultSet.getString(column) );
+            return stringToRuby(context, runtime, resultSet, column);
         }
         // NOTE: avoid `finally { array.free(); }` on PostgreSQL due :
         // java.sql.SQLFeatureNotSupportedException:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.7
 platform: ruby
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -238,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: jruby-extras
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key:
 specification_version: 4
 summary: JDBC adapter for ActiveRecord, for use within JRuby on Rails.