Merge pull request #163 from praveen-db2/master

GitHub Issues #153, #155, #157 fixed.

Author: bimalkjha

IBM_DB_Adapter/ibm_db/IBM_DB.gemspec

@@ -18,8 +18,10 @@ Gem::Specification.new do |spec|
   spec.email = 'opendev@us.ibm.com'
   spec.homepage = 'https://github.com/ibmdb/ruby-ibmdb'
   spec.required_ruby_version = '>= 2.5.0'
-  spec.add_dependency('zip')
+  spec.add_dependency('rubyzip')
   spec.add_dependency('down')
+  spec.add_dependency('rails', '>= 7.0')
+  spec.requirements << 'rails, at least 7.0'
   spec.add_dependency('activerecord', '<7.1')
   spec.requirements << 'ActiveRecord, at least 7.0'
 

IBM_DB_Adapter/ibm_db/lib/active_record/connection_adapters/ibm_db_adapter.rb

@@ -1,7 +1,7 @@
 # +----------------------------------------------------------------------+
 # |  Licensed Materials - Property of IBM                                |
 # |                                                                      |
-# | (C) Copyright IBM Corporation 2006 - 2022          					 |
+# | (C) Copyright IBM Corporation 2006 - 2023          					 |
 # +----------------------------------------------------------------------+
 # |  Authors: Antonio Cangiano <cangiano@ca.ibm.com>                     |
 # |         : Mario Ds Briggs  <mario.briggs@in.ibm.com>                 |
@@ -3759,15 +3759,13 @@ def initialize connection
   class IBM_DB < Arel::Visitors::ToSql
     private
       def visit_Arel_Nodes_Limit(o, collector)
-        collector << " FETCH FIRST "
+        collector << " LIMIT "
         visit o.expr, collector
-        collector << " ROWS ONLY "
       end
 
       def visit_Arel_Nodes_Offset(o, collector)
         collector << " OFFSET "
         visit o.expr, collector
-        collector << " ROWS"
       end
 
       def visit_Arel_Nodes_ValuesList(o, collector)
@@ -3810,8 +3808,8 @@ def visit_Arel_Nodes_SelectStatement o, collector
         end
 
         if (o.offset && o.limit)
-          visit_Arel_Nodes_Offset(o.offset, collector)
           visit_Arel_Nodes_Limit(o.limit, collector)
+          visit_Arel_Nodes_Offset(o.offset, collector)
         elsif (o.offset && o.limit.nil?)
           collector << " OFFSET "
           visit o.offset.expr, collector