DRY DB2 limit/offset code

jruby · Nov 29, 2010 · 13986d8 · 13986d8
1 parent 8128419
commit 13986d8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/lib/arel/visitors/db2.rb b/lib/arel/visitors/db2.rb
@@ -8,18 +8,7 @@ def visit_Arel_Nodes_SelectStatement o
       end
 
       def add_limit_offset(sql, o)
-        limit, offset = o.limit, o.offset
-        if limit && !offset
-          if limit == 1
-            sql << " FETCH FIRST ROW ONLY"
-          else
-            sql << " FETCH FIRST #{limit} ROWS ONLY"
-          end
-        elsif limit && offset
-          sql.gsub!(/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}"
-        end
-        sql
+        @connection.replace_limit_offset! sql, o.limit, o.offset
       end
     end
   end

diff --git a/lib/arjdbc/db2/adapter.rb b/lib/arjdbc/db2/adapter.rb
@@ -149,7 +149,10 @@ def arel2_visitors
     end
 
     def add_limit_offset!(sql, options)
-      limit, offset = options[:limit], options[:offset]
+      replace_limit_offset!(sql, options[:limit], options[:offset])
+    end
+
+    def replace_limit_offset!(sql, limit, offset)
       if limit && !offset
         if limit == 1
           sql << " FETCH FIRST ROW ONLY"
@@ -160,6 +163,7 @@ def add_limit_offset!(sql, options)
         sql.gsub!(/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 <= #{sanitize_limit(limit) + offset}"
       end
+      sql
     end
 
     def pk_and_sequence_for(table)