activesalesforce 0.1.9 → 0.2.0

data/README

@@ -18,14 +18,13 @@
 
 4. edit database.yml
 
-		adapter: salesforce
-  		url: <salesforce api server url goes here>
+		adapter: activesalesforce
+  		url: https://www.salesforce.com/services/Soap/u/7.0
   		username: <salesforce user name goes here>
   		password: <salesforce password goes here>
   		
 5. proceed using standard Rails development techniques!  	
 
-NOTE: To use a custom object append the word Custom to the name of the object instead of __c, e.g. FlipflapOnTheDuckmill would be FlipflapOnTheDuckmillCustom 	
 
 == Description of contents
 

data/lib/salesforce_connection_adapter.rb

@@ -42,8 +42,8 @@ module ActiveRecord
     @@cache = {}
     
     # Establishes a connection to the database that's used by all Active Record objects.
-    def self.salesforce_connection(config) # :nodoc:
-      puts "Using Salesforce connection!"
+    def self.activesalesforce_connection(config) # :nodoc:
+      puts "Using ActiveSalesforce connection!"
       
       url = config[:url]
       username = config[:username]
@@ -121,7 +121,7 @@ module ActiveRecord
       
       
       def adapter_name #:nodoc:
-        'Salesforce'
+        'ActiveSalesforce'
       end
       
       
@@ -167,9 +167,9 @@ module ActiveRecord
         log(sql, name)
         
         # Check for SELECT COUNT(*) FROM query
-        matchCount = sql.match(/SELECT COUNT\(\*\) FROM/i)       
-        if matchCount
-          sql = "SELECT id FROM#{matchCount.post_match}"
+        selectCountMatch = sql.match(/SELECT COUNT\(\*\) FROM/i)       
+        if selectCountMatch
+          soql = "SELECT id FROM#{selectCountMatch.post_match}"
         end
         
         raw_table_name = sql.match(/FROM (\w+)/i)[1]
@@ -179,7 +179,8 @@ module ActiveRecord
 
         column_names = api_column_names(table_name)
         
-        soql = sql.sub(/SELECT \* FROM/i, "SELECT #{column_names.join(', ')} FROM")
+        # Always (unless COUNT*)'ing) select all columns (required for the AR attributes mechanism to work correctly
+        soql = sql.sub(/SELECT .+ FROM/i, "SELECT #{column_names.join(', ')} FROM") unless selectCountMatch
         
         soql.sub!(/ FROM \w+/i, " FROM #{entity_def.api_name}")
         
@@ -231,7 +232,7 @@ module ActiveRecord
           result << row        
         end
         
-        if matchCount
+        if selectCountMatch
           [{ :count => result.actual_size }]
         else
           result

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: activesalesforce
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
-date: 2006-02-05 00:00:00 -05:00
+  version: 0.2.0
+date: 2006-02-06 00:00:00 -05:00
 summary: ActiveSalesforce is an extension to the Rails Framework that allows for the dynamic creation and management of ActiveRecord objects through the use of Salesforce meta-data and uses a Salesforce.com organization as the backing store.
 require_paths: 
 - lib