salesforce-sql 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdbae01f13b8d65322ceee413d9fe5fda6414ae0
-  data.tar.gz: 20dea60817eeeea2686de725bb2ce985304c2615
+  metadata.gz: 1790e91d97f5e6f542dc845c22533f4c7f0d1446
+  data.tar.gz: aec8b677980f1d3f323ca9fc669992ffa589793c
 SHA512:
-  metadata.gz: 619f77b5a3941790c970aa083441c425f4dc5e66f858e9eaa13b07c134a37c3385fe2de577946dc48f6fd4b888734dfcb18a46b831b9cae57848827876c28a6a
-  data.tar.gz: 19848c066cf11ca33edc1099997a4c059aa27b78271ae61605158286ce1801f18ace3e074c424aed4c2f6e1dd63519d2036b5a8d80f00db658ca7c2e7d0c31ed
+  metadata.gz: d2d4d5acdf9ce0227fd4b5a9ce7385f08c9bb413a7c072cef0719e3be059364fe721b8a7ba828e5c94576d756c08fe7a365e814706772aba8d4d0eef3d2c9f9f
+  data.tar.gz: 0452c8f96f46abd2d21aa1e0058650d25bce606d836bfdd45534d692b80a2ec2677222031f6058cc31082a8cb2b9bb56acbf4c4874f72088b747ae39f24a5a6f

data/.gitignore

@@ -20,3 +20,8 @@ tmp
 *.o
 *.a
 mkmf.log
+*.swp
+test_data
+credentials.yaml
+envvars
+cucumber-config.yaml

data/Rakefile

@@ -1,2 +1,20 @@
 require "bundler/gem_tasks"
 
+# extracted from https://github.com/grosser/project_template
+rule /^version:bump:.*/ do |t|
+  sh "git status | grep 'nothing to commit'" # ensure we are not dirty
+  index = ['major', 'minor','patch'].index(t.name.split(':').last)
+  file = 'lib/salesforce/sql/version.rb'
+
+  version_file = File.read(file)
+  old_version, *version_parts = version_file.match(/(\d+)\.(\d+)\.(\d+)/).to_a
+  version_parts[index] = version_parts[index].to_i + 1
+  version_parts[2] = 0 if index < 2
+  version_parts[1] = 0 if index < 1
+  new_version = version_parts * '.'
+  File.open(file,'w'){|f| f.write(version_file.sub(old_version, new_version)) }
+
+  sh "bundle && git add #{file} && git commit -m 'bump version to #{new_version}'"
+end
+
+

data/lib/salesforce/sql/app.rb

@@ -25,6 +25,7 @@ module Salesforce
           'ParentId',
           'OwnerId',
           'CreatedById',
+          'SetupOwnerId',
           'CreatedDate',
           'LastModifiedDate',
           'LastModifiedById', 
@@ -85,12 +86,17 @@ module Salesforce
 
       def delete object
 
+        count_before = self.query("Select count(Id) from #{object}").first['expr0']
+
         query = "Select Id FROM #{object}" 
         bulk_delete_records = normalize_query @restforce_client.query(query)
 
         print_debug "#{bulk_delete_records.size} #{object} records added to delete on #{self.username}"
 
         bulk_delete object, bulk_delete_records if !bulk_delete_records.empty?
+        count_after = self.query("Select count(Id) from #{object}").first['expr0']
+
+        count_before - count_after
 
       end
 
@@ -106,6 +112,8 @@ module Salesforce
 
       def copy_object source:, object:, object_ids: [], ignore_fields: [], dependencies: []
 
+        count_before = self.query("Select count(Id) from #{object}").first['expr0']
+
         # Remove well known problematic fields and merge them with user requirements:
         ignore_fields = (ignore_fields + @default_ignore_fields).uniq
         
@@ -123,7 +131,7 @@ module Salesforce
         dependencies.each do |dep|
 
           # Export the dependency object ids from the source sandbox
-          dependency_ids = bulk_import_records.map{|row| row[dep[:object_fk_field]]}.sort.uniq
+          dependency_ids = bulk_import_records.map{|row| row[dep[: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,#{dep[:dependency_object_pk]} FROM #{dep[:dependency_object]}", dependency_ids
@@ -133,12 +141,46 @@ module Salesforce
           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
-          source_object.each do |row|
-            source_id = row['Id']
-            target_id = target_object.select{|r| r[dep[:dependency_object_pk]] == row[dep[:dependency_object_pk]]}.first['Id']
-            bulk_import_records.each {|r| r[dep[:object_fk_field]] = target_id if r[dep[:object_fk_field]] == source_id}
+          bulk_import_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[dep[: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[dep[: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[dep[:dependency_object_pk]] == source_item.first[dep[:dependency_object_pk]]}
+            next if target_item.empty?
+
+            # The actual mapping
+            record[dep[:object_fk_field]] = target_item.first['Id']
+            record
           end
 
+          bulk_import_records.compact!
+        end
+
+        # If the object is an attachment, then we can't use bulk api:w
+        if object == "Attachment"
+
+          attachment_ignore_fields = ignore_fields.clone
+          attachment_ignore_fields.delete 'isPrivate'
+          attachment_ignore_fields.delete 'ParentId'
+          attachment_ignore_fields << 'BodyLength'
+
+          print_debug "Importing #{bulk_import_records.size} attachments"
+
+          bulk_import_records.each do |att|
+            att['Body'] = Base64::encode64(att.Body)
+            attachment_ignore_fields.each {|f| att.delete f}
+            @restforce_client.create('Attachment',att)
+          end
+          count_after = self.query("Select count(Id) from #{object}").first['expr0']
+
+          return count_after - count_before
+
         end
 
         # Remove ignored fields
@@ -152,7 +194,17 @@ module Salesforce
         if !bulk_import_records.empty?
           bulk_insert object, bulk_import_records
         end
+        count_after = self.query("Select count(Id) from #{object}").first['expr0']
 
+        count_after - count_before
+
+      end
+
+      def insert object, records
+        count_before = self.query("Select count(Id) from #{object}").first['expr0']
+        bulk_insert object, records
+        count_after = self.query("Select count(Id) from #{object}").first['expr0']
+        count_after - count_before
       end
 
       private
@@ -194,19 +246,21 @@ module Salesforce
         puts "DEBUG: #{message[0..TermInfo.screen_size.last]}" if @debug
       end
 
+
       def restforce_rest_login credentials
+        grace = 0
         begin
           client = Restforce.new :host          => credentials[:host],
-                                 :username      => credentials[:username],
-                                 :password      => credentials[:password],
-                                 :client_id     => credentials[:client_id],
-                                 :client_secret => credentials[:client_secret]
-          client.authenticate!
-          client
+            :username      => credentials[:username],
+            :password      => credentials[:password],
+            :client_id     => credentials[:client_id],
+            :client_secret => credentials[:client_secret]
+          client.authenticate! && client
         rescue => e
-          puts "Error trying to login rest API using: #{credentials[:username]} "
-          puts e
-          exit 1
+          grace += 10
+          puts "INFO: Unable to login REST API, sleeping #{grace}, #{e}" 
+          sleep grace
+          retry
         end
       end
 
@@ -215,9 +269,7 @@ module Salesforce
           sandbox = host.match(/login/) ? nil : true
           SalesforceBulk::Api.new(user,pass,sandbox)
         rescue => e
-          puts "Error trying to login bulk API using: #{user} "
-          puts e
-          exit 1
+          puts "ERROR: Error trying to login bulk API using: #{user}, #{e}"
         end
       end
 

data/lib/salesforce/sql/version.rb

@@ -1,5 +1,5 @@
 module Salesforce
   module Sql
-    VERSION = "0.0.1"
+    VERSION = "0.0.3"
   end
 end

data/lib/salesforce/sql.rb

@@ -3,6 +3,7 @@ require 'salesforce/sql/app'
 require 'salesforce_bulk'
 require 'restforce'
 require 'terminfo'
+require 'base64'
 require 'pry'
 
 module Salesforce

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salesforce-sql
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Juan Breinlinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler