fb_adapter 0.5.10 → 0.6.0

data/lib/active_record/connection_adapters/fb_adapter.rb

@@ -18,7 +18,8 @@ module ActiveRecord
       begin
         connection = db.connect
       rescue
-        require_library_or_gem 'pp'; pp config
+        require_library_or_gem 'pp'
+        pp config
         connection = config[:create] ? db.create.connect : (raise ConnectionNotEstablished, "No Firebird connections established.")
       end
       ConnectionAdapters::FbAdapter.new(connection, logger, config)
@@ -355,11 +356,14 @@ module ActiveRecord
       end
 
       def add_limit_offset!(sql, options) # :nodoc:
-        if options[:limit]
-          limit_string = "FIRST #{options[:limit]}"
-          limit_string << " SKIP #{options[:offset]}" if options[:offset]
-          sql.sub!(/\A(\s*SELECT\s)/i, '\&' + limit_string + ' ')
+        if limit = options[:limit]
+          if offset = options[:offset]
+            sql << " ROWS #{offset.to_i + 1} TO #{offset.to_i + limit.to_i}"
+          else
+            sql << " ROWS #{limit.to_i}"
+          end
         end
+        sql
       end
 
       # Returns the next sequence value from a sequence generator. Not generally

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fb_adapter
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 10
-  version: 0.5.10
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Brent Rowland
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-09 00:00:00 -08:00
+date: 2011-01-06 00:00:00 -08:00
 default_executable: 
 dependencies: []