Check implemented to prevent ignoring key fields in update mode

jlolling · Aug 25, 2022 · 28c0ed3 · 28c0ed3
1 parent 80a462c
commit 28c0ed3
Show file tree

Hide file tree

Showing 16 changed files with 38 additions and 26 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.jlo.talendcomp</groupId>
 	<artifactId>jlo-talendcomp-tabletransfer</artifactId>
-	<version>12.0</version>
+	<version>12.1</version>
 	<name>Table Transfer Components</name>
 	<organization>
 		<name>Jan Lolling</name>

diff --git a/src/main/java/de/jlo/talendcomp/tabletransfer/TableTransfer.java b/src/main/java/de/jlo/talendcomp/tabletransfer/TableTransfer.java
@@ -991,6 +991,9 @@ protected final SQLTable getTargetSQLTable() throws Exception {
 						// found target column without source
 						// remove target column
 						SQLField field = targetTable.getField(targetColumnName);
+						if (runOnlyUpdates && field.isPrimaryKey()) {
+							throw new Exception("Update mode can only be used when all primary key fields are part of the source query. PK-Field: " + field.getName() + " is missing in the source!");
+						}
 						// remove this field from table because
 						// the code generators takes the SQLTable for build sql code
 						targetTable.removeSQLField(field);

diff --git a/...fer/jlo-talendcomp-tabletransfer-12.0.jar → ...fer/jlo-talendcomp-tabletransfer-12.1.jar b/...fer/jlo-talendcomp-tabletransfer-12.0.jar → ...fer/jlo-talendcomp-tabletransfer-12.1.jar
diff --git a/talend_component/tDB2TableTransfer/tDB2TableTransfer_java.xml b/talend_component/tDB2TableTransfer/tDB2TableTransfer_java.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <COMPONENT> 
-  <HEADER PLATEFORM="ALL" SERIAL="" VERSION="12.0" STATUS="ALPHA" COMPATIBILITY="ALL" AUTHOR="Jan Lolling" RELEASE_DATE="20220819" STARTABLE="true" HAS_CONDITIONAL_OUTPUTS="false"> 
+  <HEADER PLATEFORM="ALL" SERIAL="" VERSION="12.1" STATUS="ALPHA" COMPATIBILITY="ALL" AUTHOR="Jan Lolling" RELEASE_DATE="20220822" STARTABLE="true" HAS_CONDITIONAL_OUTPUTS="false"> 
     <SIGNATURE/> 
   </HEADER>  
   <FAMILIES> 
@@ -160,13 +160,13 @@
     <PARAMETER NAME="REUSE_DATA_MODEL" FIELD="CHECK" NUM_ROW="70"> 
       <DEFAULT>false</DEFAULT> 
     </PARAMETER>  
-    <PARAMETER NAME="RELEASE_LABEL_20220819" FIELD="LABEL" COLOR="0;0;0" NUM_ROW="900">
-      <DEFAULT>Release: 12.0 build at: 20220819</DEFAULT>
+    <PARAMETER NAME="RELEASE_LABEL_20220822" FIELD="LABEL" COLOR="0;0;0" NUM_ROW="900">
+      <DEFAULT>Release: 12.1 build at: 20220822</DEFAULT>
     </PARAMETER>
   </ADVANCED_PARAMETERS>  
   <CODEGENERATION> 
     <IMPORTS> 
-      <IMPORT NAME="jlo-talendcomp-tabletransfer" MODULE="jlo-talendcomp-tabletransfer-12.0.jar" MVN="mvn:org.talend.libraries/jlo-talendcomp-tabletransfer-12.0/6.0.0-SNAPSHOT" REQUIRED="true"/>
+      <IMPORT NAME="jlo-talendcomp-tabletransfer" MODULE="jlo-talendcomp-tabletransfer-12.1.jar" MVN="mvn:org.talend.libraries/jlo-talendcomp-tabletransfer-12.1/6.0.0-SNAPSHOT" REQUIRED="true"/>
     </IMPORTS> 
   </CODEGENERATION>  
   <RETURNS> 

diff --git a/...fer/jlo-talendcomp-tabletransfer-12.0.jar → ...fer/jlo-talendcomp-tabletransfer-12.1.jar b/...fer/jlo-talendcomp-tabletransfer-12.0.jar → ...fer/jlo-talendcomp-tabletransfer-12.1.jar
diff --git a/talend_component/tEXATableTransfer/tEXATableTransfer_java.xml b/talend_component/tEXATableTransfer/tEXATableTransfer_java.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <COMPONENT> 
-  <HEADER PLATEFORM="ALL" SERIAL="" VERSION="12.0" STATUS="ALPHA" COMPATIBILITY="ALL" AUTHOR="Jan Lolling" RELEASE_DATE="20220819" STARTABLE="true" HAS_CONDITIONAL_OUTPUTS="false"> 
+  <HEADER PLATEFORM="ALL" SERIAL="" VERSION="12.1" STATUS="ALPHA" COMPATIBILITY="ALL" AUTHOR="Jan Lolling" RELEASE_DATE="20220822" STARTABLE="true" HAS_CONDITIONAL_OUTPUTS="false"> 
     <SIGNATURE/> 
   </HEADER>  
   <FAMILIES> 
@@ -154,13 +154,13 @@
     <PARAMETER NAME="REUSE_DATA_MODEL" FIELD="CHECK" NUM_ROW="70"> 
       <DEFAULT>false</DEFAULT> 
     </PARAMETER>  
-    <PARAMETER NAME="RELEASE_LABEL_20220819" FIELD="LABEL" COLOR="0;0;0" NUM_ROW="900">
-      <DEFAULT>Release: 12.0 build at: 20220819</DEFAULT>
+    <PARAMETER NAME="RELEASE_LABEL_20220822" FIELD="LABEL" COLOR="0;0;0" NUM_ROW="900">
+      <DEFAULT>Release: 12.1 build at: 20220822</DEFAULT>
     </PARAMETER>
   </ADVANCED_PARAMETERS>  
   <CODEGENERATION> 
     <IMPORTS> 
-      <IMPORT NAME="jlo-talendcomp-tabletransfer" MODULE="jlo-talendcomp-tabletransfer-12.0.jar" MVN="mvn:org.talend.libraries/jlo-talendcomp-tabletransfer-12.0/6.0.0-SNAPSHOT" REQUIRED="true"/>
+      <IMPORT NAME="jlo-talendcomp-tabletransfer" MODULE="jlo-talendcomp-tabletransfer-12.1.jar" MVN="mvn:org.talend.libraries/jlo-talendcomp-tabletransfer-12.1/6.0.0-SNAPSHOT" REQUIRED="true"/>
     </IMPORTS> 
   </CODEGENERATION>  
   <RETURNS> 

diff --git a/...fer/jlo-talendcomp-tabletransfer-12.0.jar → ...fer/jlo-talendcomp-tabletransfer-12.1.jar b/...fer/jlo-talendcomp-tabletransfer-12.0.jar → ...fer/jlo-talendcomp-tabletransfer-12.1.jar
diff --git a/talend_component/tMysqlTableTransfer/tMysqlTableTransfer_begin.javajet b/talend_component/tMysqlTableTransfer/tMysqlTableTransfer_begin.javajet
@@ -206,8 +206,8 @@
     <%=cid%>.info("truncate target table...");
 	<%=cid%>.executeSQLOnTarget("truncate table " + <%=cid%>.getTargetTable());
 <%	 } %>
-<%  if (outputToTable && disableKeys && onlyUpdate == false) { %>
-    <%=cid%>.info("disable keys on target table...");
-	<%=cid%>.executeSQLOnTarget("alter table " + <%=cid%>.getTargetTable() + " disable keys");
+<%  if (outputToTable && disableKeys && onlyUpdate == false && "UPDATE".equals(onConflict) == false && "IGNORE".equals(onConflict) == false) { %>
+    <%=cid%>.info("Disable keys on target table...");
+	<%=cid%>.executeSQLOnTarget("SET UNIQUE_CHECKS = 0");
 <%	 } %>
 
diff --git a/talend_component/tMysqlTableTransfer/tMysqlTableTransfer_end.javajet b/talend_component/tMysqlTableTransfer/tMysqlTableTransfer_end.javajet
@@ -12,6 +12,15 @@
 	String cid = node.getUniqueName();
 	boolean useDataSource = "true".equals(ElementParameterParser.getValue(node, "__USE_DATA_SOURCE__"));
 	boolean closeConnections = "true".equals(ElementParameterParser.getValue(node, "__CLOSE_CONNECTIONS__"));
+    boolean disableKeys = "true".equals(ElementParameterParser.getValue(node, "__TARGET_DISABLE_KEYS__"));
+    boolean outputToTable = "false".equals(ElementParameterParser.getValue(node, "__BACKUP_DATA_ONLY__"));
+    boolean onlyUpdate = "true".equals(ElementParameterParser.getValue(node, "__ONLY_UPDATE_NO_INSERT__"));
+	String onConflict = ElementParameterParser.getValue(node, "__ON_CONFLICT__");
+
+<%  if (outputToTable && disableKeys && onlyUpdate == false && "UPDATE".equals(onConflict) == false && "IGNORE".equals(onConflict) == false) { %>
+    <%=cid%>.info("Enable keys on target table...");
+	<%=cid%>.executeSQLOnTarget("SET UNIQUE_CHECKS = 1");
+<%	 } %>
 
    if (useDataSource || closeConnections) { %>
 	// disconnect in case of we use data sources means we put back the connection into the pool

diff --git a/talend_component/tMysqlTableTransfer/tMysqlTableTransfer_java.xml b/talend_component/tMysqlTableTransfer/tMysqlTableTransfer_java.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <COMPONENT> 
-  <HEADER PLATEFORM="ALL" SERIAL="" VERSION="12.0" STATUS="ALPHA" COMPATIBILITY="ALL" AUTHOR="Jan Lolling" RELEASE_DATE="20220819" STARTABLE="true" HAS_CONDITIONAL_OUTPUTS="false"> 
+  <HEADER PLATEFORM="ALL" SERIAL="" VERSION="12.1" STATUS="ALPHA" COMPATIBILITY="ALL" AUTHOR="Jan Lolling" RELEASE_DATE="20220822" STARTABLE="true" HAS_CONDITIONAL_OUTPUTS="false"> 
     <SIGNATURE/> 
   </HEADER>  
   <FAMILIES> 
@@ -165,13 +165,13 @@
     <PARAMETER NAME="REUSE_DATA_MODEL" FIELD="CHECK" NUM_ROW="70"> 
       <DEFAULT>false</DEFAULT> 
     </PARAMETER>  
-    <PARAMETER NAME="RELEASE_LABEL_20220819" FIELD="LABEL" COLOR="0;0;0" NUM_ROW="900">
-      <DEFAULT>Release: 12.0 build at: 20220819</DEFAULT>
+    <PARAMETER NAME="RELEASE_LABEL_20220822" FIELD="LABEL" COLOR="0;0;0" NUM_ROW="900">
+      <DEFAULT>Release: 12.1 build at: 20220822</DEFAULT>
     </PARAMETER>
   </ADVANCED_PARAMETERS>  
   <CODEGENERATION> 
     <IMPORTS> 
-      <IMPORT NAME="jlo-talendcomp-tabletransfer" MODULE="jlo-talendcomp-tabletransfer-12.0.jar" MVN="mvn:org.talend.libraries/jlo-talendcomp-tabletransfer-12.0/6.0.0-SNAPSHOT" REQUIRED="true"/>
+      <IMPORT NAME="jlo-talendcomp-tabletransfer" MODULE="jlo-talendcomp-tabletransfer-12.1.jar" MVN="mvn:org.talend.libraries/jlo-talendcomp-tabletransfer-12.1/6.0.0-SNAPSHOT" REQUIRED="true"/>
     </IMPORTS> 
   </CODEGENERATION>  
   <RETURNS> 

diff --git a/talend_component/tMysqlTableTransfer/tMysqlTableTransfer_main.javajet b/talend_component/tMysqlTableTransfer/tMysqlTableTransfer_main.javajet
@@ -43,9 +43,9 @@
 				globalMap.put("<%=cid%>_NB_LINE", <%=cid%>.getCurrentCountReads());
 				globalMap.put("<%=cid%>_NB_INSERTS", <%=cid%>.getCurrentCountInserts());
 <%  if (outputToTable) { %>
-				<%=cid%>.info("<%=cid%> [" + <%=cid%>.getTargetTable() + "] read:" + <%=cid%>.getCurrentCountReads() + " written:" + <%=cid%>.getCurrentCountInserts() + " rate inserts:" + insertsPerSecond_<%=cid%> + " rows/s");
+				<%=cid%>.info("<%=cid%> [" + <%=cid%>.getTargetTable() + "] read:" + <%=cid%>.getCurrentCountReads() + " written:" + <%=cid%>.getCurrentCountInserts() + " rate:" + insertsPerSecond_<%=cid%> + " rows/s");
 <%	} else { %>
-				<%=cid%>.info("<%=cid%> [" + <%=cid%>.getBackupFilePath() + "] read:" + <%=cid%>.getCurrentCountReads() + " written:" + <%=cid%>.getCurrentCountInserts() + " rate writes:" + insertsPerSecond_<%=cid%> + " rows/s");
+				<%=cid%>.info("<%=cid%> [" + <%=cid%>.getBackupFilePath() + "] read:" + <%=cid%>.getCurrentCountReads() + " written:" + <%=cid%>.getCurrentCountInserts() + " rate:" + insertsPerSecond_<%=cid%> + " rows/s");
 <%	} %>
 			} else {
 <%	if (outputToTable) { %>

diff --git a/...fer/jlo-talendcomp-tabletransfer-12.0.jar → ...fer/jlo-talendcomp-tabletransfer-12.1.jar b/...fer/jlo-talendcomp-tabletransfer-12.0.jar → ...fer/jlo-talendcomp-tabletransfer-12.1.jar
diff --git a/talend_component/tOracleTableTransfer/tOracleTableTransfer_java.xml b/talend_component/tOracleTableTransfer/tOracleTableTransfer_java.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <COMPONENT> 
-  <HEADER PLATEFORM="ALL" SERIAL="" VERSION="12.0" STATUS="ALPHA" COMPATIBILITY="ALL" AUTHOR="Jan Lolling" RELEASE_DATE="20220819" STARTABLE="true" HAS_CONDITIONAL_OUTPUTS="false"> 
+  <HEADER PLATEFORM="ALL" SERIAL="" VERSION="12.1" STATUS="ALPHA" COMPATIBILITY="ALL" AUTHOR="Jan Lolling" RELEASE_DATE="20220822" STARTABLE="true" HAS_CONDITIONAL_OUTPUTS="false"> 
     <SIGNATURE/> 
   </HEADER>  
   <FAMILIES> 
@@ -154,13 +154,13 @@
     <PARAMETER NAME="REUSE_DATA_MODEL" FIELD="CHECK" NUM_ROW="70"> 
       <DEFAULT>false</DEFAULT> 
     </PARAMETER>  
-    <PARAMETER NAME="RELEASE_LABEL_20220819" FIELD="LABEL" COLOR="0;0;0" NUM_ROW="900">
-      <DEFAULT>Release: 12.0 build at: 20220819</DEFAULT>
+    <PARAMETER NAME="RELEASE_LABEL_20220822" FIELD="LABEL" COLOR="0;0;0" NUM_ROW="900">
+      <DEFAULT>Release: 12.1 build at: 20220822</DEFAULT>
     </PARAMETER>
   </ADVANCED_PARAMETERS>  
   <CODEGENERATION> 
     <IMPORTS> 
-      <IMPORT NAME="jlo-talendcomp-tabletransfer" MODULE="jlo-talendcomp-tabletransfer-12.0.jar" MVN="mvn:org.talend.libraries/jlo-talendcomp-tabletransfer-12.0/6.0.0-SNAPSHOT" REQUIRED="true"/>
+      <IMPORT NAME="jlo-talendcomp-tabletransfer" MODULE="jlo-talendcomp-tabletransfer-12.1.jar" MVN="mvn:org.talend.libraries/jlo-talendcomp-tabletransfer-12.1/6.0.0-SNAPSHOT" REQUIRED="true"/>
     </IMPORTS> 
   </CODEGENERATION>  
   <RETURNS> 

diff --git a/talend_component/tPostgresqlTableTransfer/jlo-talendcomp-tabletransfer-12.0.jar b/talend_component/tPostgresqlTableTransfer/jlo-talendcomp-tabletransfer-12.0.jar
diff --git a/talend_component/tPostgresqlTableTransfer/jlo-talendcomp-tabletransfer-12.1.jar b/talend_component/tPostgresqlTableTransfer/jlo-talendcomp-tabletransfer-12.1.jar
diff --git a/talend_component/tPostgresqlTableTransfer/tPostgresqlTableTransfer_java.xml b/talend_component/tPostgresqlTableTransfer/tPostgresqlTableTransfer_java.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <COMPONENT> 
-  <HEADER PLATEFORM="ALL" SERIAL="" VERSION="12.0" STATUS="ALPHA" COMPATIBILITY="ALL" AUTHOR="Jan Lolling" RELEASE_DATE="20220819" STARTABLE="true" HAS_CONDITIONAL_OUTPUTS="false"> 
+  <HEADER PLATEFORM="ALL" SERIAL="" VERSION="12.1" STATUS="ALPHA" COMPATIBILITY="ALL" AUTHOR="Jan Lolling" RELEASE_DATE="20220822" STARTABLE="true" HAS_CONDITIONAL_OUTPUTS="false"> 
     <SIGNATURE/> 
   </HEADER>  
   <FAMILIES> 
@@ -162,13 +162,13 @@
     <PARAMETER NAME="REUSE_DATA_MODEL" FIELD="CHECK" NUM_ROW="70"> 
       <DEFAULT>false</DEFAULT> 
     </PARAMETER>  
-    <PARAMETER NAME="RELEASE_LABEL_20220819" FIELD="LABEL" COLOR="0;0;0" NUM_ROW="900">
-      <DEFAULT>Release: 12.0 build at: 20220819</DEFAULT>
+    <PARAMETER NAME="RELEASE_LABEL_20220822" FIELD="LABEL" COLOR="0;0;0" NUM_ROW="900">
+      <DEFAULT>Release: 12.1 build at: 20220822</DEFAULT>
     </PARAMETER>
   </ADVANCED_PARAMETERS>  
   <CODEGENERATION> 
     <IMPORTS> 
-      <IMPORT NAME="jlo-talendcomp-tabletransfer" MODULE="jlo-talendcomp-tabletransfer-12.0.jar" MVN="mvn:org.talend.libraries/jlo-talendcomp-tabletransfer-12.0/6.0.0-SNAPSHOT" REQUIRED="true"/>
+      <IMPORT NAME="jlo-talendcomp-tabletransfer" MODULE="jlo-talendcomp-tabletransfer-12.1.jar" MVN="mvn:org.talend.libraries/jlo-talendcomp-tabletransfer-12.1/6.0.0-SNAPSHOT" REQUIRED="true"/>
     </IMPORTS> 
   </CODEGENERATION>  
   <RETURNS>