activesalesforce 0.4.4 → 0.4.5

data/lib/asf_adapter.rb

@@ -105,7 +105,7 @@ module ActiveRecord
       MAX_BOXCAR_SIZE = 200
       
       attr_accessor :batch_size
-      attr_reader :entity_def_map, :keyprefix_to_entity_def_map, :config
+      attr_reader :entity_def_map, :keyprefix_to_entity_def_map, :config, :class_to_entity_map
       
       def initialize(connection, logger, connection_options, config)
         super(connection, logger)
@@ -121,8 +121,10 @@ module ActiveRecord
       
       
       def set_class_for_entity(klass, entity_name)
-        @logger.debug("Setting @class_to_entity_map['#{entity_name.upcase}'] = #{klass}")
+        @logger.debug("Setting @class_to_entity_map['#{entity_name.upcase}'] = #{klass} for connection #{self}")
         @class_to_entity_map[entity_name.upcase] = klass
+        
+        pp @class_to_entity_map
       end
       
       
@@ -541,13 +543,13 @@ module ActiveRecord
           
           key_prefix = metadata[:keyPrefix]
           
-          entity_def = ActiveSalesforce::EntityDefinition.new(self, entity_name, 
+          entity_def = ActiveSalesforce::EntityDefinition.new(self, entity_name, entity_klass,
                                                               cached_columns, cached_relationships, custom, key_prefix)
           
           @entity_def_map[entity_name] = entity_def
           @keyprefix_to_entity_def_map[key_prefix] = entity_def
           
-          configure_active_record entity_def
+          configure_active_record(entity_def)
           
           entity_def
         }
@@ -557,7 +559,7 @@ module ActiveRecord
       def configure_active_record(entity_def)
         entity_name = entity_def.name
         klass = class_from_entity_name(entity_name)
-        
+
         class << klass
           def asf_augmented?
             true
@@ -567,7 +569,7 @@ module ActiveRecord
         # Add support for SID-based authentication
         ActiveSalesforce::SessionIDAuthenticationFilter.register(klass)
         
-        klass.set_inheritance_column nil
+        klass.set_inheritance_column nil unless entity_def.custom?
         klass.set_primary_key "id" 
         klass.lock_optimistically = false
         klass.record_timestamps = false
@@ -584,7 +586,7 @@ module ActiveRecord
             # DCHASMAN TODO Figure out how to handle polymorphic refs (e.g. Note.parent can refer to 
             # Account, Contact, Opportunity, Contract, Asset, Product2, <CustomObject1> ... <CustomObject(n)>
             if reference_to.is_a? Array
-              @logger.debug("   Skipping unsupported polymophic one-to-#{one_to_many ? 'many' : 'one' } relationship '#{referenceName}' from #{entity_name} to [#{relationship.reference_to.join(', ')}] using #{foreign_key}")
+              @logger.debug("   Skipping unsupported polymophic one-to-#{one_to_many ? 'many' : 'one' } relationship '#{referenceName}' from #{klass} to [#{relationship.reference_to.join(', ')}] using #{foreign_key}")
               next 
             end
             
@@ -599,16 +601,19 @@ module ActiveRecord
               
               referenced_klass = klass.class_eval("::#{reference_to} = Class.new(ActiveRecord::Base)")
               
+              # Automatically inherit the connection from the referencee
+              referenced_klass.connection = klass.connection
+              
               # configure_active_record(get_entity_def(reference_to))
             end
             
             if one_to_many
-              klass.has_many referenceName.to_sym, :class_name => reference_to, :foreign_key => foreign_key, :dependent => false
+              klass.has_many referenceName.to_sym, :class_name => referenced_klass.name, :foreign_key => foreign_key, :dependent => false
             else
-              klass.belongs_to referenceName.to_sym, :class_name => reference_to, :foreign_key => foreign_key, :dependent => false
+              klass.belongs_to referenceName.to_sym, :class_name => referenced_klass.name, :foreign_key => foreign_key, :dependent => false
             end
             
-            #@logger.debug("   Created one-to-#{one_to_many ? 'many' : 'one' } relationship '#{referenceName}' from #{entity_name} to #{relationship.reference_to} using #{foreign_key}")
+            @logger.debug("   Created one-to-#{one_to_many ? 'many' : 'one' } relationship '#{referenceName}' from #{klass} to #{referenced_klass} using #{foreign_key}")
             
           end
         end

data/lib/entity_definition.rb

@@ -23,11 +23,12 @@ require 'pp'
 
 module ActiveSalesforce  
   class EntityDefinition
-    attr_reader :name, :columns, :column_name_to_column, :api_name_to_column, :relationships, :key_prefix
+    attr_reader :name, :asf_class, :columns, :column_name_to_column, :api_name_to_column, :relationships, :key_prefix
     
-    def initialize(connection, name, columns, relationships, custom, key_prefix)
+    def initialize(connection, name, asf_class, columns, relationships, custom, key_prefix)
       @connection = connection
       @name = name
+      @asf_class = asf_class
       @columns = columns
       @relationships = relationships
       @custom = custom

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: activesalesforce
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
-date: 2006-03-13 00:00:00 -05:00
+  version: 0.4.5
+date: 2006-03-15 00:00:00 -05: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: 
 - lib