activerecord-jdbc-adapter 1.3.0.beta1 → 1.3.0.beta2

data/gemfiles/rails40.gemfile

@@ -4,14 +4,12 @@ source "https://rubygems.org"
 
 gem "activerecord"
 gem "jruby-openssl", :platform=>:jruby
-gem "appraisal"
+gem "appraisal", :require=>nil
 gem "rake", :require=>nil
 gem "test-unit", "2.5.4", :group=>:test
 gem "test-unit-context", :group=>:test
 gem "mocha", ">= 0.13.0", :require=>nil, :group=>:test
 gem "simplecov", :require=>nil, :group=>:test
 gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
-gem "rails", :github=>"rails/rails"
-gem "journey", :github=>"rails/journey"
-gem "activerecord-deprecated_finders", :github=>"rails/activerecord-deprecated_finders", :require=>nil
+gem "rails", :github=>"rails/rails", :branch=>"4-0-stable"
 

data/gemfiles/rails40.gemfile.lock

@@ -1,83 +1,71 @@
-GIT
-  remote: git://github.com/rails/activerecord-deprecated_finders.git
-  revision: 46aa99efc9c3c1db1d4f2e55373481212e6b2e26
-  specs:
-    activerecord-deprecated_finders (0.0.3)
-
-GIT
-  remote: git://github.com/rails/journey.git
-  revision: f0938d664286dc0b47f13092fa5d04a9225038d4
-  specs:
-    journey (2.0.0.20120723141804)
-
 GIT
   remote: git://github.com/rails/rails.git
-  revision: 817e8fad5a84569729ae65fbd713274678c68d8f
+  revision: b83a7203b85df83026af2b1d8a9135c4d068d807
+  branch: 4-0-stable
   specs:
-    actionmailer (4.0.0.beta1)
-      actionpack (= 4.0.0.beta1)
-      mail (~> 2.5.3)
-    actionpack (4.0.0.beta1)
-      activesupport (= 4.0.0.beta1)
+    actionmailer (4.0.0.rc1)
+      actionpack (= 4.0.0.rc1)
+      mail (~> 2.5.4)
+    actionpack (4.0.0.rc1)
+      activesupport (= 4.0.0.rc1)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.0.beta1)
-      activesupport (= 4.0.0.beta1)
+    activemodel (4.0.0.rc1)
+      activesupport (= 4.0.0.rc1)
       builder (~> 3.1.0)
-    activerecord (4.0.0.beta1)
-      activemodel (= 4.0.0.beta1)
-      activerecord-deprecated_finders (~> 0.0.3)
-      activesupport (= 4.0.0.beta1)
-      arel (~> 4.0.0.beta2)
-    activesupport (4.0.0.beta1)
+    activerecord (4.0.0.rc1)
+      activemodel (= 4.0.0.rc1)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0.rc1)
+      arel (~> 4.0.0)
+    activesupport (4.0.0.rc1)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    rails (4.0.0.beta1)
-      actionmailer (= 4.0.0.beta1)
-      actionpack (= 4.0.0.beta1)
-      activerecord (= 4.0.0.beta1)
-      activesupport (= 4.0.0.beta1)
+    rails (4.0.0.rc1)
+      actionmailer (= 4.0.0.rc1)
+      actionpack (= 4.0.0.rc1)
+      activerecord (= 4.0.0.rc1)
+      activesupport (= 4.0.0.rc1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.0.beta1)
-      sprockets-rails (~> 2.0.0.rc3)
-    railties (4.0.0.beta1)
-      actionpack (= 4.0.0.beta1)
-      activesupport (= 4.0.0.beta1)
+      railties (= 4.0.0.rc1)
+      sprockets-rails (~> 2.0.0.rc4)
+    railties (4.0.0.rc1)
+      actionpack (= 4.0.0.rc1)
+      activesupport (= 4.0.0.rc1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activerecord-deprecated_finders (1.0.2)
     appraisal (0.5.2)
       bundler
       rake
-    arel (4.0.0.beta2)
-    atomic (1.1.6-java)
-    bcrypt-ruby (3.0.1)
+    arel (4.0.0)
+    atomic (1.1.9-java)
     bcrypt-ruby (3.0.1-java)
     bouncy-castle-java (1.5.0147)
     builder (3.1.4)
     erubis (2.7.0)
     hike (1.2.2)
     i18n (0.6.4)
-    jruby-openssl (0.8.7)
+    jruby-openssl (0.8.8)
       bouncy-castle-java (>= 1.5.0147)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
-    mime-types (1.22)
-    minitest (4.7.0)
+    mime-types (1.23)
+    minitest (4.7.4)
     mocha (0.13.3)
       metaclass (~> 0.0.1)
-    multi_json (1.7.2)
+    multi_json (1.7.3)
     polyglot (0.3.3)
     rack (1.5.2)
     rack-test (0.6.2)
@@ -87,22 +75,22 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    sprockets (2.9.2)
+    sprockets (2.9.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.0.rc3)
+    sprockets-rails (2.0.0.rc4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
     test-unit (2.5.4)
-    test-unit-context (0.3.0)
+    test-unit-context (0.3.1)
       test-unit (>= 2.4.0)
     thor (0.18.1)
     thread_safe (0.1.0)
       atomic
-    tilt (1.3.6)
+    tilt (1.4.1)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
@@ -113,10 +101,8 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord
-  activerecord-deprecated_finders!
   appraisal
   bcrypt-ruby (~> 3.0.0)
-  journey!
   jruby-openssl
   mocha (>= 0.13.0)
   rails!

data/lib/active_record/connection_adapters/as400_adapter.rb

@@ -0,0 +1,2 @@
+require 'arjdbc/db2'
+require 'arjdbc/db2/as400'

data/lib/active_record/connection_adapters/db2_adapter.rb

@@ -1 +1 @@
-require 'arjdbc/db2'
+require 'arjdbc/db2'

data/lib/arel/visitors/db2.rb

@@ -10,7 +10,11 @@ module Arel
       end
 
       def add_limit_offset(sql, o)
-        @connection.replace_limit_offset! sql, limit_for(o.limit), o.offset && o.offset.value
+        if o.offset && o.offset.value && o.limit && o.limit.value
+          @connection.replace_limit_offset_for_arel! o, sql
+        else
+          @connection.replace_limit_offset! sql, limit_for(o.limit), o.offset && o.offset.value
+        end
       end
     end
   end

data/lib/arel/visitors/hsqldb.rb

@@ -12,6 +12,7 @@ module Arel
 
       def limit_offset sql, o
         offset = o.offset || 0
+        offset = offset.expr unless(offset.nil? or offset == 0)
         bef = sql[7..-1]
         if limit = o.limit
           "SELECT LIMIT #{offset} #{limit_for(limit)} #{bef}"

data/lib/arel/visitors/sql_server.rb

@@ -3,21 +3,16 @@ require 'arel/visitors/compat'
 module Arel
   module Visitors
     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
-        projections = sel && sel.projections.length == 1 && sel.projections
-        projections && Arel::Nodes::Count === projections.first
-      end
 
       # Need to mimic the subquery logic in ARel 1.x for select count with limit
       # See arel/engines/sql/compilers/mssql_compiler.rb for details
-      def visit_Arel_Nodes_SelectStatement o
-        if !o.limit && o.offset
+      def visit_Arel_Nodes_SelectStatement(*args) # [o] AR <= 4.0 [o, a] on 4.1
+        o, a = args.first, args.last
+        
+        if ! o.limit && o.offset
           raise ActiveRecord::ActiveRecordError, "You must specify :limit with :offset."
         end
+        
         order = "ORDER BY #{o.orders.map { |x| visit x }.join(', ')}" unless o.orders.empty?
         if o.limit
           if select_count?(o)
@@ -25,10 +20,10 @@ module Arel
             sql = o.cores.map do |x|
               x = x.dup
               x.projections = [Arel::Nodes::SqlLiteral.new("*")]
-              visit_Arel_Nodes_SelectCore x
+              do_visit_select_core(x, a)
             end.join
           else
-            sql = o.cores.map { |x| visit_Arel_Nodes_SelectCore x }.join
+            sql = o.cores.map { |x| do_visit_select_core(x, a) }.join
           end
 
           order ||= "ORDER BY #{@connection.determine_order_clause(sql)}"
@@ -40,13 +35,60 @@ module Arel
         add_lock!(sql, :lock => o.lock && true)
         sql
       end
-
+      
       # MS-SQL doesn't support "SELECT...FOR UPDATE".  Instead, it needs
       # WITH(ROWLOCK,UPDLOCK) specified after each table in the FROM clause.
       #
       # So, we return nothing here and add the appropriate stuff using add_lock! above.
       def visit_Arel_Nodes_Lock o
+        # visit o.expr
+      end
+      
+      def visit_Arel_Nodes_UpdateStatement o
+        if o.orders.any? && o.limit.nil?
+          o.limit = Nodes::Limit.new(9223372036854775807)
+        end
+        super
+      end
+      
+      def visit_Arel_Nodes_Limit(o)
+        "TOP (#{visit o.expr})"
       end
+      
+      def visit_Arel_Nodes_Ordering(o)
+        if o.respond_to?(:direction)
+          "#{visit o.expr} #{o.ascending? ? 'ASC' : 'DESC'}"
+        else
+          visit o.expr
+        end
+      end
+      
+      def visit_Arel_Nodes_Bin(o)
+        "#{visit o.expr} COLLATE Latin1_General_CS_AS_WS"
+      end
+      
+      private
+      
+      def select_count? o
+        sel = o.cores.length == 1 && o.cores.first
+        projections = sel && sel.projections.length == 1 && sel.projections
+        projections && Arel::Nodes::Count === projections.first
+      end
+      
+      if instance_method('visit_Arel_Nodes_SelectCore').arity == 1
+        def do_visit_select_core(x, a) # a = nil
+          visit_Arel_Nodes_SelectCore(x)
+        end
+      else # > AREL 4.0
+        def do_visit_select_core(x, a)
+          visit_Arel_Nodes_SelectCore(x, a)
+        end        
+      end
+      
+      include ArJdbc::MSSQL::LockHelpers::SqlServerAddLock
+      
+      include ArJdbc::MSSQL::LimitHelpers::SqlServerReplaceLimitOffset
+      
     end
 
     class SQLServer2000 < SQLServer

data/lib/arjdbc/db2/adapter.rb

@@ -1,51 +1,40 @@
-require 'arjdbc/jdbc/serialized_attributes_helper'
+ArJdbc.load_java_part :DB2
 
 module ArJdbc
   module DB2
-    
-    # TODO kind of standard AR configuration option for this would be nice :
-    ADD_LOB_CALLBACK = true unless const_defined?(:ADD_LOB_CALLBACK) # :nodoc
 
-    @@_lob_callback_added = nil
-    def self.lob_callback_added? # :nodoc
-      @@_lob_callback_added
-    end
+    # This adapter doesn't support explain
+    # config.active_record.auto_explain_threshold_in_seconds should be commented before rails 4.0
     
-    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(adapter); initialize!; end
     
-    def self.extended(base)
-      if ADD_LOB_CALLBACK && ! lob_callback_added?
-        ActiveRecord::Base.class_eval do
-          def after_save_with_db2_lob
-            lob_columns = self.class.columns.select { |c| c.sql_type =~ /blob|clob/i }
-            lob_columns.each do |column|
-              value = ::ArJdbc::SerializedAttributesHelper.dump_column_value(self, column)
-              next if value.nil? # already set NULL
-
-              connection.write_large_object(
-                column.type == :binary, column.name, 
-                self.class.table_name, 
-                self.class.primary_key, 
-                quote_value(id), value
-              )
-            end
+    @@_initialized = nil
+    
+    def self.initialize!
+      return if @@_initialized; @@_initialized = true
+      
+      require 'arjdbc/jdbc/serialized_attributes_helper'
+      ActiveRecord::Base.class_eval do
+        def after_save_with_db2_lob
+          lob_columns = self.class.columns.select { |c| c.sql_type =~ /blob|clob/i }
+          lob_columns.each do |column|
+            value = ::ArJdbc::SerializedAttributesHelper.dump_column_value(self, column)
+            next if value.nil? # already set NULL
+
+            self.class.connection.write_large_object(
+              column.type == :binary, column.name, 
+              self.class.table_name, 
+              self.class.primary_key, 
+              self.class.connection.quote(id), value
+            )
           end
-          alias after_save_with_db2zos_blob after_save_with_db2_lob # <-compat
         end
-        # TODO this should be changed to :after_save_with_db2_lob :
-        ActiveRecord::Base.after_save :after_save_with_db2zos_blob # <-compat
-        lob_callback_added!
       end
+      ActiveRecord::Base.after_save :after_save_with_db2_lob
     end
     
     def self.column_selector
-      [ /(db2|as400|zos)/i, lambda { |cfg, column| column.extend(::ArJdbc::DB2::Column) } ]
+      [ /(db2|zos)/i, lambda { |cfg, column| column.extend(::ArJdbc::DB2::Column) } ]
     end
 
     def self.jdbc_connection_class
@@ -54,10 +43,17 @@ module ArJdbc
 
     def self.arel2_visitors(config)
       require 'arel/visitors/db2'
-      { 'db2'   => ::Arel::Visitors::DB2, 'as400' => ::Arel::Visitors::DB2 }
+      { 'db2' => ::Arel::Visitors::DB2 }
+    end
+    
+    def self.handle_lobs?; true; end
+    
+    def configure_connection
+      schema = self.schema
+      set_schema(schema) if schema && schema != config[:username]
     end
     
-    ADAPTER_NAME = 'DB2'
+    ADAPTER_NAME = 'DB2'.freeze
     
     def adapter_name
       ADAPTER_NAME
@@ -75,9 +71,10 @@ module ArJdbc
       :decimal    => { :name => "decimal" },
       :char       => { :name => "char" },
       :decfloat   => { :name => "decfloat" },
-      #:rowid      => { :name => "rowid" }, # supported datatype on z/OS and i/5
-      #:graphic    => { :name => "graphic", :limit => 1 },
-      #:vargraphic => { :name => "vargraphic", :limit => 1 },
+      :rowid      => { :name => "rowid" }, # rowid is a supported datatype on z/OS and i/5
+      :serial     => { :name => "serial" }, # supported datatype on Informix Dynamic Server
+      :graphic    => { :name => "graphic", :limit => 1 },
+      :vargraphic => { :name => "vargraphic", :limit => 1 },
       :datetime   => { :name => "timestamp" },
       :timestamp  => { :name => "timestamp" },
       :time       => { :name => "time" }
@@ -87,7 +84,17 @@ module ArJdbc
       super.merge(NATIVE_DATABASE_TYPES)
     end
 
+    @@emulate_booleans = true
+    
+    # Boolean emulation can be disabled using :
+    # 
+    #   ArJdbc::DB2.emulate_booleans = false
+    # 
+    def self.emulate_booleans; @@emulate_booleans; end
+    def self.emulate_booleans=(emulate); @@emulate_booleans = emulate; end
+    
     module Column
+      
       def type_cast(value)
         return nil if value.nil? || value == 'NULL' || value =~ /^\s*NULL\s*$/i
         case type
@@ -95,10 +102,10 @@ module ArJdbc
         when :integer   then value.respond_to?(:to_i) ? value.to_i : (value ? 1 : 0)
         when :primary_key then value.respond_to?(:to_i) ? value.to_i : (value ? 1 : 0)
         when :float     then value.to_f
-        when :datetime  then ArJdbc::DB2::Column.cast_to_date_or_time(value)
-        when :date      then ArJdbc::DB2::Column.cast_to_date_or_time(value)
-        when :timestamp then ArJdbc::DB2::Column.cast_to_time(value)
-        when :time      then ArJdbc::DB2::Column.cast_to_time(value)
+        when :datetime  then Column.cast_to_date_or_time(value)
+        when :date      then Column.cast_to_date_or_time(value)
+        when :timestamp then Column.cast_to_time(value)
+        when :time      then Column.cast_to_time(value)
         # TODO AS400 stores binary strings in EBCDIC (CCSID 65535), need to convert back to ASCII
         else
           super
@@ -146,21 +153,26 @@ module ArJdbc
       # http://publib.boulder.ibm.com/infocenter/db2luw/v9r7/topic/com.ibm.db2.luw.apdv.java.doc/doc/rjvjdata.html
       def simplified_type(field_type)
         case field_type
-        when /^decimal\(1\)$/i   then :boolean
-        when /smallint|boolean/i then :boolean
+        when /^decimal\(1\)$/i   then DB2.emulate_booleans ? :boolean : :integer
+        when /smallint/i         then DB2.emulate_booleans ? :boolean : :integer
+        when /boolean/i          then :boolean
         when /^real|double/i     then :float
         when /int|serial/i       then :integer
-        when /numeric|decfloat/i then :decimal
+        # if a numeric column has no scale, lets treat it as an integer.
+        # The AS400 rpg guys do this ALOT since they have no integer datatype ...
+        when /decimal|numeric|decfloat/i
+          extract_scale(field_type) == 0 ? :integer : :decimal
         when /timestamp/i        then :timestamp
         when /datetime/i         then :datetime
         when /time/i             then :time
         when /date/i             then :date
-        when /clob/i             then :text
+        when /clob|text/i        then :text
+        when /blob|binary/i      then :binary
         when /for bit data/i     then :binary
         when /xml/i              then :xml
-        #when /vargraphic/i       then :vargraphic
-        #when /graphic/i          then :graphic
-        #when /rowid/i            then :rowid # rowid is a supported datatype on z/OS and i/5
+        when /^vargraphic/i      then :vargraphic
+        when /^graphic/i         then :graphic
+        when /rowid/i            then :rowid # rowid is a supported datatype on z/OS and i/5
         else
           super
         end
@@ -179,10 +191,45 @@ module ArJdbc
     end
 
     class TableDefinition < ::ActiveRecord::ConnectionAdapters::TableDefinition # :nodoc:
+      
       def xml(*args)
         options = args.extract_options!
         column(args[0], 'xml', options)
       end
+      
+      # IBM DB adapter (MRI) compatibility :
+      
+      def double(*args)
+        options = args.extract_options!
+        column(args[0], 'double', options)
+      end
+
+      def decfloat(*args)
+        options = args.extract_options!
+        column(args[0], 'decfloat', options)
+      end
+
+      def graphic(*args)
+        options = args.extract_options!
+        column(args[0], 'graphic', options)
+      end
+
+      def vargraphic(*args)
+        options = args.extract_options!
+        column(args[0], 'vargraphic', options)
+      end
+
+      def bigint(*args)
+        options = args.extract_options!
+        column(args[0], 'bigint', options)
+      end
+      
+      def char(*args)
+        options = args.extract_options!
+        column(args[0], 'char', options)
+      end
+      # alias_method :character, :char
+      
     end
 
     def table_definition(*args)
@@ -192,54 +239,15 @@ module ArJdbc
     def prefetch_primary_key?(table_name = nil)
       # TRUE if the table has no identity column
       names = table_name.upcase.split(".")
-      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
+      sql = "SELECT 1 FROM SYSCAT.COLUMNS WHERE IDENTITY = 'Y' "
+      sql << "AND TABSCHEMA = '#{names.first}' " if names.size == 2
+      sql << "AND TABNAME = '#{names.last}'"
       select_one(sql).nil?
     end
 
     def next_sequence_value(sequence_name)
       select_value("SELECT NEXT VALUE FOR #{sequence_name} FROM sysibm.sysdummy1")
     end
-
-    # holy moly batman! all this to tell AS400 "yes i am sure"
-    def execute_and_auto_confirm(sql)
-      begin
-        @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}"
-      end
-
-      result = execute sql
-
-      begin
-        @connection.execute_update "call qsys.qcmdexc('QSYS/CHGJOB INQMSGRPY(*DFT)',0000000027.00000)"
-        @connection.execute_update "call qsys.qcmdexc('RMVRPYLE SEQNBR(9876)',0000000021.00000)"
-      rescue Exception => e
-        raise "Could not call CHGJOB INQMSGRPY(*DFT) and RMVRPYLE SEQNBR(9876).\n" +
-              "Do you have authority to do this?\n\n#{e.inspect}"
-      end
-      result
-    end
-
-    def _execute(sql, name = nil)
-      if self.class.select?(sql)
-        @connection.execute_query_raw(sql)
-      elsif self.class.insert?(sql)
-        (@connection.execute_insert(sql) || last_insert_id(sql)).to_i
-      else
-        @connection.execute_update(sql)
-      end
-    end
-    private :_execute
     
     def last_insert_id(sql)
       table_name = sql.split(/\s/)[2]
@@ -344,13 +352,13 @@ module ArJdbc
         end
       when String, ActiveSupport::Multibyte::Chars
         if column_type == :binary && !(column.sql_type =~ /for bit data/i)
-          if ArJdbc::DB2.lob_callback_added?
+          if ArJdbc::DB2.handle_lobs?
             "NULL" # '@@@IBMBINARY@@@'"
           else
             "BLOB('#{quote_string(value)}')"
           end
         elsif column && column.sql_type =~ /clob/ # :text
-          if ArJdbc::DB2.lob_callback_added?
+          if ArJdbc::DB2.handle_lobs?
             "NULL" # "'@@@IBMTEXT@@@'"
           else
             "'#{quote_string(value)}'"
@@ -417,10 +425,11 @@ module ArJdbc
       end
       super
     end
-    
+   
     def replace_limit_offset!(sql, limit, offset)
       if limit
         limit = limit.to_i
+
         if !offset
           if limit == 1
             sql << " FETCH FIRST ROW ONLY"
@@ -428,27 +437,43 @@ module ArJdbc
             sql << " FETCH FIRST #{limit} ROWS ONLY"
           end
         else
-          offset = offset.to_i
-          sql.sub!(/SELECT/i, 'SELECT B.* FROM (SELECT A.*, row_number() over () AS internal$rownum FROM (SELECT')
-          sql << ") A ) B WHERE B.internal$rownum > #{offset} AND B.internal$rownum <= #{limit + offset}"
+          replace_limit_offset_with_ordering( sql, limit, offset )
         end
+        
       end
       sql
     end
+
+    def replace_limit_offset_for_arel!( query, sql )
+      replace_limit_offset_with_ordering sql, query.limit.value, query.offset && query.offset.value, query.orders
+    end
+
+    def replace_limit_offset_with_ordering( sql, limit, offset, orders=[] )
+      sql.sub!(/SELECT/i, "SELECT B.* FROM (SELECT A.*, row_number() over (#{build_ordering(orders)}) AS internal$rownum FROM (SELECT")
+      sql << ") A ) B WHERE B.internal$rownum > #{offset} AND B.internal$rownum <= #{limit + offset}"
+      sql
+    end
+    private :replace_limit_offset_with_ordering
     
-    def reorg_table(table_name, name = nil)
-      exec_update "call sysproc.admin_cmd ('REORG TABLE #{table_name}')", name, [] unless as400?
+    def build_ordering( orders )
+      return '' unless orders.size > 0
+      # need to remove the library/table names from the orderings because we are not really ordering by them anymore
+      # we are actually ordering by the results of a query where the result set has the same column names
+      orders = orders.map do |o| 
+        # need to keep in mind that the order clause could be wrapped in a function
+        matches = /(?:\w+\(|\s)*(\S+)(?:\)|\s)*/.match(o)
+        o = o.gsub( matches[1], matches[1].split('.').last ) if matches
+        o
+      end
+      "ORDER BY " + orders.join( ', ')
     end
-    private :reorg_table
+    private :build_ordering
 
+    # @deprecated seems not sued nor tested ?!
     def runstats_for_table(tablename, priority = 10)
       @connection.execute_update "call sysproc.admin_cmd('RUNSTATS ON TABLE #{tablename} WITH DISTRIBUTION AND DETAILED INDEXES ALL UTIL_IMPACT_PRIORITY #{priority}')"
     end
 
-    def recreate_database(name, options = {})
-      tables.each { |table| drop_table("#{db2_schema}.#{table}") }
-    end
-
     def add_index(table_name, column_name, options = {})
       if ! zos? || ( table_name.to_s == ActiveRecord::Migrator.schema_migrations_table_name.to_s )
         column_name = column_name.to_s if column_name.is_a?(Symbol)
@@ -470,12 +495,8 @@ module ArJdbc
     # http://publib.boulder.ibm.com/infocenter/db2luw/v9r7/topic/com.ibm.db2.luw.admin.dbobj.doc/doc/t0020130.html
     # ...not supported on IBM i, so we raise in this case
     def rename_column(table_name, column_name, new_column_name) #:nodoc:
-      if as400?
-        raise NotImplementedError, "rename_column is not supported on IBM i"
-      else
-        execute "ALTER TABLE #{table_name} RENAME COLUMN #{column_name} TO #{new_column_name}"
-        reorg_table(table_name, 'Rename Column')
-      end
+      sql = "ALTER TABLE #{table_name} RENAME COLUMN #{column_name} TO #{new_column_name}"
+      execute_table_change(sql, table_name, 'Rename Column')
     end
 
     def change_column_null(table_name, column_name, null)
@@ -484,8 +505,7 @@ module ArJdbc
       else
         sql = "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} SET NOT NULL"
       end
-      as400? ? execute_and_auto_confirm(sql) : execute(sql)
-      reorg_table(table_name, 'Change Column')
+      execute_table_change(sql, table_name, 'Change Column')
     end
 
     def change_column_default(table_name, column_name, default)
@@ -494,15 +514,13 @@ module ArJdbc
       else
         sql = "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} SET WITH DEFAULT #{quote(default)}"
       end
-      as400? ? execute_and_auto_confirm(sql) : execute(sql)
-      reorg_table(table_name, 'Change Column')
+      execute_table_change(sql, table_name, 'Change Column')
     end
 
     def change_column(table_name, column_name, type, options = {})
       data_type = type_to_sql(type, options[:limit], options[:precision], options[:scale])
       sql = "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} SET DATA TYPE #{data_type}"
-      as400? ? execute_and_auto_confirm(sql) : execute(sql)
-      reorg_table(table_name, 'Change Column')
+      execute_table_change(sql, table_name, 'Change Column')
 
       if options.include?(:default) and options.include?(:null)
         # which to run first?
@@ -521,22 +539,23 @@ module ArJdbc
     end
     
     # http://publib.boulder.ibm.com/infocenter/db2luw/v9r7/topic/com.ibm.db2.luw.admin.dbobj.doc/doc/t0020132.html
-    def remove_column(table_name, *column_names) #:nodoc:
-      for column_name in column_names.flatten
+    def remove_column(table_name, *column_names) # :nodoc:
+      outcome = nil
+      column_names = column_names.flatten
+      for column_name in column_names
         sql = "ALTER TABLE #{table_name} DROP COLUMN #{column_name}"
-        as400? ? execute_and_auto_confirm(sql) : execute(sql)
+        outcome = execute_table_change(sql, table_name, 'Remove Column')
       end
-      reorg_table(table_name, 'Remove Column')
+      column_names.size == 1 ? outcome : nil
     end
 
     # http://publib.boulder.ibm.com/infocenter/db2luw/v9r7/topic/com.ibm.db2.luw.sql.ref.doc/doc/r0000980.html
-    def rename_table(name, new_name) #:nodoc:
-      execute "RENAME TABLE #{name} TO #{new_name}"
-      reorg_table(new_name, 'Rename Table')
+    def rename_table(name, new_name) # :nodoc:
+      execute_table_change("RENAME TABLE #{name} TO #{new_name}", new_name, 'Rename Table')
     end
     
     def tables
-      @connection.tables(nil, db2_schema, nil, ["TABLE"])
+      @connection.tables(nil, schema)
     end
 
     # only record precision and scale for types that can set them via CREATE TABLE:
@@ -546,7 +565,7 @@ module ArJdbc
     HAVE_SCALE = %w(DECIMAL NUMERIC)
 
     def columns(table_name, name = nil)
-      columns = @connection.columns_internal(table_name.to_s, nil, db2_schema)
+      columns = @connection.columns_internal(table_name.to_s, nil, schema) # catalog == nil
 
       if zos?
         # Remove the mighty db2_generated_rowid_for_lobs from the list of columns
@@ -564,135 +583,86 @@ module ArJdbc
       columns
     end
 
-    def jdbc_columns(table_name, name = nil)
-      columns(table_name, name)
-    end
-
     def indexes(table_name, name = nil)
-      @connection.indexes(table_name, name, db2_schema)
+      @connection.indexes(table_name, name, schema)
     end
 
-    def add_quotes(name)
-      return name unless name
-      %Q{"#{name}"}
+    def recreate_database(name = nil, options = {})
+      drop_database(name)
     end
-
-    def strip_quotes(str)
-      return str unless str
-      return str unless /^(["']).*\1$/ =~ str
-      str[1..-2]
+    
+    def drop_database(name = nil)
+      tables.each { |table| drop_table("#{table}") }
     end
-
-    def expand_double_quotes(name)
-      return name unless name && name['"']
-      name.gsub(/"/,'""')
+    
+    def execute_table_change(sql, table_name, name = nil)
+      outcome = execute(sql, name)
+      reorg_table(table_name, name)
+      outcome
     end
+    protected :execute_table_change
+    
+    def reorg_table(table_name, name = nil)
+      exec_update "call sysproc.admin_cmd ('REORG TABLE #{table_name}')", name, []
+    end
+    private :reorg_table
+    
+    # alias_method :execute_and_auto_confirm, :execute
 
-    def structure_dump #:nodoc:
-      schema_name = db2_schema.upcase if db2_schema.present?
-      rs = @connection.connection.meta_data.getTables(nil, schema_name, nil, ["TABLE"].to_java(:string))
-      definition = ''
-      while rs.next
-        tname = rs.getString(3)
-        definition << "CREATE TABLE #{tname} (\n"
-        rs2 = @connection.connection.meta_data.getColumns(nil,schema_name,tname,nil)
-        first_col = true
-        while rs2.next
-          col_name = add_quotes(rs2.getString(4));
-          default = ""
-          d1 = rs2.getString(13)
-          # IBM i (as400 toolbox driver) will return an empty string if there is no default
-          if @config[:url] =~ /^jdbc:as400:/
-            default = !d1.blank? ? " DEFAULT #{d1}" : ""
-          else
-            default = d1 ? " DEFAULT #{d1}" : ""
-          end
-
-          type = rs2.getString(6)
-          col_precision = rs2.getString(7)
-          col_scale = rs2.getString(9)
-          col_size = ""
-          if HAVE_SCALE.include?(type) and col_scale
-            col_size = "(#{col_precision},#{col_scale})"
-          elsif (HAVE_LIMIT + HAVE_PRECISION).include?(type) and col_precision
-            col_size = "(#{col_precision})"
-          end
-          nulling = (rs2.getString(18) == 'NO' ? " NOT NULL" : "")
-          autoincrement = (rs2.getString(23) == 'YES' ? " GENERATED ALWAYS AS IDENTITY" : "")
-          create_col_string = add_quotes(expand_double_quotes(strip_quotes(col_name))) +
-            " " +
-            type +
-            col_size +
-            "" +
-            nulling +
-            default +
-            autoincrement
-          if !first_col
-            create_col_string = ",\n #{create_col_string}"
-          else
-            create_col_string = " #{create_col_string}"
-          end
-
-          definition << create_col_string
-
-          first_col = false
-        end
-        definition << ");\n\n"
-
-        pkrs = @connection.connection.meta_data.getPrimaryKeys(nil,schema_name,tname)
-        primary_key = {}
-        while pkrs.next
-          name = pkrs.getString(6)
-          primary_key[name] = [] unless primary_key[name]
-          primary_key[name] << pkrs.getString(4)
-        end
-        primary_key.each do |name, cols|
-          definition << "ALTER TABLE #{tname}\n"
-          definition << "  ADD CONSTRAINT #{name}\n"
-          definition << "      PRIMARY KEY (#{cols.join(', ')});\n\n"
-        end
+    def _execute(sql, name = nil)
+      if self.class.select?(sql)
+        @connection.execute_query_raw(sql)
+      elsif self.class.insert?(sql)
+        (@connection.execute_insert(sql) || last_insert_id(sql)).to_i
+      else
+        @connection.execute_update(sql)
       end
-      definition
     end
+    private :_execute
     
     DRIVER_NAME = 'com.ibm.db2.jcc.DB2Driver'.freeze
     
     def zos?
+      @zos = nil unless defined? @zos
       return @zos unless @zos.nil?
       @zos = 
-        if url = @config[:url]
-          !!( url =~ /^jdbc:db2j:net:/ && @config[:driver] == DRIVER_NAME )
+        if url = config[:url]
+          !!( url =~ /^jdbc:db2j:net:/ && config[:driver] == DRIVER_NAME )
         else
           nil
         end
     end
     
+    # @deprecated no longer used
     def as400?
-      return @as400 unless @as400.nil?
-      @as400 = 
-        if url = @config[:url]
-          !!( url =~ /^jdbc:as400:/ )
-        else
-          nil
-        end
+      false
     end
 
+    def schema
+      db2_schema
+    end
+    
+    def schema=(schema)
+      set_schema(@db2_schema = schema) if db2_schema != schema
+    end
+    
     private
     
+    def set_schema(schema)
+      execute("SET SCHEMA #{schema}")
+    end
+    
     def db2_schema
-      return @db2_schema unless @db2_schema.nil?
+      @db2_schema = false unless defined? @db2_schema
+      return @db2_schema if @db2_schema != false
       @db2_schema = 
-        if @config[:schema].present?
-          @config[:schema]
-        elsif @config[:jndi].present?
+        if config[:schema].present?
+          config[:schema]
+        elsif config[:jndi].present?
           nil # let JNDI worry about schema
-        elsif as400?
-          # AS400 implementation takes schema from library name (last part of URL)
-          # jdbc:as400://localhost/schema;naming=system;libraries=lib1,lib2
-          @config[:url].split('/').last.split(';').first.strip
         else
           # LUW implementation uses schema name of username by default
-          @config[:username].presence || ENV['USER']
+          config[:username].presence || ENV['USER']
         end
     end