salesforce-sql 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f01df703e1067d09fb1b74a5917ec59687d8fd6f
-  data.tar.gz: d741bb84bea358a71e1f551e34f5da4d076913c4
+  metadata.gz: 39135041a9aef55d8bc41f053c6734a48a81539c
+  data.tar.gz: 217155859971b571c010ff51ca06924d3149633e
 SHA512:
-  metadata.gz: 697263b8ecb8dad4fc84bf186cf92eb4697904e4106019dcd87d1bdd0143744a1013be5f8fa8a1b8d425f5aaf8e9b291fa557cc0a470f67763f0386cfcd8896d
-  data.tar.gz: ed27f47aa432dc6fc289f773ba3ac9a263cc0a7f65ef2ae428b27ff7445b9fc76d4cf6ca24fb908696fe5f16a24261207ea1f0f432588229020a3c112920ac1d
+  metadata.gz: 81ac9b04b995b7ce8cac6ac74fc9186a1a05f94424594f3b1c611b4bbd178ddd739c1fafa576c5c33db9d446b23814e1736bd30d26a59a64d51347a5aa736ab7
+  data.tar.gz: 10e95d94b77fede78cf71c6746c35f88924ac5479349c66b62002df3dd8d9f6c04ffd650f3fc6fd301a15145ad38aa95f193d66edd17fc5b791561cf1bc7a876

data/lib/salesforce/sql/app.rb

@@ -5,6 +5,9 @@ module Salesforce
       attr_accessor :debug
       attr_accessor :username
       attr_accessor :step
+      attr_accessor :salesforce_bulk_client
+      attr_accessor :restforce_client
+      attr_accessor :default_ignore_fields
 
       def initialize credentials
 
@@ -20,7 +23,6 @@ module Salesforce
         @default_ignore_fields = [
           'Id',
           'IsDeleted',
-          'IsPartner',
           'MasterRecordId',
           'ParentId',
           'OwnerId',
@@ -100,6 +102,49 @@ module Salesforce
 
       end
 
+      # Description: It will resolve the id mapping for a set of records
+      # parameters:
+      #   source: The Salesforce::SQL of the source organization
+      #   dependency_object: The DEPENDENCY object name
+      #   dependency_object_pk: the DEPENENCY field to be used as primary key 
+      #   object_fk_field: The foreign key field name in the OBJECT
+
+      def map_ids source: , records: ,  object_fk_field: , dependency_object_pk: , dependency_object: nil
+
+        # Get dependency object ids from the object
+        dependency_ids = records.map{|row| row[object_fk_field]}.compact.sort.uniq
+
+        # Use those Ids to get the object records from source including the dependency_object_pk
+        source_object = source.query "Select Id,#{dependency_object_pk} FROM #{dependency_object}", dependency_ids
+
+        # Get the dependency_object_pk values and export the IDs from the target object
+        dependency_object_pk_values = source_object.map {|row| row[dependency_object_pk].gsub("'", %q(\\\')) if not row[dependency_object_pk].nil? }.compact
+        target_object = self.query_select_in "Select Id,#{dependency_object_pk} FROM #{dependency_object} WHERE #{dependency_object_pk}", dependency_object_pk_values
+
+        # Now we have source_object and target_object ids and values, we can do the mapping on records
+        records.map! do |record|
+
+          # If the :object_fk_field is nil, then there is no reference to map and we import the record as itis
+          next record if record[object_fk_field].nil?
+
+          # Grab the source dependency item for this record using the :object_fk_field id, if the source item doesn't exist, don't insert the record
+          source_item = source_object.select {|row| row['Id'] == record[object_fk_field] }
+          next if source_item.empty?
+
+          # Grab the target dependency item for this record using the :dependency_object_pk, if the target item doesnt exist, don't insert the record
+          target_item = target_object.select {|row| row[dependency_object_pk] == source_item.first[dependency_object_pk]}
+          next if target_item.empty?
+
+          # The actual mapping
+          record[object_fk_field] = target_item.first['Id']
+          record
+
+        end
+
+        records
+
+      end
+
       # Description: Copy an object from one source to target
       # Parameters:
       #   object: The object to copy
@@ -137,7 +182,7 @@ module Salesforce
           source_object = source.query "Select Id,#{dep[:dependency_object_pk]} FROM #{dep[:dependency_object]}", dependency_ids
 
           # Get the dependency_object_pk values and export the IDs from the target object
-          dependency_object_pk_values = source_object.map {|row| row[dep[:dependency_object_pk]].gsub("'", %q(\\\'))}
+          dependency_object_pk_values = source_object.map {|row| row[dep[:dependency_object_pk]].gsub("'", %q(\\\')) if not row[dep[:dependency_object_pk]].nil? }.compact
           target_object = self.query_select_in "Select Id,#{dep[:dependency_object_pk]} FROM #{dep[:dependency_object]} WHERE #{dep[:dependency_object_pk]}", dependency_object_pk_values
 
           # Now we have source_object and target_object ids and values, we can do the mapping on bulk_import_records
@@ -207,8 +252,6 @@ module Salesforce
         count_after - count_before
       end
 
-      private
-
       def bulk_insert object, records
         (0..(records.size-1)).step(@bulk_api_step).each do |n|
           job = @salesforce_bulk_client.create object, records[n..n+@bulk_api_step-1]

data/lib/salesforce/sql/version.rb

@@ -1,5 +1,5 @@
 module Salesforce
   module Sql
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salesforce-sql
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Juan Breinlinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler