Merge pull request #137 from praveen-db2/master

Fixing GitHub issues #134, #135, #136

Author: praveen-db2

IBM_DB_Adapter/ibm_db/CHANGES

@@ -1,6 +1,9 @@
 Change Log
 ==============
 
+2022/10/06 (IBM_DB adapter 5.3.2, driver 3.0.6)
+  - Allowed all rails versions < 6.2 in gemspec, replaced limit clause with FETCH FIRST n ROWS
+
 2022/09/21 (IBM_DB adapter 5.3.1, driver 3.0.6)
   - Yanked version 5.3.0 as package includes clidriver
 

IBM_DB_Adapter/ibm_db/IBM_DB.gemspec

@@ -10,7 +10,7 @@ require 'pathname'
 Gem::Specification.new do |spec|
   # Required spec
   spec.name     = 'ibm_db'
-  spec.version  = '5.3.1'
+  spec.version  = '5.3.2'
   spec.summary  = 'Rails Driver and Adapter for IBM Data Servers: {DB2 on Linux/Unix/Windows, DB2 on zOS, DB2 on i5/OS, Informix (IDS)}'
 
   # Optional spec
@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.homepage = 'https://github.com/ibmdb/ruby-ibmdb'
   spec.required_ruby_version = '>= 2.5.0'
   spec.add_dependency('zip')
-  spec.add_dependency('activerecord', '>= 5.0.7', '<=6.1')
-  spec.requirements << 'ActiveRecord, at least 5.0.7'
+  spec.add_dependency('activerecord', '<6.2')
+  spec.requirements << 'ActiveRecord, at least 6.1'
 
   candidates = Dir.glob("**/*")
   spec.files = candidates.delete_if do |item|

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

@@ -3705,13 +3705,15 @@ def initialize connection
   class IBM_DB < Arel::Visitors::ToSql
     private
       def visit_Arel_Nodes_Limit(o, collector)
-        collector << "LIMIT "
+        collector << " FETCH FIRST "
         visit o.expr, collector
+        collector << " ROWS ONLY "
       end
 
       def visit_Arel_Nodes_Offset(o, collector)
-        collector << "OFFSET "
+        collector << " OFFSET "
         visit o.expr, collector
+        collector << " ROWS"
       end
 
       def visit_Arel_Nodes_ValuesList(o, collector)
@@ -3753,7 +3755,10 @@ def visit_Arel_Nodes_SelectStatement o, collector
           }
         end
 
-        if (o.offset && o.limit.nil?)
+        if (o.offset && o.limit)
+          visit_Arel_Nodes_Offset(o.offset, collector)
+          visit_Arel_Nodes_Limit(o.limit, collector)
+        elsif (o.offset && o.limit.nil?)
           collector << " OFFSET "
           visit o.offset.expr, collector
           collector << " ROWS "