activerecord-jdbc-adapter 1.3.23 → 1.3.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87ea17eefa2d7db8e501c87fa8a349d93b3b2eeb
-  data.tar.gz: af9e8507422e47c0eea8b525b1f797b9ab67bcb7
+  metadata.gz: 03de925ceee26187bae69a5e29fe1b3a0b23214b
+  data.tar.gz: b46c3b722e5399ce64b20cd949c07abed5170563
 SHA512:
-  metadata.gz: e3d85c46104e42aa4a1439e4a91c929bec9c5af3094c35999c784cfbbba97e837dbabf8d3627a38a5956bf7d69bad950c8621f74241733252582a70650c561d9
-  data.tar.gz: 48bbbd8d3cf5647e26378fcf6d7b86d64d877632d5abc0acac694aad1936dcca7656061722eea6b41e3a536c3afad31c96de2c2655aec9c9b75d1cbc899c808a
+  metadata.gz: a4ddbaa31377d0a6168a9a2968c549018c4cdcd9db2d5320f4a1cb9e291dbf6d7cc8b6909da14e0b41e8e7da72cb04d3a7131a8cb80450debc2af6eaf8ade15e
+  data.tar.gz: faee7550a6863ec808c0024451af4632212509cbb7801f5434752790b7cf9bee037381cba269125c89dd0c80a6a860e2f72289f4b8658545db3c261a6f469310

data/History.md

@@ -1,3 +1,16 @@
+## 1.3.24 (09/24/17)
+
+- [as400] Fixed ordering when limit and offset present (#789)
+- [postgres] limit driver version correctly since > 9.4.1206 might break
+- [db2] fixed issue with serialization not happening (#795)
+  resolves #725 (serialize with custom class not working on AR 4.2)
+- reconnect!/disconnect! shall call super to reset cache/transaction state
+- [oracle] some ~ enhanced adapter compatibility with configuration
+- [mysql] support setting collation: xxx with config[:encoding] like AR 4.2
+- [as400] Check if the exception thrown is a false-positive (#792)
+- [as400] Added truncate functionality for DB2/AS400 (#793)
+- [as400] Added DatabaseTasks for the as400 (#791)
+
 ## 1.3.23 (05/14/17)
 
 - specify gem 'activerecord' < 5 since 5.x is not supported in 1.3.x

data/lib/arjdbc/db2/adapter.rb

@@ -363,6 +363,11 @@ module ArJdbc
         if column.respond_to?(:primary) && column.primary && column.klass != String
           return value.to_i.to_s
         end
+
+        if column.respond_to?(:cast_type) && column.cast_type.is_a?(ActiveRecord::Type::Serialized)
+          return quote(column.cast_type.type_cast_for_database(value))
+        end if ::ActiveRecord::VERSION::MAJOR >= 4
+
         if value && (column.type.to_sym == :decimal || column.type.to_sym == :integer)
           return value.to_s
         end
@@ -492,29 +497,26 @@ module ArJdbc
 
     # @private shared with {Arel::Visitors::DB2}
     def replace_limit_offset!(sql, limit, offset, orders = nil)
-      limit = limit.to_i
+      # Ordering is done somewhere before this method gets called
 
-      if offset # && limit
-        over_order_by = nil # NOTE: orders matching got reverted as it was not complete and there were no case covering it ...
+      # Create the limit and offset sql
+      param_sql = ''
 
-        start_sql = "SELECT B.* FROM (SELECT A.*, row_number() OVER (#{over_order_by}) AS internal$rownum FROM (SELECT"
-        end_sql = ") A ) B WHERE B.internal$rownum > #{offset} AND B.internal$rownum <= #{limit + offset.to_i}"
-
-        if sql.is_a?(String)
-          sql.sub!(/SELECT/i, start_sql)
-          sql << end_sql
-        else # AR 4.2 sql.class ... Arel::Collectors::Bind
-          sql.parts[0] = start_sql # sql.sub! /SELECT/i
-          sql.parts[ sql.parts.length ] = end_sql
-        end
+      if offset.present? && limit.present?
+        param_sql << " LIMIT #{limit} OFFSET #{offset} "
       else
-        limit_sql = limit == 1 ? " FETCH FIRST ROW ONLY" : " FETCH FIRST #{limit} ROWS ONLY"
-        if sql.is_a?(String)
-          sql << limit_sql
-        else # AR 4.2 sql.class ... Arel::Collectors::Bind
-          sql.parts[ sql.parts.length ] = limit_sql
-        end
+        param_sql << " OFFSET #{offset}" if offset.present?
+        param_sql <<  if limit.present?
+                        limit == 1 ? ' FETCH FIRST ROW ONLY' : " FETCH FIRST #{limit} ROWS ONLY"
+                      end
+      end
+
+      if sql.is_a?(String)
+        sql << param_sql
+      else # AR 4.2 sql.class ... Arel::Collectors::Bind
+        sql.parts[sql.parts.length] = param_sql
       end
+
       sql
     end
 

data/lib/arjdbc/db2/as400.rb

@@ -60,8 +60,11 @@ module ArJdbc
         @connection.execute_update "call qsys.qcmdexc('QSYS/CHGJOB INQMSGRPY(*SYSRPYL)',0000000031.00000)"
         @connection.execute_update "call qsys.qcmdexc('ADDRPYLE SEQNBR(9876) MSGID(CPA32B2) RPY(''I'')',0000000045.00000)"
       rescue Exception => e
-        raise "Could not call CHGJOB INQMSGRPY(*SYSRPYL) and ADDRPYLE SEQNBR(9876) MSGID(CPA32B2) RPY('I').\n" +
-              "Do you have authority to do this?\n\n#{e.inspect}"
+        # Sometimes the exception can be a false-positive when we already ran the second command
+        unless e.message.include? 'Sequence number 9876 already defined in system reply list.'
+          raise "Could not call CHGJOB INQMSGRPY(*SYSRPYL) and ADDRPYLE SEQNBR(9876) MSGID(CPA32B2) RPY('I').\n" +
+                    "Do you have authority to do this?\n\n#{e.inspect}"
+        end
       end
 
       begin
@@ -100,6 +103,11 @@ module ArJdbc
       true
     end
 
+    # AS400 does not support TRUNCATE command. Deleting everything from the table is should be close enough
+    def truncate(table_name, name = nil)
+      @connection.execute_update "DELETE FROM #{table_name}"
+    end
+
     private
 
     # @override

data/lib/arjdbc/jdbc/adapter.rb

@@ -296,12 +296,15 @@ module ActiveRecord
 
       # @override
       def reconnect!
+        super # clear_cache! && reset_transaction
         @connection.reconnect! # handles adapter.configure_connection
         @connection
       end
 
       # @override
       def disconnect!
+        super # clear_cache! && reset_transaction
+        return unless @connection
         @connection.disconnect!
       end
 

data/lib/arjdbc/mysql/adapter.rb

@@ -57,11 +57,15 @@ module ArJdbc
       if strict_mode? && ! variables.has_key?(:sql_mode)
         variables[:sql_mode] = 'STRICT_ALL_TABLES' # SET SQL_MODE='STRICT_ALL_TABLES'
       end
-
+      
       # NAMES does not have an equals sign, see
       # http://dev.mysql.com/doc/refman/5.0/en/set-statement.html#id944430
       # (trailing comma because variable_assignments will always have content)
-      encoding = "NAMES #{config[:encoding]}, " if config[:encoding]
+      if @config[:encoding]
+        encoding = "NAMES #{@config[:encoding]}"
+        encoding << " COLLATE #{@config[:collation]}" if @config[:collation]
+        encoding << ", "
+      end
 
       # Gather up all of the SET variables...
       variable_assignments = variables.map do |k, v|

data/lib/arjdbc/oracle/adapter.rb

@@ -57,6 +57,25 @@ module ArJdbc
     # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#jdbc_column_class
     def jdbc_column_class; ::ActiveRecord::ConnectionAdapters::OracleColumn end
 
+    def configure_connection # mostly oracle-enhanced config compatibility
+      jdbc_connection = nil
+      if time_zone = config[:time_zone] # || ENV['TZ']
+        jdbc_connection ||= jdbc_connection(true)
+        jdbc_connection.setSessionTimeZone(time_zone)
+      end
+
+      cursor_sharing = config[:cursor_sharing] # || 'force'
+      execute "ALTER SESSION SET cursor_sharing = #{cursor_sharing}" if cursor_sharing
+
+      schema = config[:schema] && config[:schema].to_s
+      if schema.blank? # default schema owner
+        # @owner = username.upcase unless username.nil?
+      else
+        self.current_schema = schema
+        # @owner = schema
+      end
+    end
+
     # @private
     @@update_lob_values = true
 
@@ -943,10 +962,11 @@ module ActiveRecord::ConnectionAdapters
 
     def initialize(*args)
       ::ArJdbc::Oracle.initialize!
-      super # configure_connection happens in super
 
       @use_insert_returning = config.key?(:insert_returning) ?
         self.class.type_cast_config_to_boolean(config[:insert_returning]) : nil
+
+      super # configure_connection happens in super
     end
 
   end

data/lib/arjdbc/oracle/connection_methods.rb

@@ -15,6 +15,10 @@ ArJdbc::ConnectionMethods.module_eval do
     unless config.key?(:statement_escape_processing)
       config[:statement_escape_processing] = true
     end
+    properties = ( config[:properties] ||= {} )
+    if prefetch_rows = config[:prefetch_rows] # || 100 (oracle-enhanced)
+      properties['defaultRowPrefetch'] = prefetch_rows
+    end
     jdbc_connection(config)
   end
   alias_method :jdbcoracle_connection, :oracle_connection

data/lib/arjdbc/tasks/database_tasks.rb

@@ -39,7 +39,7 @@ module ArJdbc
     register_tasks(/(oci|oracle)/, OracleDatabaseTasks)
     register_tasks(/mssql/, MSSQLDatabaseTasks) # (built-in) alias
     # tasks for custom (JDBC) adapters :
-    register_tasks(/db2/, DB2DatabaseTasks)
+    register_tasks(/(db2|as400)/, DB2DatabaseTasks)
     register_tasks(/derby/, DerbyDatabaseTasks)
     register_tasks(/h2/, H2DatabaseTasks)
     register_tasks(/hsqldb/, HSQLDBDatabaseTasks)

data/lib/arjdbc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version
-  version: 1.3.23
+  version: 1.3.24
 platform: ruby
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-14 00:00:00.000000000 Z
+date: 2017-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -255,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: jruby-extras
-rubygems_version: 2.4.8
+rubygems_version: 2.6.12
 signing_key:
 specification_version: 4
 summary: JDBC adapter for ActiveRecord, for use within JRuby on Rails.