activerecord-jdbc-adapter 1.2.8 → 1.2.9

data/.travis.yml

@@ -24,4 +24,4 @@ branches:
     - 1-2-stable
 matrix:
   allow_failures:
-    - gemfile: gemfiles/rails23.gemfile
+    - env: DB=jdbc

data/Gemfile

@@ -11,7 +11,8 @@ gem 'appraisal'
 gem 'rake', :require => nil
 # appraisal ignores group block declarations :
 gem 'test-unit', :group => :test
-gem 'mocha', :require => nil, :group => :test # '>= 0.13.0'
+gem 'test-unit-context', :group => :test
+gem 'mocha', '~> 0.12.1', :require => nil, :group => :test # '>= 0.13.0'
 gem 'simplecov', :require => nil, :group => :test
 gem 'bcrypt-ruby', '~> 3.0.0', :require => nil, :group => :test
 

data/Gemfile.lock

@@ -26,7 +26,6 @@ GEM
       bundler
       rake
     arel (3.0.2)
-    bcrypt-ruby (3.0.1)
     bcrypt-ruby (3.0.1-java)
     bouncy-castle-java (1.5.0146.1)
     builder (3.0.4)
@@ -37,9 +36,8 @@ GEM
     journey (1.0.4)
     jruby-openssl (0.8.2)
       bouncy-castle-java (>= 1.5.0146.1)
-    linecache (0.46-java)
     metaclass (0.0.1)
-    mocha (0.13.2)
+    mocha (0.12.10)
       metaclass (~> 0.0.1)
     multi_json (1.5.0)
     rack (1.4.4)
@@ -51,8 +49,6 @@ GEM
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
     ruby-debug-base (0.10.4-java)
     simplecov (0.7.1)
       multi_json (~> 1.0)
@@ -64,6 +60,8 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     test-unit (2.5.4)
+    test-unit-context (0.3.0)
+      test-unit (>= 2.4.0)
     tilt (1.3.3)
     tzinfo (0.3.35)
 
@@ -77,8 +75,9 @@ DEPENDENCIES
   bcrypt-ruby (~> 3.0.0)
   erubis
   jruby-openssl
-  mocha
+  mocha (~> 0.12.1)
   rake
   ruby-debug
   simplecov
   test-unit
+  test-unit-context

data/History.txt

@@ -1,3 +1,14 @@
+== 1.2.9 (03/20/13)
+
+- [oracle] native database types ala oracle-enhanced adapter
+- [oracle] fix #insert (broken since execute+to_sql refactoring) keeping binds 
+  respect 30 max identifier length with default sequence names
+- [db2] add as400 primary key support and re-add explain method
+- [mssql] fix table/column name quoting - do not quote if quoted already
+- [mssql] change default constrain sql on 2005+ (closes #320)
+- [mssql] fix substring issue that prevents detecting a query that contains *
+- [mssql] adapter code cleanup + refactored (ArJdbc::) MsSQL -> MSSQL
+
 == 1.2.8 (03/13/13)
 
 - [derby] (native) types review & cleanup, externalize AR patch-ing

data/gemfiles/rails23.gemfile

@@ -6,7 +6,8 @@ gem "jruby-openssl", :platform=>:jruby
 gem "appraisal"
 gem "rake", :require=>nil
 gem "test-unit", :group=>:test
-gem "mocha", :require=>nil, :group=>:test
+gem "test-unit-context", :group=>:test
+gem "mocha", "~> 0.12.1", :require=>nil, :group=>:test
 gem "simplecov", :require=>nil, :group=>:test
 gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
 gem "activerecord", "~> 2.3.16"

data/gemfiles/rails23.gemfile.lock

@@ -19,7 +19,7 @@ GEM
     jruby-openssl (0.7.7)
       bouncy-castle-java (>= 1.5.0146.1)
     metaclass (0.0.1)
-    mocha (0.11.4)
+    mocha (0.12.8)
       metaclass (~> 0.0.1)
     multi_json (1.5.0)
     rack (1.1.5)
@@ -36,6 +36,8 @@ GEM
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
     test-unit (2.5.3)
+    test-unit-context (0.3.0)
+      test-unit (>= 2.4.0)
 
 PLATFORMS
   java
@@ -45,8 +47,9 @@ DEPENDENCIES
   appraisal
   bcrypt-ruby (~> 3.0.0)
   jruby-openssl
-  mocha
+  mocha (~> 0.12.1)
   rails (~> 2.3.16)
   rake
   simplecov
   test-unit
+  test-unit-context

data/gemfiles/rails30.gemfile

@@ -6,7 +6,8 @@ gem "jruby-openssl", :platform=>:jruby
 gem "appraisal"
 gem "rake", :require=>nil
 gem "test-unit", :group=>:test
-gem "mocha", :require=>nil, :group=>:test
+gem "test-unit-context", :group=>:test
+gem "mocha", "~> 0.12.1", :require=>nil, :group=>:test
 gem "simplecov", :require=>nil, :group=>:test
 gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
 gem "activerecord", "~> 3.0.20"

data/gemfiles/rails30.gemfile.lock

@@ -22,7 +22,7 @@ GEM
     jruby-openssl (0.7.7)
       bouncy-castle-java (>= 1.5.0146.1)
     metaclass (0.0.1)
-    mocha (0.11.4)
+    mocha (0.12.8)
       metaclass (~> 0.0.1)
     multi_json (1.5.0)
     rake (10.0.3)
@@ -31,6 +31,8 @@ GEM
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
     test-unit (2.5.3)
+    test-unit-context (0.3.0)
+      test-unit (>= 2.4.0)
     tzinfo (0.3.35)
 
 PLATFORMS
@@ -41,7 +43,8 @@ DEPENDENCIES
   appraisal
   bcrypt-ruby (~> 3.0.0)
   jruby-openssl
-  mocha
+  mocha (~> 0.12.1)
   rake
   simplecov
   test-unit
+  test-unit-context

data/gemfiles/rails31.gemfile

@@ -6,7 +6,8 @@ gem "jruby-openssl", :platform=>:jruby
 gem "appraisal"
 gem "rake", :require=>nil
 gem "test-unit", :group=>:test
-gem "mocha", :require=>nil, :group=>:test
+gem "test-unit-context", :group=>:test
+gem "mocha", "~> 0.12.1", :require=>nil, :group=>:test
 gem "simplecov", :require=>nil, :group=>:test
 gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
 gem "activerecord", "~> 3.1.10"

data/gemfiles/rails31.gemfile.lock

@@ -23,7 +23,7 @@ GEM
     jruby-openssl (0.7.7)
       bouncy-castle-java (>= 1.5.0146.1)
     metaclass (0.0.1)
-    mocha (0.11.4)
+    mocha (0.12.8)
       metaclass (~> 0.0.1)
     multi_json (1.2.0)
     rake (10.0.3)
@@ -32,6 +32,8 @@ GEM
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
     test-unit (2.5.3)
+    test-unit-context (0.3.0)
+      test-unit (>= 2.4.0)
     tzinfo (0.3.35)
 
 PLATFORMS
@@ -42,7 +44,8 @@ DEPENDENCIES
   appraisal
   bcrypt-ruby (~> 3.0.0)
   jruby-openssl
-  mocha
+  mocha (~> 0.12.1)
   rake
   simplecov
   test-unit
+  test-unit-context

data/gemfiles/rails32.gemfile

@@ -6,7 +6,8 @@ gem "jruby-openssl", :platform=>:jruby
 gem "appraisal"
 gem "rake", :require=>nil
 gem "test-unit", :group=>:test
-gem "mocha", :require=>nil, :group=>:test
+gem "test-unit-context", :group=>:test
+gem "mocha", "~> 0.12.1", :require=>nil, :group=>:test
 gem "simplecov", :require=>nil, :group=>:test
 gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
 gem "activerecord", "~> 3.2.11"

data/gemfiles/rails32.gemfile.lock

@@ -23,7 +23,7 @@ GEM
     jruby-openssl (0.7.7)
       bouncy-castle-java (>= 1.5.0146.1)
     metaclass (0.0.1)
-    mocha (0.11.4)
+    mocha (0.12.8)
       metaclass (~> 0.0.1)
     multi_json (1.5.0)
     rake (10.0.3)
@@ -32,6 +32,8 @@ GEM
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
     test-unit (2.5.3)
+    test-unit-context (0.3.0)
+      test-unit (>= 2.4.0)
     tzinfo (0.3.35)
 
 PLATFORMS
@@ -42,7 +44,8 @@ DEPENDENCIES
   appraisal
   bcrypt-ruby (~> 3.0.0)
   jruby-openssl
-  mocha
+  mocha (~> 0.12.1)
   rake
   simplecov
   test-unit
+  test-unit-context

data/lib/arel/engines/sql/compilers/mssql_compiler.rb

@@ -1,6 +1,6 @@
 module Arel
   module SqlCompiler
-    class MsSQLCompiler < GenericCompiler
+    class MSSQLCompiler < GenericCompiler
       def select_sql
         projections = @relation.projections
         offset = relation.skipped

data/lib/arel/visitors/sql_server.rb

@@ -2,9 +2,9 @@ require 'arel/visitors/compat'
 
 module Arel
   module Visitors
-    class SQLServer < Arel::Visitors::ToSql
-      include ArJdbc::MsSQL::LimitHelpers::SqlServerReplaceLimitOffset
-      include ArJdbc::MsSQL::LockHelpers::SqlServerAddLock
+    class SQLServer < ToSql
+      include ArJdbc::MSSQL::LimitHelpers::SqlServerReplaceLimitOffset
+      include ArJdbc::MSSQL::LockHelpers::SqlServerAddLock
 
       def select_count? o
         sel = o.cores.length == 1 && o.cores.first
@@ -50,7 +50,7 @@ module Arel
     end
 
     class SQLServer2000 < SQLServer
-      include ArJdbc::MsSQL::LimitHelpers::SqlServer2000ReplaceLimitOffset
+      include ArJdbc::MSSQL::LimitHelpers::SqlServer2000ReplaceLimitOffset
     end
   end
 end

data/lib/arjdbc/db2/adapter.rb

@@ -14,6 +14,10 @@ module ArJdbc
     def self.lob_callback_added! # :nodoc
       @@_lob_callback_added = true
     end
+
+    def explain(query, *binds)
+      # TODO: Explain this! Do not remove !
+    end
     
     def self.extended(base)
       if ADD_LOB_CALLBACK && ! lob_callback_added?
@@ -173,9 +177,16 @@ module ArJdbc
     def prefetch_primary_key?(table_name = nil)
       # TRUE if the table has no identity column
       names = table_name.upcase.split(".")
-      sql = "SELECT 1 FROM SYSCAT.COLUMNS WHERE IDENTITY = 'Y' "
-      sql += "AND TABSCHEMA = '#{names.first}' " if names.size == 2
-      sql += "AND TABNAME = '#{names.last}'"
+      sql = ""
+      if as400?
+        sql = "SELECT 1 FROM SYSIBM.SQLPRIMARYKEYS WHERE "
+        sql += "TABLE_SCHEM = '#{names.first}' AND " if names.size == 2
+        sql += "TABLE_NAME = '#{names.last}'"
+      else
+        sql = "SELECT 1 FROM SYSCAT.COLUMNS WHERE IDENTITY = 'Y' "
+        sql += "AND TABSCHEMA = '#{names.first}' " if names.size == 2
+        sql += "AND TABNAME = '#{names.last}'"
+      end
       select_one(sql).nil?
     end
 

data/lib/arjdbc/discover.rb

@@ -84,7 +84,7 @@ module ::ArJdbc
     end
   end
 
-  extension :MsSQL do |name|
+  extension :MSSQL do |name|
     if name =~ /sqlserver|tds|Microsoft SQL/i
       require 'arjdbc/mssql'
       true

data/lib/arjdbc/jdbc/adapter.rb

@@ -196,6 +196,7 @@ module ActiveRecord
 
       def reconnect!
         @connection.reconnect!
+        configure_connection if respond_to?(:configure_connection)
         @connection
       end
 

data/lib/arjdbc/jdbc/connection.rb

@@ -1,18 +1,85 @@
 module ActiveRecord
   module ConnectionAdapters
     class JdbcConnection
+
+      attr_reader :adapter, :connection_factory
+
+      # @native_database_types - setup properly by adapter= versus set_native_database_types.
+      #   This contains type information for the adapter.  Individual adapters can make tweaks
+      #   by defined modify_types
+      #
+      # @native_types - This is the default type settings sans any modifications by the
+      # individual adapter.  My guess is that if we loaded two adapters of different types
+      # then this is used as a base to be tweaked by each adapter to create @native_database_types
+
+      def initialize(config)
+        self.config = config
+        @connection = nil
+        @jndi_connection = false
+        configure_connection # ConfigHelper#configure_connection
+        connection # force the connection to load (@see RubyJDbcConnection.connection)
+        set_native_database_types
+        @stmts = {} # AR compatibility - statement cache not used
+      rescue ::ActiveRecord::ActiveRecordError
+        raise
+      rescue Java::JavaSql::SQLException => e
+        e = e.cause if defined?(NativeException) && e.is_a?(NativeException) # JRuby-1.6.8
+        error = e.getMessage || e.getSQLState
+        error = error ? "#{e.java_class.name}: #{error}" : e.java_class.name
+        error = ::ActiveRecord::JDBCError.new("The driver encountered an unknown error: #{error}")
+        error.errno = e.getErrorCode
+        error.sql_exception = e
+        raise error
+      end
+
+      def jndi_connection?
+        @jndi_connection == true
+      end
+
+      def active?
+        !! @connection
+      end
+      
+      def adapter=(adapter)
+        @adapter = adapter
+        @native_database_types = dup_native_types
+        @adapter.modify_types(@native_database_types)
+        @adapter.config.replace(config)
+      end
+
+      private
+      
+      # Duplicate all native types into new hash structure so it can be modified
+      # without destroying original structure.
+      def dup_native_types
+        types = {}
+        @native_types.each_pair do |k, v|
+          types[k] = v.inject({}) do |memo, kv|
+            last = kv.last
+            memo[kv.first] = last.is_a?(Numeric) ? last : (last.dup rescue last)
+            memo
+          end
+        end
+        types
+      end
+      
       module ConfigHelper
+        
         attr_reader :config
 
         def config=(config)
           @config = config.symbolize_keys
         end
 
+        # Configure this connection from the available configuration.
+        # @see #configure_jdbc
+        # @see #configure_jndi
+        # 
+        # @note this has nothing to do with the configure_connection implemented
+        # on some of the concrete adapters (e.g. {#ArJdbc::Postgres})
         def configure_connection
           config[:retry_count] ||= 5
           config[:connection_alive_sql] ||= "select 1"
-          @jndi_connection = false
-          @connection = nil
           if config[:jndi]
             begin
               configure_jndi
@@ -50,6 +117,7 @@ module ActiveRecord
         end
 
         private
+        
         def configure_url
           url = config[:url].to_s
           if Hash === config[:options]
@@ -65,68 +133,10 @@ module ActiveRecord
           url
         end
 
-      end
-
-      attr_reader :adapter, :connection_factory
-
-      # @native_database_types - setup properly by adapter= versus set_native_database_types.
-      #   This contains type information for the adapter.  Individual adapters can make tweaks
-      #   by defined modify_types
-      #
-      # @native_types - This is the default type settings sans any modifications by the
-      # individual adapter.  My guess is that if we loaded two adapters of different types
-      # then this is used as a base to be tweaked by each adapter to create @native_database_types
-
-      def initialize(config)
-        self.config = config
-        configure_connection
-        connection # force the connection to load
-        set_native_database_types
-        @stmts = {}
-      rescue ::ActiveRecord::ActiveRecordError
-        raise
-      rescue Java::JavaSql::SQLException => e
-        e = e.cause if defined?(NativeException) && e.is_a?(NativeException) # JRuby-1.6.8
-        error = e.getMessage || e.getSQLState
-        error = error ? "#{e.java_class.name}: #{error}" : e.java_class.name
-        error = ::ActiveRecord::JDBCError.new("The driver encountered an unknown error: #{error}")
-        error.errno = e.getErrorCode
-        error.sql_exception = e
-        raise error
-      end
-
-      def adapter=(adapter)
-        @adapter = adapter
-        @native_database_types = dup_native_types
-        @adapter.modify_types(@native_database_types)
-        @adapter.config.replace(config)
-      end
-
-      # Duplicate all native types into new hash structure so it can be modified
-      # without destroying original structure.
-      def dup_native_types
-        types = {}
-        @native_types.each_pair do |k, v|
-          types[k] = v.inject({}) do |memo, kv|
-            last = kv.last
-            memo[kv.first] = last.is_a?(Numeric) ? last : (last.dup rescue last)
-            memo
-          end
-        end
-        types
-      end
-      private :dup_native_types
-
-      def jndi_connection?
-        @jndi_connection == true
-      end
-
-      def active?
-        @connection
-      end
-
-      private
+      end # ConfigHelper
+      
       include ConfigHelper
+      
     end
   end
 end