TDI-43510 : MySQL 8 driver upgrade

added allowLoadLocalInfile=true in tMysqlConnection and tMysqlRow
Merge branch 'master' into rlecomte/TDI-43510_MySQL_allowLoadLocalInfile
2020-02-11 11:33:04 +01:00 · 2020-02-11 10:54:36 +01:00 · 2020-02-11 10:53:10 +01:00 · 2020-02-07 14:56:07 +01:00 · 2020-02-05 14:41:57 +01:00 · 2020-02-05 10:56:05 +01:00
2 changed files with 9 additions and 3 deletions
--- a/main/plugins/org.talend.designer.components.localprovider/components/tMysqlConnection/tMysqlConnection_begin.javajet
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tMysqlConnection/tMysqlConnection_begin.javajet
@@ -26,10 +26,13 @@ imports="
 %>
 		String properties_<%=cid%> = <%=dbproperties%>;
 		if (properties_<%=cid%> == null || properties_<%=cid%>.trim().length() == 0) {
-			properties_<%=cid%> += "rewriteBatchedStatements=true";
+			properties_<%=cid%> += "rewriteBatchedStatements=true&allowLoadLocalInfile=true";
 		}else if (properties_<%=cid%> != null && !properties_<%=cid%>.contains("rewriteBatchedStatements")) {
 			properties_<%=cid%> += "&rewriteBatchedStatements=true";
 		}
+		if (properties_<%=cid%> != null && !properties_<%=cid%>.contains("allowLoadLocalInfile")) {
+			properties_<%=cid%> += "&allowLoadLocalInfile=true";
+		}
 		
 		String url_<%=cid%> = "<%=jdbcURL%>://" + <%=dbhost%> + ":" + <%=dbport%> + "/" + <%=dbname%> + "?" + properties_<%=cid%>;
 <%
--- a/main/plugins/org.talend.designer.components.localprovider/components/tMysqlRow/tMysqlRow_begin.javajet
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tMysqlRow/tMysqlRow_begin.javajet
@@ -23,11 +23,14 @@ imports="
 			}
 			if(dbproperties == null || ("\"\"").equals(dbproperties) || ("").equals(dbproperties)) {
 %>
-				String url_<%=cid%> = "<%=jdbcURL%>://" + <%=dbhost%> + ":" + <%=dbport%> + "/" + <%=dbname%>;
+				String url_<%=cid%> = "<%=jdbcURL%>://" + <%=dbhost%> + ":" + <%=dbport%> + "/" + <%=dbname%> + "?allowLoadLocalInfile=true";
 <%
 	        } else {
+				if (!dbproperties.contains("allowLoadLocalInfile")) {
+					dbproperties += " + \"&allowLoadLocalInfile=true\"";
+				}
 %>
-				String url_<%=cid%> = "<%=jdbcURL%>://" + <%=dbhost%> + ":" + <%=dbport%> + "/" + <%=dbname%> + "?" + <%=dbproperties%>;
+				String url_<%=cid%> = "<%=jdbcURL%>://" + <%=dbhost%> + ":" + <%=dbport%> + "/" + <%=dbname%> + "?" + <%=dbproperties%> ;
 <%
 	        }		
 		}
Author	SHA1	Message	Date
rlecomte-talend	e11cf0d92e	TDI-43510 : MySQL 8 driver upgrade added allowLoadLocalInfile=true in tMysqlConnection and tMysqlRow	2020-02-11 11:33:04 +01:00
rlecomte-talend	0e003c45d6	Merge branch 'master' into rlecomte/TDI-43510_MySQL_allowLoadLocalInfile	2020-02-11 10:54:36 +01:00
rlecomte-talend	4b1f3cb5ca	TDI-43510 : MySQL 8 driver upgrade added allowLoadLocalInfile=true in tMysqlConnection and tMysqlRow	2020-02-11 10:53:10 +01:00
rlecomte-talend	19ca4eb2cd	Merge branch 'master' into rlecomte/TDI-43510	2020-02-07 14:56:07 +01:00
rlecomte-talend	518bed0e52	TDI-43510 : MySQL 8 driver update Fixed XML	2020-02-05 14:41:57 +01:00
Richard Lecomte	4daf825de5	Merge branch 'master' into rlecomte/TDI-43510	2020-02-05 10:56:05 +01:00
rlecomte-talend	e6b13150bb	TDI-43510 : MySQL Driver upgrade	2020-02-04 11:31:59 +01:00
rlecomte-talend	386050b36b	TDI-43510 : MySQL Driver upgrade	2020-02-04 11:20:06 +01:00
rlecomte-talend	7efba970cc	TDI-43510 : MySQL Driver upgrade	2020-01-13 15:22:05 +01:00