Pre-merge updates

Renamed from preamble/postamble to presql/postsql to be more specific and ensure translation across languages

Updated index.js to make all pre/post sql transactional

Author: IanMeyers

config.json

@@ -9,8 +9,8 @@
 	"table": "sensor_data_raw",
 	"columnList": "",
 	"truncateTable": "N",
-  "preamble": "",
-  "postamble": "",
+    "presql": "",
+    "postsql": "",
 	"userName": "master",
 	"userPwd": "            ",
 	"df": "CSV",

config.json.commented

@@ -37,10 +37,10 @@
   "truncateTable": "",
   // Customized SQL that is placed just before the copy command.
   // This must end with a semicolon, and work with the other options that generate the copy command.
-  "preamble": "",
+  "presql": "",
   // Customized SQL that is placed just after the copy command.
   // This must end with a semicolon, and work with the other options that generate the copy command.
-  "postamble": "",
+  "postsql": "",
   // Enter the Database Username  Y
   // The username which should be used to connect to perform the COPY.
   // Please note that only table owners can perform COPY, so this should

dist/AWSLambdaRedshiftLoader-2.6.6.zip

@@ -1034,14 +1034,16 @@ exports.handler = function (event, context) {
             copyCommand = 'set statement_timeout to 60000;\n';
         }
 
-        // if the preamble option is set, insert it into the copyCommand
-        if (clusterInfo.preamble && clusterInfo.preamble.S) {
-          copyCommand += clusterInfo.preamble.S + '\n'
+        // open a transaction so that all pre-sql, load, and post-sql commit at once
+        copyCommand += 'begin;\n';
+
+        // if the presql option is set, insert it into the copyCommand
+        if (clusterInfo.presql && clusterInfo.presql.S) {
+          copyCommand += clusterInfo.presql.S + (clusterInfo.presql.S.slice(-1) == ";" ? "" : ";") + '\n'
         }
 
         var copyOptions = "manifest ";
 
-        copyCommand += 'begin;\n';
         // add the truncate option if requested
         if (clusterInfo.truncateTarget && clusterInfo.truncateTarget.BOOL) {
             copyCommand += 'truncate table ' + clusterInfo.targetTable.S + ';\n';
@@ -1169,9 +1171,9 @@ exports.handler = function (event, context) {
                 // build the final copy command
                 copyCommand = copyCommand + " with credentials as \'" + credentials + "\' " + copyOptions + ";\n";
 
-                // if the postamble option is set, insert it into the copyCommand
-                if (clusterInfo.postamble && clusterInfo.postamble.S) {
-                  copyCommand += clusterInfo.postamble.S + '\n'
+                // if the post-sql option is set, insert it into the copyCommand
+                if (clusterInfo.postsql && clusterInfo.postsql.S) {
+                  copyCommand += clusterInfo.postsql.S + (clusterInfo.postsql.S.slice(-1) == ";" ? "" : ";") + '\n'
                 }
 
               copyCommand += 'commit;';

index.js

@@ -201,23 +201,23 @@ q_truncateTable = function (callback) {
     callback(null);
 };
 
-q_preamble = function (callback) {
-    // the preamble sql lines
-    if (setupConfig.preamble && common.blank(setupConfig.preamble) !== null) {
-        dynamoConfig.Item.loadClusters.L[0].M.preamble = {
-            S: setupConfig.preamble
+q_presql = function (callback) {
+    // the pre-sql lines
+    if (setupConfig.presql && common.blank(setupConfig.presql) !== null) {
+        dynamoConfig.Item.loadClusters.L[0].M.presql = {
+            S: setupConfig.presql
         };
         callback(null);
     } else {
         callback(null);
     }
 };
 
-q_postamble = function (callback) {
+q_postsql = function (callback) {
     // the postamble sql lines
-    if (setupConfig.postamble && common.blank(setupConfig.postamble) !== null) {
-        dynamoConfig.Item.loadClusters.L[0].M.postamble = {
-            S: setupConfig.postamble
+    if (setupConfig.postsql && common.blank(setupConfig.postsql) !== null) {
+        dynamoConfig.Item.loadClusters.L[0].M.postsql = {
+            S: setupConfig.postsql
         };
         callback(null);
     } else {
@@ -439,8 +439,8 @@ qs.push(q_clusterDB);
 qs.push(q_table);
 qs.push(q_columnList);
 qs.push(q_truncateTable);
-qs.push(q_preamble);
-qs.push(q_postamble);
+qs.push(q_presql);
+qs.push(q_postsql);
 qs.push(q_userName);
 qs.push(q_userPwd);
 qs.push(q_df);