activerecord-jdbc-adapter 1.3.7 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23a7dd04ff60809e25a4e3353934e7333eb95f85
-  data.tar.gz: 5e5f2405ab90b8162afb541ca07149b1c1905359
+  metadata.gz: bdd070e64ed269bffd40cf0a8664f09964f771d5
+  data.tar.gz: 1e14ca7c497d7bddb3bbdca2bcfa4da04acfebcf
 SHA512:
-  metadata.gz: 2f7e7f103b585be60afc053e89c60f4826409740b8a223380292ab57dd4d141a22e7ac2974b2c4c9b06e6ddb2f5971e32c5a01a20d73fc011f227adc5086322a
-  data.tar.gz: bd7e172e76bb7e2f492f4735124361060a5ddde25f036a67d80d9422e6b69d793ce270e19c33ddf74f659b820aa85eb4ea62c346ad9ddcbb104c4ac45cd84a34
+  metadata.gz: 19d45b4f7f4edcace3341a1641b24ee7e3e98bb8e2f7a4853cfa9cc6877eeffbbc5e56f86e2f98e37c9df6af3a85a0afa02a346f381498a87e71d36ddffa3eae
+  data.tar.gz: 349a9d32b318d73fc0f549a81c2dc5d38367629e1694597e47efae4aeea2ff6ca70e1f07cb750d453955781378f021149a2ae46994b111667db66d39a3a5f87c

data/.travis.yml

@@ -13,6 +13,7 @@ gemfile:
   - gemfiles/rails32.gemfile
   - gemfiles/rails40.gemfile
   - gemfiles/rails41.gemfile
+  - gemfiles/rails42.gemfile
 env:
   - JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=mysql
   - JRUBY_OPTS="--1.9 $JRUBY_OPTS" DB=mysql PREPARED_STATEMENTS=false
@@ -34,13 +35,17 @@ env:
   # TODO: not sure why it can't connect :
   #- JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=jdbc
   #- JRUBY_OPTS="--1.9 $JRUBY_OPTS" DB=jdbc
+jdk:
+  - openjdk6
 branches:
   only:
     - master
-    - 1-2-stable
+    - /.*-stable$/
+    - next
+    - /^test-.*/
 matrix:
-  #allow_failures:
-    #- gemfile: gemfiles/rails41.gemfile
+  allow_failures:
+    - gemfile: gemfiles/rails42.gemfile
   exclude:
     # Rails 4 prefers Ruby 2.0 (or at least >= 1.9.3) :
     - rvm: jruby
@@ -92,3 +97,28 @@ matrix:
     - rvm: jruby
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=jdbc
+    # Rails 4.2 will not support Ruby 1.8 :
+    - rvm: jruby
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=mysql
+    - rvm: jruby
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=postgresql
+    - rvm: jruby
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=sqlite3
+    - rvm: jruby
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=derby
+    - rvm: jruby
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=h2
+    - rvm: jruby
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=hsqldb
+    - rvm: jruby
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=jndi
+    - rvm: jruby
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=jdbc

data/Appraisals

@@ -12,20 +12,26 @@ appraise "rails31" do
 end
 
 appraise "rails32" do
-  gem "activerecord", "~> 3.2.17", :require => false
+  gem "activerecord", "~> 3.2.18", :require => false
 end
 
 appraise "rails40" do
   # NOTE: make sure you're using --1.9 with AR-4.0
-  gem "activerecord", "~> 4.0.4", :require => false
+  gem "activerecord", "~> 4.0.6", :require => false
 end
 
 appraise "rails41" do
-  # NOTE: make sure you're using --1.9 with AR-4.1
-  if branch = ENV['rails_branch']
+  # NOTE: make sure you're using --1.9 with AR-4.0
+  gem "activerecord", "~> 4.1.2", :require => false
+end
+
+appraise "rails42" do
+  # NOTE: make sure you're using --1.9 with AR-4.0
+  if branch = ( ENV['rails_branch'] || 'master' )
     gem "activerecord", :github => 'rails/rails', :branch => branch, :require => false
     gem 'rails', :github => 'rails/rails', :branch => branch
+    gem 'arel', :github => 'rails/arel', :branch => 'master'
   else
-    gem "activerecord", '4.1.0.rc1', :require => false
+    # gem "activerecord", '4.2.0.rc1', :require => false
   end
 end

data/Gemfile

@@ -1,29 +1,26 @@
 source "https://rubygems.org"
 
 if version = ENV['AR_VERSION']
-  gem 'activerecord', version, :require => nil
+  if version.index('/') && ::File.exist?(version)
+    gem 'activerecord', :path => version
+  elsif version =~ /^[0-9abcdef]+$/
+    gem 'activerecord', :github => 'rails/rails', :ref => version
+  elsif version.index('.').nil?
+    gem 'activerecord', :github => 'rails/rails', :branch => version
+  else
+    gem 'activerecord', version, :require => nil
+  end
 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
 end
 
-group :development do
-  gem 'ruby-debug', :require => nil # if ENV['DEBUG']
-  group :doc do
-    gem 'yard', :require => nil
-    gem 'yard-method-overrides', :github => 'kares/yard-method-overrides', :require => nil
-    gem 'kramdown', :require => nil
-  end
-end
-
-if RUBY_VERSION < '1.9'
-  gem 'rake', '< 10.2.0', :require => nil
-else
-  gem 'rake', :require => nil
-end
+gem 'rake', '~> 10.3.2', :require => nil
 gem 'appraisal', '~> 0.5.2', :require => nil
 
 # appraisal ignores group block declarations :
@@ -36,6 +33,15 @@ gem 'simplecov', :require => nil, :group => :test
 gem 'bcrypt-ruby', '~> 3.0.0', :require => nil, :group => :test
 #gem 'trinidad_dbpool', :require => nil, :group => :test
 
+group :development do
+  gem 'ruby-debug', :require => nil # if ENV['DEBUG']
+  group :doc do
+    gem 'yard', :require => nil
+    gem 'yard-method-overrides', :github => 'kares/yard-method-overrides', :require => nil
+    gem 'kramdown', :require => nil
+  end
+end
+
 group :rails do
   gem 'erubis', :require => nil
   # NOTE: due rails/activerecord/test/cases/session_store/session_test.rb

data/History.md

@@ -1,3 +1,33 @@
+## 1.3.8 (06/27/14)
+
+- [mysql] updated so that we can run with non-official driver (+ against MariaDB)
+- [postgres] quote fix failure with ColumnDefinition on AR 4.0.6.rc2
+- [mssql] performance improvements :
+  * "optimized" quote_name_part in Java + avoid bytes copying in quoteCharWith
+  * throwing exceptions in the hot path results in slow code
+  * minor performance improvements to mssql type_cast
+- [mssql] fix remove_column on AR < 3.2
+- [mssql] dealing with column that need quoting (e.g. ids with spaces) in ORDER
+  special care needs to be performed on AR <= 3.2 - Arel < '4.0' (closing #551)
+- [mssql] correct default value quoting + update on change when non null with default
+- [mssql] backport database ('.' in name) quoting fix from sqlserver adapter
+- get the "correct" (AR::Base) record.class on AR 4.1 (#555)
+- [oracle] support disabling generated keys `-Darjdbc.oracle.generated_keys=false`
+- [postgres] fix returning generated keys + use *arjdbc.postgresql.generated_keys*
+- [oracle] working `config[:insert_returning] = true` support (using prepared calls)
+- [mysql] improve column instantiation - make sure strict/extra passed correctly
+- [postgres] backport rails fix for not quoting array defaults correctly
+- [postgres] handle the accessor (e.g. for hstore) added in AR 4.1 (#535)
+- [postgres] handle oid_types resolution on AR 4.x (compat with MRI on Rails)
+- [postgres] align Column's (string) cast helpers with AR 4.1
+- [postgres] quote/cast compat with 4.x + do not quote default function values
+- [postgres] align array parser with latest from AR 4.1
+- [postgresl] Column AR 4.x compatibility methods: `number?` and `text?`
+- [h2] should have it's own arel visitor class (`Arel::Visitors::H2`)
+- [h2] support for latest beta of next major release - H2 database **1.4**
+
+Code Contributors (in no particular order): Michael J. Cohen
+
 ## 1.3.7 (04/14/14)
 
 - [postgres] set prepared values with array columns on AR < 4.0 correctly
@@ -14,7 +44,7 @@
 - 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
+Code Contributors (in no particular order): Mark Fraser, Pierrick Rouxel, @iaddict
 
 ## 1.3.6 (02/04/14)
 

data/lib/active_record/connection_adapters/mariadb_adapter.rb

@@ -0,0 +1 @@
+require 'arjdbc/mysql'

data/lib/arel/visitors/firebird.rb

@@ -5,18 +5,15 @@ module Arel
     class Firebird < Arel::Visitors::ToSql
 
       def visit_Arel_Nodes_SelectStatement o, a = nil
-        lim_off = [
-          ("FIRST #{do_visit o.limit.expr, a}" if o.limit),
-          ("SKIP #{do_visit o.offset.expr, a}" if o.offset)
-        ].compact.join(' ').strip
+        lim_off = ''
+        lim_off << "FIRST #{do_visit o.limit.expr, a} " if o.limit
+        lim_off << " SKIP #{do_visit o.offset.expr, a}" if o.offset
+        lim_off.strip!
 
-        sql = [
-         o.cores.map { |x| do_visit_select_core x, a }.join,
-         ("ORDER BY #{o.orders.map { |x| do_visit x, a }.join(', ')}" unless o.orders.empty?),
-        ].compact.join ' '
-
-        sql.sub!(/\A(\s*SELECT\s)/i, '\&' + lim_off + ' ') unless lim_off.empty?
+        sql = o.cores.map { |x| do_visit_select_core x, a }.join
+        sql << " ORDER BY #{o.orders.map { |x| do_visit x, a }.join(', ')}" unless o.orders.empty?
 
+        sql.sub!(/\A(\s*SELECT\s)/i, "\&#{lim_off} ") unless lim_off.empty?
         sql
       end
 

data/lib/arel/visitors/h2.rb

@@ -0,0 +1,9 @@
+require 'arel/visitors/compat'
+require 'arel/visitors/hsqldb'
+
+module Arel
+  module Visitors
+    class H2 < Arel::Visitors::HSQLDB
+    end
+  end
+end

data/lib/arel/visitors/sql_server.rb

@@ -15,7 +15,7 @@ module Arel
         end
 
         unless o.orders.empty?
-          select_order_by = "ORDER BY #{o.orders.map { |x| do_visit x, a }.join(', ')}"
+          select_order_by = "ORDER BY #{do_visit_columns(o.orders, a).join(', ')}"
         end
 
         select_count = false
@@ -95,13 +95,32 @@ module Arel
 
       def determine_order_by x, a
         unless x.groups.empty?
-          "ORDER BY #{x.groups.map { |g| do_visit g, a }.join(', ')}"
+          "ORDER BY #{do_visit_columns(x.groups, a).join(', ')}"
         else
           table_pk = find_left_table_pk(x.froms, a)
           table_pk == 'NULL' ? nil : "ORDER BY #{table_pk}"
         end
       end
 
+      def do_visit_columns(colls, a)
+        colls.map { |x| do_visit x, a }
+      end
+
+      # @private
+      NON_SIMPLE_ORDER_COLUMN = /\sASC|\sDESC|\sCASE|\sCOLLATE|[\.,\[\(]/i # MIN(width)
+
+      def do_visit_columns(colls, a)
+        colls = colls.map { |x| do_visit x, a }
+        colls.map! do |x|
+          if x !~ NON_SIMPLE_ORDER_COLUMN && x.to_i == 0
+            @connection.quote_column_name(x)
+          else
+            x
+          end
+        end
+        colls
+      end if Arel::VERSION < '4.0.0'
+
       def row_num_literal order_by
         Arel::Nodes::SqlLiteral.new("ROW_NUMBER() OVER (#{order_by}) as _row_num")
       end

data/lib/arjdbc/h2/adapter.rb

@@ -74,7 +74,7 @@ module ArJdbc
 
     # @see ActiveRecord::ConnectionAdapters::Jdbc::ArelSupport
     def self.arel_visitor_type(config = nil)
-      HSQLDB.arel_visitor_type(config)
+      require 'arel/visitors/h2'; ::Arel::Visitors::H2
     end
 
     ADAPTER_NAME = 'H2'.freeze
@@ -242,6 +242,35 @@ module ArJdbc
       execute('DROP ALL OBJECTS')
     end
 
+    # @private
+    def database_path(base_only = false)
+      db_path = jdbc_connection(true).getSession.getDataHandler.getDatabasePath
+      return db_path if base_only
+      if File.exist?(mv_path = "#{db_path}.mv.db")
+        return mv_path
+      else
+        "#{db_path}.h2.db"
+      end
+    end
+
+    # @override
+    def jdbc_connection(unwrap = nil)
+      java_connection = raw_connection.connection
+      return java_connection unless unwrap
+      if java_connection.java_class.name == 'org.h2.jdbc.JdbcConnection'
+        return java_connection
+      end
+      connection_class = java.sql.Connection.java_class
+      if java_connection.wrapper_for?(connection_class)
+        java_connection.unwrap(connection_class) # java.sql.Wrapper.unwrap
+      elsif java_connection.respond_to?(:connection)
+        # e.g. org.apache.tomcat.jdbc.pool.PooledConnection
+        java_connection.connection # getConnection
+      else
+        java_connection
+      end
+    end
+
     private
 
     def change_column_null(table_name, column_name, null, default = nil)
@@ -267,5 +296,5 @@ module ActiveRecord::ConnectionAdapters
   class H2Adapter < JdbcAdapter
     include ArJdbc::H2
   end
-  
+
 end

data/lib/arjdbc/h2/connection_methods.rb

@@ -16,7 +16,7 @@ ArJdbc::ConnectionMethods.module_eval do
       if db[0, 4] == 'mem:' || db[0, 5] == 'file:' || db[0, 5] == 'hsql:'
         "jdbc:h2:#{db}"
       else
-        "jdbc:h2:file:#{db}"
+        "jdbc:h2:file:#{File.expand_path(db)}"
       end
     end
     config[:driver] ||= defined?(::Jdbc::H2.driver_name) ? ::Jdbc::H2.driver_name : 'org.h2.Driver'

data/lib/arjdbc/jdbc/column.rb

@@ -21,7 +21,8 @@ module ActiveRecord
             default = args.shift
           end
         end
-        # super : (name, default, sql_type = nil, null = true)
+        # super <= 4.1: (name, default, sql_type = nil, null = true)
+        # super master: (name, default, cast_type, sql_type = nil, null = true)
         super(name, default_value(default), *args)
         init_column(name, default, *args)
       end

data/lib/arjdbc/mssql/adapter.rb

@@ -220,9 +220,22 @@ module ArJdbc
     end
 
     def quote_column_name(name)
-      name.to_s.split('.').map do |n| # "[#{name}]"
-        n =~ /^\[.*\]$/ ? n : "[#{n.gsub(']', ']]')}]"
-      end.join('.')
+      name = name.to_s.split('.')
+      name.map! { |n| quote_name_part(n) } # "[#{name}]"
+      name.join('.')
+    end
+
+    def quote_database_name(name)
+      quote_name_part(name.to_s)
+    end
+
+    # Does not quote function default values for UUID columns
+    def quote_default_value(value, column)
+      if column.type == :uuid && value =~ /\(\)/
+        value
+      else
+        quote(value)
+      end
     end
 
     ADAPTER_NAME = 'MSSQL'.freeze
@@ -303,7 +316,7 @@ module ArJdbc
 
     def use_database(database = nil)
       database ||= config[:database]
-      execute "USE #{quote_table_name(database)}" unless database.blank?
+      execute "USE #{quote_database_name(database)}" unless database.blank?
     end
 
     # @private
@@ -326,11 +339,11 @@ module ArJdbc
     def drop_database(name)
       current_db = current_database
       use_database('master') if current_db.to_s == name
-      execute "DROP DATABASE #{quote_table_name(name)}"
+      execute "DROP DATABASE #{quote_database_name(name)}"
     end
 
     def create_database(name, options = {})
-      execute "CREATE DATABASE #{quote_table_name(name)}"
+      execute "CREATE DATABASE #{quote_database_name(name)}"
     end
 
     def database_exists?(name)
@@ -388,38 +401,43 @@ module ArJdbc
 
     # @override
     def change_column(table_name, column_name, type, options = {})
+      column = columns(table_name).find { |c| c.name.to_s == column_name.to_s }
 
-      indexes = []
-      column_object = columns(table_name).detect { |c| c.name.to_s == column_name.to_s }
-
-      if options_include_default?(options) || (column_object && column_object.type != type.to_sym)
+      indexes = EMPTY_ARRAY
+      if options_include_default?(options) || (column && column.type != type.to_sym)
         remove_default_constraint(table_name, column_name)
         indexes = indexes(table_name).select{ |index| index.columns.include?(column_name.to_s) }
         remove_indexes(table_name, column_name)
       end
 
-      clear_cached_table(table_name)
+      if ! options[:null].nil? && options[:null] == false && ! options[:default].nil?
+        execute "UPDATE #{quote_table_name(table_name)} SET #{quote_column_name(column_name)}=#{quote_default_value(options[:default], column)} WHERE #{quote_column_name(column_name)} IS NULL"
+        clear_cached_table(table_name)
+      end
       change_column_type(table_name, column_name, type, options)
       change_column_default(table_name, column_name, options[:default]) if options_include_default?(options)
 
-      #Add any removed indexes back
-      indexes.each do |index|
-        execute "CREATE INDEX #{quote_table_name(index.name)} ON #{quote_table_name(table_name)} (#{index.columns.collect {|c|quote_column_name(c)}.join(', ')})"
+      indexes.each do |index| # add any removed indexes back
+        index_columns = index.columns.map { |c| quote_column_name(c) }.join(', ')
+        execute "CREATE INDEX #{quote_table_name(index.name)} ON #{quote_table_name(table_name)} (#{index_columns})"
       end
     end
 
     def change_column_type(table_name, column_name, type, options = {})
-      clear_cached_table(table_name)
       sql = "ALTER TABLE #{quote_table_name(table_name)} ALTER COLUMN #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
-      sql += (options[:null] ? " NULL" : " NOT NULL") if options.has_key?(:null)
-      execute(sql)
+      sql << (options[:null] ? " NULL" : " NOT NULL") if options.has_key?(:null)
+      result = execute(sql)
+      clear_cached_table(table_name)
+      result
     end
 
     def change_column_default(table_name, column_name, default)
-      clear_cached_table(table_name)
       remove_default_constraint(table_name, column_name)
       unless default.nil?
-        execute "ALTER TABLE #{quote_table_name(table_name)} ADD CONSTRAINT DF_#{table_name}_#{column_name} DEFAULT #{quote(default)} FOR #{quote_column_name(column_name)}"
+        column = columns(table_name).find { |c| c.name.to_s == column_name.to_s }
+        result = execute "ALTER TABLE #{quote_table_name(table_name)} ADD CONSTRAINT DF_#{table_name}_#{column_name} DEFAULT #{quote_default_value(default, column)} FOR #{quote_column_name(column_name)}"
+        clear_cached_table(table_name)
+        result
       end
     end
 
@@ -428,10 +446,9 @@ module ArJdbc
       # remove_columns(:posts, :foo, :bar) old syntax : remove_columns(:posts, [:foo, :bar])
       clear_cached_table(table_name)
 
+      column_names = column_names.flatten
       return do_remove_column(table_name, column_names.first) if column_names.size == 1
-      column_names.flatten.each do |column_name|
-        do_remove_column(table_name, column_name)
-      end
+      column_names.each { |column_name| do_remove_column(table_name, column_name) }
     end
 
     def do_remove_column(table_name, column_name)
@@ -569,7 +586,7 @@ module ArJdbc
         raise "no columns for table: #{table_name}" if columns.empty?
       end
       # NOTE: if still no PK column simply get something for ORDER BY ...
-      "#{table_name}.#{(primary_column || columns.first).name}"
+      "#{quote_table_name(table_name)}.#{quote_column_name((primary_column || columns.first).name)}"
     end
 
     # Support for executing a stored procedure.