activesalesforce 0.1.8 → 0.1.9

data/lib/salesforce_connection_adapter.rb

@@ -45,18 +45,18 @@ module ActiveRecord
     def self.salesforce_connection(config) # :nodoc:
       puts "Using Salesforce connection!"
       
-      config = config.symbolize_keys
-      
-      url = config[:url].to_s
-      username = config[:username].to_s
-      password = config[:password].to_s
+      url = config[:url]
+      username = config[:username]
+      password = config[:password]
       
       connection = @@cache["#{url}.#{username}.#{password}"]
-      
-      if not connection
+      unless connection
+        puts "Establishing new connection for ['#{url}', '#{username}']"
+
         connection = SalesforceLogin.new(url, username, password).proxy 
         @@cache["#{url}.#{username}.#{password}"] = connection
-        puts "Created new connection for [#{url}, #{username}]"
+        
+        puts "Created new connection for ['#{url}', '#{username}']"
       end
       
       ConnectionAdapters::SalesforceAdapter.new(connection, logger, [url, username, password], config)
@@ -166,22 +166,28 @@ module ActiveRecord
       def select_all(sql, name = nil) #:nodoc:
         log(sql, name)
         
-        raw_table_name = sql.match(/FROM (\w+) /)[1]
+        # Check for SELECT COUNT(*) FROM query
+        matchCount = sql.match(/SELECT COUNT\(\*\) FROM/i)       
+        if matchCount
+          sql = "SELECT id FROM#{matchCount.post_match}"
+        end
+        
+        raw_table_name = sql.match(/FROM (\w+)/i)[1]
         table_name = raw_table_name.singularize
         entity_name = entity_name_from_table(table_name)
         entity_def = get_entity_def(entity_name)
 
         column_names = api_column_names(table_name)
         
-        soql = sql.sub(/SELECT \* FROM /, "SELECT #{column_names.join(', ')} FROM ")
+        soql = sql.sub(/SELECT \* FROM/i, "SELECT #{column_names.join(', ')} FROM")
         
-        soql.sub!(/ FROM \w+ /, " FROM #{entity_def.api_name} ")
+        soql.sub!(/ FROM \w+/i, " FROM #{entity_def.api_name}")
         
         # Look for a LIMIT clause
-        soql.sub!(/LIMIT 1/, "")
+        soql.sub!(/LIMIT 1/i, "")
         
         # Look for an OFFSET clause
-        soql.sub!(/\d+ OFFSET \d+/, "")
+        soql.sub!(/\d+ OFFSET \d+/i, "")
         
         # Fixup column references to use api names
         columns = columns_map(table_name)
@@ -191,7 +197,7 @@ module ActiveRecord
         end
         
         # Update table name references
-        soql.sub!(/#{raw_table_name}\./, "#{entity_def.api_name}.")
+        soql.sub!(/#{raw_table_name}\./i, "#{entity_def.api_name}.")
         
         # Remove column value prefix
         soql.gsub!(/@V_/, "")
@@ -215,9 +221,6 @@ module ActiveRecord
           record.each do |name, value| 
             name = column_nameize(name.to_s)
             if name != "type"
-              # Replace nil element with nil
-              value = nil if value.respond_to?(:xmlattr_nil) and value.xmlattr_nil
-              
               # Ids are returned in an array with 2 duplicate entries...
               value = value[0] if name == "id"
               
@@ -228,28 +231,22 @@ module ActiveRecord
           result << row        
         end
         
-        result
+        if matchCount
+          [{ :count => result.actual_size }]
+        else
+          result
+        end
       end
       
       
       def select_one(sql, name = nil) #:nodoc:
         self.batch_size = 1
         
-        # Check for SELECT COUNT(*) FROM query
-        matchCount = sql.match(/SELECT COUNT\(\*\) FROM /)       
-        if matchCount
-          sql = "SELECT id FROM #{matchCount.post_match}"
-        end
-        
         log(sql, name)
         
         result = select_all(sql, name)
         
-        if matchCount
-          { :count => result.actual_size }
-        else
-          result.nil? ? nil : result.first
-        end
+        result.nil? ? nil : result.first
       end
       
       
@@ -257,7 +254,7 @@ module ActiveRecord
         log(sql, name)
         
         # Convert sql to sobject
-        table_name = sql.match(/INSERT INTO (\w+) /)[1].singularize
+        table_name = sql.match(/INSERT INTO (\w+) /i)[1].singularize
         entity_name = entity_name_from_table(table_name)
         columns = columns_map(table_name)
         
@@ -285,7 +282,7 @@ module ActiveRecord
         log(sql, name)
         
         # Convert sql to sobject
-        table_name = sql.match(/UPDATE (\w+) /)[1].singularize
+        table_name = sql.match(/UPDATE (\w+) /i)[1].singularize
         entity_name = entity_name_from_table(table_name)
         columns = columns_map(table_name)
         
@@ -299,7 +296,7 @@ module ActiveRecord
           fields[column.api_name] = value if not column.readonly and value != "NULL"
         end
 
-        id = sql.match(/WHERE id = @V_'(\w+)'/)[1]
+        id = sql.match(/WHERE id = @V_'(\w+)'/i)[1]
         
         sobject = create_sobject(entity_name, id, fields)
         

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: activesalesforce
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
-date: 2006-02-04 00:00:00 -05:00
+  version: 0.1.9
+date: 2006-02-05 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