embulk-output-salesforce 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29d21f4cf7365b79ed58cbd012c48bf59b31d7ae
-  data.tar.gz: 77f464e7f1dbfb7aa3d5b9cfc7b27904e3d73688
+  metadata.gz: b0d15f227f70f2cf1136aa8c4228366381f953c5
+  data.tar.gz: 865df205e83934d43b93ad717412059e701236b3
 SHA512:
-  metadata.gz: 06b13aea4bdcc54b1e654788814db4178766b7b7e169b109095acd8ec91c7778827b75fd105fa507993498b6b113f91bb62e3c71a8d51741036e6810e3da8d10
-  data.tar.gz: 661a287aa359c72769d9a8bf5820db0ef19b50bc3f405fcd999dc9c1f34561d7873cc41ef5f2cf56d585ce2b92aec59fd30fd0489029fbc0460eec23b3a53de7
+  metadata.gz: 0c85452ec9d4749e668f85d07d02bae621efa3891fa945e25594600da4f6e2b9086ae18c39db9d4e2a8a33ce2ac9f6fa9852903154bd251b2a7eeb162168cbc7
+  data.tar.gz: abe53b74e7629da47408fafa034bfe6552b4229faedc7982988b790475608f218929103cb0eaa48f98f67925ef74e08ca5fd29a6e78ef35600939828da5bfa88

data/README.md

@@ -22,8 +22,29 @@ Embulk output plugin to load into Salesforce.com.
 - **version**: API version (string, default: "34.0")
 
 ## Example
+The column names must be salesforce API field name.  
 
 ```yaml
+in:
+  type: file
+  path_prefix: /path/to/salesforce_
+  parser:
+    charset: UTF-8
+    newline: CRLF
+    type: csv
+    delimiter: ','
+    quote: '"'
+    escape: ''
+    skip_header_lines: 1
+    comment_line_marker: null
+    allow_extra_columns: true
+    allow_optional_columns: false
+    columns:
+    - {name: Name, type: string}
+    - {name: Date__c, type: timestamp, format: '%Y-%m-%d'}
+    - {name: DateTime__c, type: timestamp, format: '%Y-%m-%d %H:%M:%S%Z'}
+    - {name: Number__c, type: double}
+    - {name: Reference__c, type: string}
 out:
   type: salesforce
   username: hoge@example.com

data/build.gradle

@@ -12,7 +12,7 @@ configurations {
     provided
 }
 
-version = "0.1.1"
+version = "0.1.2"
 
 dependencies {
     compile  "org.embulk:embulk-core:0.6.11"

data/src/main/java/org/embulk/output/SalesforceOutputPlugin.java

@@ -3,10 +3,14 @@ package org.embulk.output;
 import com.google.common.base.Optional;
 import com.sforce.soap.partner.Connector;
 import com.sforce.soap.partner.DeleteResult;
+import com.sforce.soap.partner.DescribeSObjectResult;
+import com.sforce.soap.partner.Field;
+import com.sforce.soap.partner.FieldType;
 import com.sforce.soap.partner.GetUserInfoResult;
 import com.sforce.soap.partner.PartnerConnection;
 import com.sforce.soap.partner.SaveResult;
 import com.sforce.soap.partner.UpsertResult;
+import com.sforce.soap.partner.fault.ApiFault;
 import com.sforce.soap.partner.sobject.SObject;
 import com.sforce.ws.ConnectionException;
 import com.sforce.ws.ConnectorConfig;
@@ -17,11 +21,14 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import org.embulk.config.CommitReport;
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
 import org.embulk.config.ConfigDiff;
+import org.embulk.config.ConfigException;
 import org.embulk.config.ConfigSource;
 import org.embulk.config.Task;
 import org.embulk.config.TaskSource;
@@ -45,7 +52,8 @@ public class SalesforceOutputPlugin
 {
     protected static Logger logger;
     private static PartnerConnection client = null;
-    
+    private static Map<String, String> externalIdToObjectNameMap = null;
+        
     public interface PluginTask
             extends Task
     {
@@ -112,6 +120,13 @@ public class SalesforceOutputPlugin
                 client = Connector.newConnection(connectorConfig);
                 GetUserInfoResult userInfo = client.getUserInfo();
                 logger.info("login successful with {}", userInfo.getUserName());
+                externalIdToObjectNameMap = new HashMap<>();
+                DescribeSObjectResult describeResult = client.describeSObject(task.getSObject());
+                for (Field field : describeResult.getFields()) {
+                    if (field.getType() == FieldType.reference) {
+                        externalIdToObjectNameMap.put(field.getRelationshipName(), field.getReferenceTo()[0]);
+                    }
+                }
             }
         } catch(ConnectionException ex) {
             logger.error("Login error. Please check your credentials.");
@@ -193,7 +208,7 @@ public class SalesforceOutputPlugin
                     pageReader.getSchema().visitColumns(new ColumnVisitor() {
                         @Override
                         public void doubleColumn(Column column) {
-                            record.addField(column.getName(), pageReader.getDouble(column));
+                            columnWithReferenceCheck(column.getName(), pageReader.getDouble(column));
                         }
                         @Override
                         public void timestampColumn(Column column) {
@@ -207,17 +222,37 @@ public class SalesforceOutputPlugin
                         }
                         @Override
                         public void stringColumn(Column column) {
-                            record.addField(column.getName(), pageReader.getString(column));
+                            columnWithReferenceCheck(column.getName(), pageReader.getString(column));
                         }
                         @Override
                         public void longColumn(Column column) {
-                            record.addField(column.getName(), pageReader.getLong(column));
+                            columnWithReferenceCheck(column.getName(), pageReader.getLong(column));
                         }
                         @Override
                         public void booleanColumn(Column column) {
                             record.addField(column.getName(), pageReader.getBoolean(column));
                         }
-                        
+
+                        private void columnWithReferenceCheck(String name, Object value) {
+                            if (name.indexOf('.') > 0) {
+                                String[] tokens = name.split("\\.");
+                                String referencesFieldName = tokens[0];
+                                String externalIdFieldName = tokens[1];
+
+                                SObject sObjRef = new SObject();
+                                String refFieldApiName = referencesFieldName.replaceAll("__R", "__r");
+                                if (externalIdToObjectNameMap.containsKey(refFieldApiName)) {
+                                    sObjRef.setType(externalIdToObjectNameMap.get(refFieldApiName));
+                                } else {
+                                    throw new ConfigException("Invalid Relationship Name '" + refFieldApiName + "'");
+                                }
+                                sObjRef.addField(externalIdFieldName, value);
+                                record.addField(referencesFieldName, sObjRef);
+                            } else {
+                                record.addField(name, value);
+                            }
+                        }
+
                     });
                     this.records.add(record);
                     
@@ -231,6 +266,10 @@ public class SalesforceOutputPlugin
                     this.action(this.records);
                     logger.info("Number of processed records: {}", this.numOfSuccess + this.numOfError);
                 }
+            } catch (ConfigException ex) {
+                logger.error("Configuration Error: {}", ex.getMessage());
+            } catch (ApiFault ex) {
+                logger.error("API Error: {}", ex.getExceptionMessage());
             } catch (ConnectionException ex) {
                 logger.error("Connection Error: {}", ex.getMessage());
             } catch (IOException ex) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-salesforce
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Makoto Tajitsu
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,7 +58,7 @@ files:
 - lib/partner.jar
 - src/main/java/org/embulk/output/SalesforceOutputPlugin.java
 - src/test/java/org/embulk/output/TestSalesforceOutputPlugin.java
-- classpath/embulk-output-salesforce-0.1.1.jar
+- classpath/embulk-output-salesforce-0.1.2.jar
 - classpath/force-wsc-34.0.jar
 - classpath/partner.jar
 - classpath/super-csv-2.3.1.jar