activesalesforce 0.1.4 → 0.1.5

data/lib/salesforce_connection_adapter.rb

@@ -72,10 +72,15 @@ module ActiveRecord
         super message
         
         @fault = fault
+        
+        puts "\nSalesforceError:\n   message='#{message}'\n   fault='#{fault}'\n\n"
       end
     end
     
     class SalesforceAdapter < AbstractAdapter
+      COLUMN_NAME_REGEX = /@C_(\w+)/
+      COLUMN_VALUE_REGEX = /@V_'(([^']|\\')*)'/
+      
       include StringHelper
       
       attr_accessor :batch_size
@@ -91,10 +96,12 @@ module ActiveRecord
         @relationships_map = {}
       end
       
+      
       def adapter_name #:nodoc:
         'Salesforce'
       end
       
+      
       def supports_migrations? #:nodoc:
         false
       end
@@ -103,38 +110,29 @@ module ActiveRecord
       # QUOTING ==================================================
       
       def quote(value, column = nil)
-        if value.kind_of?(String) && column && column.type == :binary
-          s = column.class.string_to_binary(value).unpack("H*")[0]
-          "x'#{s}'"
-        else
-          super
-        end
+        case value
+          when NilClass              then quoted_value = "'NULL'"
+          when TrueClass             then quoted_value = "'TRUE'"
+          when FalseClass            then quoted_value = "'FALSE'"
+          else                       quoted_value = super(value, column)
+        end      
+        
+        "@V_#{quoted_value}"
       end
       
+      
       def quote_column_name(name) #:nodoc:
         # Mark the column name to make it easier to find later
-        "@@#{name}"
-      end
-      
-      def quote_string(string) #:nodoc:
-        string
+        "@C_#{name}"
       end
       
-      def quoted_true
-        "TRUE"
-      end
-      
-      def quoted_false
-        "FALSE"
-      end
-      
-      
       # CONNECTION MANAGEMENT ====================================
       
       def active?
         true
       end
       
+      
       def reconnect!
         connect
       end
@@ -157,11 +155,14 @@ module ActiveRecord
         
         # Fixup column references to use api names
         columns = columns_map(table_name)
-        while soql =~ /@@(\w+)/
+        while soql =~ COLUMN_NAME_REGEX
           column = columns[$~[1]]
           soql = $~.pre_match + column.api_name + $~.post_match
         end
         
+        # Remove column value prefix
+        soql.gsub!(/@V_/, "")
+        
         log(soql, name)
         
         @connection.batch_size = @batch_size if @batch_size
@@ -196,6 +197,7 @@ module ActiveRecord
         result
       end
       
+      
       def select_one(sql, name = nil) #:nodoc:
         self.batch_size = 1
         
@@ -214,21 +216,26 @@ module ActiveRecord
         end
       end
       
+      
       def insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
-        tokens = sql.scan(/[0-9A-Za-z._]+/)
+        log(sql, name)
         
         # Convert sql to sobject
-        table_name = tokens[2].singularize
+        table_name = sql.match(/INSERT INTO (\w+) /)[1].singularize
         entity_name = entity_name_from_table(table_name)
         columns = columns_map(table_name)
         
-        # Extract array of [column_name, value] pairs
-        names = tokens[3 .. tokens.length / 2]
-        values = tokens[(tokens.length / 2) + 2 ..  tokens.length]
+        # Extract array of column names
+        names = extract_columns(sql)
         
+        # Extract arrays of values
+        values = extract_values(sql)
+
+        pp names
+        pp values
+                
         fields = {}
-        names.length.times do | n | 
-          name = names[n]
+        names.each_with_index do | name, n | 
           value = values[n]
           column = columns[name]
           
@@ -240,35 +247,38 @@ module ActiveRecord
         check_result(get_result(@connection.create(:sObjects => sobject), :create))[0][:id]
       end      
       
+      
       def update(sql, name = nil) #:nodoc:
+        log(sql, name)
+        
         # Convert sql to sobject
         table_name = sql.match(/UPDATE (\w+) /)[1].singularize
         entity_name = entity_name_from_table(table_name)
         columns = columns_map(table_name)
         
-        # Extract array of [column_name, value] pairs
-        raw_fields = sql.scan(/(\w+) = '([^']*)'/)
-        
+        names = extract_columns(sql)
+        values = extract_values(sql)
+
         fields = {}
-        raw_fields.each do | name, value | 
+        names.each_with_index do | name, n | 
           column = columns[name]
-          fields[column.api_name] = value if not column.readonly or name == "id"
+          value = values[n]
+          fields[column.api_name] = value if not column.readonly and value != "NULL"
         end
-        
-        id = fields["Id"].match(/[a-zA-Z0-9]+/)[0]
-        fields.delete("Id")
+
+        id = sql.match(/WHERE id = @V_'(\w+)'/)[1]
         
         sobject = create_sobject(entity_name, id, fields)
         
         check_result(get_result(@connection.update(:sObjects => sobject), :update))
       end
       
+      
       def delete(sql, name = nil) 
-        # Extract the ids from the IN () clause
-        match = sql.match(/IN \(([^\)]*)\)/)
+        log(sql, name)
         
-        # If the IN clause was not found fall back to WHERE id = 'blah'
-        ids = match ? match[1].scan(/\w+/) : [ sql.match(/WHERE id = '([^\']*)'/)[1] ]
+        # Extract the ids
+        ids = extract_values(sql)
         
         ids_element = []        
         ids.each { |id| ids_element << :ids << id }
@@ -276,25 +286,28 @@ module ActiveRecord
         check_result(get_result(@connection.delete(ids_element), :delete))
       end
       
+      
       def get_result(response, method)
         responseName = (method.to_s + "Response").to_sym
         finalResponse = response[responseName]
         
-        raise SalesforceError.new(response[:Fault].faultstring, response.fault) unless finalResponse
+        raise SalesforceError.new(response[:fault][:faultstring], response.fault) unless finalResponse
         
         result = finalResponse[:result]
-      end        
+      end       
+      
       
       def check_result(result)
         result = [ result ] unless result.is_a?(Array)
         
         result.each do |r|
-          raise SalesforceError.new(r[:errors], r[:errors].Message) unless r[:success] == "true"
+            raise SalesforceError.new(r[:errors], r[:errors][:message]) unless r[:success] == "true"
         end
         
         result
       end
       
+      
       def columns(table_name, name = nil)
         entity_name = entity_name_from_table(table_name)
         
@@ -331,6 +344,7 @@ module ActiveRecord
         cached_columns
       end
       
+      
       def configure_active_record(entity_name)
         klass = entity_name.constantize
         klass.table_name = entity_name
@@ -370,6 +384,7 @@ module ActiveRecord
         
       end
       
+      
       def relationships(table_name)
         entity_name = entity_name_from_table(table_name)
         
@@ -383,6 +398,7 @@ module ActiveRecord
         @relationships_map[entity_name]
       end
       
+      
       def columns_map(table_name, name = nil)
         entity_name = entity_name_from_table(table_name)
         
@@ -397,6 +413,7 @@ module ActiveRecord
         columns_map
       end
       
+      
       def entity_name_from_table(table_name)
         return table_name.singularize.camelize
       end
@@ -415,17 +432,31 @@ module ActiveRecord
         sobj
       end
       
+      
       def table_name_from_sql(sql)
         sql.match(/FROM (\w+) /)[1].singularize
       end
       
+      
       def column_names(table_name)
         columns(table_name).map { |column| column.name }
       end
       
+      
       def api_column_names(table_name)
         columns(table_name).map { |column| column.api_name }
       end
+      
+      
+      def extract_columns(sql)
+        sql.scan(COLUMN_NAME_REGEX).flatten
+      end
+      
+      
+      def extract_values(sql)
+        sql.scan(COLUMN_VALUE_REGEX).map { |v| v[0] }
+      end
+      
     end
     
   end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: activesalesforce
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 date: 2006-02-03 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: 
@@ -12,7 +12,7 @@ email: dchasman@salesforce.com
 homepage: http://rubyforge.org/projects/activesfdc/
 rubyforge_project: 
 description: 
-autorequire: active_salesforce
+autorequire: activesalesforce
 default_executable: 
 bindir: bin
 has_rdoc: false
@@ -30,7 +30,7 @@ authors:
 files: 
 - lib/salesforce_login.rb
 - lib/column_definition.rb
-- lib/active_salesforce.rb
+- lib/activesalesforce.rb
 - lib/rforce.rb
 - lib/salesforce_connection_adapter.rb
 - test/unit