5 files changed, 29 insertions, 20 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index 0ed496ea43..bc30a94c97 100755
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -353,10 +353,22 @@ module ActiveRecord
       def structure_dump() end
 
       def add_limit!(sql, limit)
+        if limit.is_a? Array
+          limit, offset = *limit
+          add_limit_with_offset!(sql, limit.to_i, offset.to_i)
+        else
+          add_limit_without_offset!(sql, limit)
+        end
+      end
+        
+      def add_limit_with_offset!(sql, limit, offset)
+        sql << " LIMIT #{limit} OFFSET #{offset}"
+      end
+      
+      def add_limit_without_offset!(sql, limit)
         sql << " LIMIT #{limit}"
       end
 
-
       def initialize_schema_information
         begin
           execute "CREATE TABLE schema_info (version #{native_database_types[:integer][:name]}#{native_database_types[:integer][:limit]})"
diff --git a/activerecord/lib/active_record/connection_adapters/db2_adapter.rb b/activerecord/lib/active_record/connection_adapters/db2_adapter.rb
index d5bb1147f9..b712971609 100644
--- a/activerecord/lib/active_record/connection_adapters/db2_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/db2_adapter.rb
@@ -89,7 +89,11 @@ begin
           s.gsub(/'/, "''") # ' (for ruby-mode)
         end
 
-        def add_limit!(sql, limit)
+        def add_limit_with_offset!(sql, limit, offset)
+          raise ArgumentError, 'add_limit_with_offset! not implemented'
+        end
+
+        def add_limit_without_offset!(sql, limit)
           sql << " FETCH FIRST #{limit} ROWS ONLY"
         end
 
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index fd730a12dc..57f3b6f5e9 100755
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -172,7 +172,11 @@ module ActiveRecord
           structure += select_one("SHOW CREATE TABLE #{table.to_a.first.last}")["Create Table"] + ";\n\n"
         end
       end
- 
+      
+      def add_limit_with_offset!(sql, limit, offset)
+        sql << " LIMIT #{offset}, #{limit}"
+      end
+       
       def recreate_database(name)
         drop_database(name)
         create_database(name)
diff --git a/activerecord/lib/active_record/connection_adapters/oci_adapter.rb b/activerecord/lib/active_record/connection_adapters/oci_adapter.rb
index 54feebcb38..06e2273b28 100644
--- a/activerecord/lib/active_record/connection_adapters/oci_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/oci_adapter.rb
@@ -182,10 +182,6 @@ begin
         alias :update :execute
         alias :delete :execute
 
-        def add_limit!(sql, limit)
-          sql << "LIMIT=" << limit.to_s
-        end
-
         def begin_db_transaction()
           @connection.autocommit = false
         end
diff --git a/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb
index f6325d845c..adc7e9d98f 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb
@@ -253,19 +253,12 @@ EOL
         "[#{name}]"
       end
 
-      def add_limit!(sql, limit)
-        if sql =~ /LIMIT/i
-          limit = sql.slice!(/LIMIT.*/).gsub(/LIMIT.(.*)$/, '\1')
-        end
-        if !limit.nil?
-          limit_amount = limit.to_s.include?("OFFSET") ? get_offset_amount(limit) : Array.new([limit])
-          order_by = sql.include?("ORDER BY") ? get_order_by(sql.sub(/.*ORDER\sBY./, "")) : nil
-          if limit_amount.size == 2
-            sql.gsub!(/SELECT/i, "SELECT * FROM ( SELECT TOP #{limit_amount[0]} * FROM ( SELECT TOP #{limit_amount[1]}")<<" ) AS tmp1 ORDER BY #{order_by[1]} ) AS tmp2 ORDER BY #{order_by[0]}"
-          else
-            sql.gsub!(/SELECT/i, "SELECT TOP #{limit_amount[0]}")
-          end
-        end
+      def add_limit_with_offset!(sql, limit, offset)
+        raise ArgumentError, 'add_limit_with_offset! not implemented'
+      end
+
+      def add_limit_without_offset!(sql, limit)
+        raise ArgumentError, 'add_limit_without_offset! not implemented'
       end
 
       def recreate_database(name)