activesalesforce 0.5.5 → 0.5.6

data/lib/asf_adapter.rb

@@ -258,7 +258,13 @@ module ActiveRecord
           column_names = columns.map { |column| column.api_name }
 
           # Check for SELECT COUNT(*) FROM query
-          selectCountMatch = sql.match(/SELECT\s+COUNT\(\*\)\s+FROM/i)       
+          
+          # Rails 1.1
+          selectCountMatch = sql.match(/SELECT\s+COUNT\(\*\)\s+AS\s+count_all\s+FROM/i)
+          
+          # Rails 1.0
+          selectCountMatch = sql.match(/SELECT\s+COUNT\(\*\)\s+FROM/i) unless selectCountMatch 
+          
           if selectCountMatch
             soql = "SELECT id FROM#{selectCountMatch.post_match}"
           else 

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: activesalesforce
 version: !ruby/object:Gem::Version 
-  version: 0.5.5
+  version: 0.5.6
 date: 2006-05-04 00:00:00 -04:00
 summary: ActiveSalesforce (ASF) is a Rails connection adapter that provides direct access to Salesforce.com hosted data and metadata via the ActiveRecord model layer. Objects, fields, and relationships are all auto surfaced as active record attributes and rels.
 require_paths: