salesforce-sql 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0784a2ff7c86fb3a91ea6d0db87ff7abefa0f9c9
-  data.tar.gz: 0e6331b40c877723e8f6dbf5ba3a970109772804
+  metadata.gz: f01df703e1067d09fb1b74a5917ec59687d8fd6f
+  data.tar.gz: d741bb84bea358a71e1f551e34f5da4d076913c4
 SHA512:
-  metadata.gz: c40d6c80f39164c897140649697a969eb767a9e2af43c7f8914f10fd11efef9d1df69e677df6365bfece29d90403d10f60c2b7431a1e7a3a1284b0bec421298a
-  data.tar.gz: c4aaa0804345d54439aedcb470d3875e6356634360390157b6cd522b64cddc9d3d12cf0a63274575d9d697ff99cfdd5fdf9bfb4d3b09fdf21658a59fd339721d
+  metadata.gz: 697263b8ecb8dad4fc84bf186cf92eb4697904e4106019dcd87d1bdd0143744a1013be5f8fa8a1b8d425f5aaf8e9b291fa557cc0a470f67763f0386cfcd8896d
+  data.tar.gz: ed27f47aa432dc6fc289f773ba3ac9a263cc0a7f65ef2ae428b27ff7445b9fc76d4cf6ca24fb908696fe5f16a24261207ea1f0f432588229020a3c112920ac1d

data/lib/salesforce/sql/app.rb

@@ -6,12 +6,6 @@ module Salesforce
       attr_accessor :username
       attr_accessor :step
 
-      def sfbc
-
-        @salesforce_bulk_client
-
-      end
-
       def initialize credentials
 
         # Login credentials
@@ -26,6 +20,7 @@ module Salesforce
         @default_ignore_fields = [
           'Id',
           'IsDeleted',
+          'IsPartner',
           'MasterRecordId',
           'ParentId',
           'OwnerId',
@@ -36,7 +31,6 @@ module Salesforce
           'LastModifiedById', 
           'SystemModstamp',
           'LastActivityDate',
-          'IsPartner',
         ]
 
       end
@@ -213,16 +207,19 @@ module Salesforce
         count_after - count_before
       end
 
+      private
 
       def bulk_insert object, records
-        records.each do |record|
-          @restforce_client.create(object,record)
+        (0..(records.size-1)).step(@bulk_api_step).each do |n|
+          job = @salesforce_bulk_client.create object, records[n..n+@bulk_api_step-1]
+          salesforce_bulk_job_status job
         end
       end
 
       def bulk_delete object, records
-        records.each do |record|
-          @restforce_client.destroy(object,record['Id'])
+        (0..(records.size-1)).step(@bulk_api_step).each do |n|
+          job = @salesforce_bulk_client.delete object, records[n..n+@bulk_api_step-1]
+          salesforce_bulk_job_status job
         end
       end
 
@@ -253,7 +250,7 @@ module Salesforce
       def restforce_rest_login credentials
         grace = 0
         begin
-          client = Restforce.new :host => credentials[:host],
+          client = Restforce.new :host          => credentials[:host],
             :username      => credentials[:username],
             :password      => credentials[:password],
             :client_id     => credentials[:client_id],
@@ -268,18 +265,12 @@ module Salesforce
       end
 
       def salesforce_bulk_login user, pass, host
-        connection = nil
         begin
-          if host.match(/login/)
-            connection = SalesforceBulk::Api.new(user,pass,false)
-          else
-            connection = SalesforceBulk::Api.new(user,pass,true)
-          end
+          sandbox = host.match(/login/) ? nil : true
+          SalesforceBulk::Api.new(user,pass,sandbox)
         rescue => e
           puts "ERROR: Error trying to login bulk API using: #{user}, #{e}"
         end
-        connection.query("Account", "select id, name, createddate from Account limit 3")
-        connection
       end
 
     end

data/lib/salesforce/sql/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: salesforce-sql
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Juan Breinlinger