Compare commits

...

3 Commits

Author SHA1 Message Date
s.bovsunovskyi
81f7b80269 feat(TDI-41807): add rules for oracle 12/18 2019-02-27 12:53:01 +02:00
s.bovsunovskyi
9095126fd0 feat(TDI-41807): add rules for oracle 12/18 2019-02-26 18:24:22 +02:00
s.bovsunovskyi
170a452028 feat(TDI-41807): add rules for oracle 12/18 2019-02-21 14:20:34 +02:00
6 changed files with 14 additions and 6 deletions

View File

@@ -361,7 +361,9 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="TNS" MODULE="tns.jar" MVN="mvn:org.talend.libraries/tns/6.0.0" REQUIRED_IF="(USE_TNS_FILE == 'true')" />
<IMPORT NAME="Talend-oracle-timestamptz" MODULE="talend-oracle-timestamptz.jar" MVN="mvn:org.talend.libraries/talend-oracle-timestamptz/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.custom/lib/talend-oracle-timestamptz.jar" REQUIRED_IF="(DB_VERSION=='ORACLE_11') OR (DB_VERSION=='ORACLE_10')" />
<IMPORT NAME="Talend-oracle-timestamptz" MODULE="talend-oracle-timestamptz.jar" MVN="mvn:org.talend.libraries/talend-oracle-timestamptz/6.0.0"
UrlPath="platform:/plugin/org.talend.libraries.custom/lib/talend-oracle-timestamptz.jar"
REQUIRED_IF="(DB_VERSION=='ORACLE_10') OR (DB_VERSION=='ORACLE_11') OR (DB_VERSION=='ORACLE_12') OR (DB_VERSION=='ORACLE_18')" />
<IMPORT NAME="ORACLE_18" MODULE="ojdbc8-12.2.0.1.jar" MVN="mvn:com.oracle.jdbc/ojdbc8/12.2.0.1" REQUIRED_IF="(DB_VERSION == 'ORACLE_18')" />
<IMPORT NAME="ORACLE_12" MODULE="ojdbc7.jar" MVN="mvn:org.talend.libraries/ojdbc7/6.0.0" BundleID="" REQUIRED_IF="(DB_VERSION == 'ORACLE_12')" />
<IMPORT NAME="ORACLE_11" MODULE="ojdbc6.jar" MVN="mvn:org.talend.libraries/ojdbc6/6.0.0" BundleID="" REQUIRED_IF="(DB_VERSION == 'ORACLE_11') " />

View File

@@ -223,7 +223,9 @@
<IMPORT NAME="Driver-Oracle18c" MODULE="ojdbc8-12.2.0.1.jar" MVN="mvn:com.oracle.jdbc/ojdbc8/12.2.0.1" REQUIRED_IF="(DB_VERSION == 'ORACLE_18') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Oracle-XDB" MODULE="xdb.jar" MVN="mvn:org.talend.libraries/xdb/6.0.0" REQUIRED_IF="SCHEMA.DB_TYPE IN ['XMLTYPE']" />
<IMPORT NAME="Driver-Oracle-XMLPARSERV2" MODULE="xmlparserv2.jar" MVN="mvn:org.talend.libraries/xmlparserv2/6.0.0" BundleID="" REQUIRED_IF="SCHEMA.DB_TYPE IN ['XMLTYPE']" />
<IMPORT NAME="Talend-oracle-timestamptz" MODULE="talend-oracle-timestamptz.jar" MVN="mvn:org.talend.libraries/talend-oracle-timestamptz/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.custom/lib/talend-oracle-timestamptz.jar" REQUIRED_IF="(DB_VERSION=='ORACLE_11') OR (DB_VERSION=='ORACLE_10')" />
<IMPORT NAME="Talend-oracle-timestamptz" MODULE="talend-oracle-timestamptz.jar" MVN="mvn:org.talend.libraries/talend-oracle-timestamptz/6.0.0"
UrlPath="platform:/plugin/org.talend.libraries.custom/lib/talend-oracle-timestamptz.jar"
REQUIRED_IF="(DB_VERSION=='ORACLE_10') OR (DB_VERSION=='ORACLE_11') OR (DB_VERSION=='ORACLE_12') OR (DB_VERSION=='ORACLE_18')" />
</IMPORTS>
</CODEGENERATION>
<RETURNS>

View File

@@ -506,7 +506,9 @@
<IMPORTS>
<IMPORT NAME="Driver-Oracle-XDB" MODULE="xdb.jar" MVN="mvn:org.talend.libraries/xdb/6.0.0" REQUIRED_IF="SCHEMA.DB_TYPE IN ['XMLTYPE']" />
<IMPORT NAME="Driver-Oracle-XMLPARSERV2" MODULE="xmlparserv2.jar" MVN="mvn:org.talend.libraries/xmlparserv2/6.0.0" BundleID="" REQUIRED_IF="SCHEMA.DB_TYPE IN ['XMLTYPE']" />
<IMPORT NAME="Talend-oracle-timestamptz" MODULE="talend-oracle-timestamptz.jar" MVN="mvn:org.talend.libraries/talend-oracle-timestamptz/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.custom/lib/talend-oracle-timestamptz.jar" REQUIRED_IF="(DB_VERSION=='ORACLE_11') OR (DB_VERSION=='ORACLE_10')" />
<IMPORT NAME="Talend-oracle-timestamptz" MODULE="talend-oracle-timestamptz.jar" MVN="mvn:org.talend.libraries/talend-oracle-timestamptz/6.0.0"
UrlPath="platform:/plugin/org.talend.libraries.custom/lib/talend-oracle-timestamptz.jar"
REQUIRED_IF="(DB_VERSION=='ORACLE_10') OR (DB_VERSION=='ORACLE_11') OR (DB_VERSION=='ORACLE_12') OR (DB_VERSION=='ORACLE_18')" />
<IMPORT NAME="ORACLE_18" MODULE="ojdbc8-12.2.0.1.jar" MVN="mvn:com.oracle.jdbc/ojdbc8/12.2.0.1" REQUIRED_IF="(DB_VERSION == 'ORACLE_18') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="ORACLE_12" MODULE="ojdbc7.jar" MVN="mvn:org.talend.libraries/ojdbc7/6.0.0" BundleID="" REQUIRED_IF="(DB_VERSION == 'ORACLE_12') AND (USE_EXISTING_CONNECTION == 'false') AND (SPECIFY_DATASOURCE_ALIAS == 'false')" />
<IMPORT NAME="ORACLE_11" MODULE="ojdbc6.jar" MVN="mvn:org.talend.libraries/ojdbc6/6.0.0" BundleID="" REQUIRED_IF="(DB_VERSION == 'ORACLE_11') AND (USE_EXISTING_CONNECTION == 'false') AND (SPECIFY_DATASOURCE_ALIAS == 'false')" />

View File

@@ -583,7 +583,9 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="Talend-oracle-timestamptz" MODULE="talend-oracle-timestamptz.jar" MVN="mvn:org.talend.libraries/talend-oracle-timestamptz/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.custom/lib/talend-oracle-timestamptz.jar" REQUIRED_IF="(DB_VERSION=='ORACLE_11') OR (DB_VERSION=='ORACLE_10')" />
<IMPORT NAME="Talend-oracle-timestamptz" MODULE="talend-oracle-timestamptz.jar" MVN="mvn:org.talend.libraries/talend-oracle-timestamptz/6.0.0"
UrlPath="platform:/plugin/org.talend.libraries.custom/lib/talend-oracle-timestamptz.jar"
REQUIRED_IF="(DB_VERSION=='ORACLE_10') OR (DB_VERSION=='ORACLE_11') OR (DB_VERSION=='ORACLE_12') OR (DB_VERSION=='ORACLE_18')" />
<IMPORT NAME="ORACLE_18" MODULE="ojdbc8-12.2.0.1.jar" MVN="mvn:com.oracle.jdbc/ojdbc8/12.2.0.1" REQUIRED_IF="(DB_VERSION == 'ORACLE_18') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="ORACLE_12" MODULE="ojdbc7.jar" MVN="mvn:org.talend.libraries/ojdbc7/6.0.0" REQUIRED_IF="(DB_VERSION == 'ORACLE_12') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="ORACLE_11" MODULE="ojdbc6.jar" MVN="mvn:org.talend.libraries/ojdbc6/6.0.0" REQUIRED_IF="(DB_VERSION == 'ORACLE_11') AND (USE_EXISTING_CONNECTION == 'false')" />

View File

@@ -2685,7 +2685,7 @@ public class CLASS {
} else if(typeToGenerate.equals("Date")) {
setStmt.append("if(" + incomingConnName + "." + column.getName() + " != null) {\r\n");
boolean isTSWithTZ = dbType.matches("TIMESTAMP WITH TIME ZONE");
if(isTSWithTZ && ("ORACLE_11".equals(dbVersion) || "ORACLE_12".equals(dbVersion) || "ORACLE_10".equals(dbVersion))){
if(isTSWithTZ && ("ORACLE_10".equals(dbVersion) || "ORACLE_11".equals(dbVersion) || "ORACLE_12".equals(dbVersion) || "ORACLE_18".equals(dbVersion))){
setStmt.append("if("+ incomingConnName + "." + column.getName() + " instanceof TalendTimestampWithTZ){\r\n");
setStmt.append("((oracle.jdbc.OraclePreparedStatement)" + prefix + cid + ").setTIMESTAMPTZ(" + index + dynamic + ", new oracle.sql.TIMESTAMPTZ(conn_" + cid + ", ((TalendTimestampWithTZ)"+ incomingConnName + "." + column.getName() +").getTimestamp(),((TalendTimestampWithTZ)"+ incomingConnName + "." + column.getName() +").getCalendar()));\r\n");
setStmt.append("}else{");

View File

@@ -2286,7 +2286,7 @@ public class CLASS {
boolean isTSWithTZ = false;
if(dbType!=null)
isTSWithTZ = dbType.matches("TIMESTAMP WITH TIME ZONE");
if(isTSWithTZ && ("ORACLE_11".equals(dbVersion) || "ORACLE_12".equals(dbVersion) || "ORACLE_10".equals(dbVersion))){
if(isTSWithTZ && ("ORACLE_10".equals(dbVersion) || "ORACLE_11".equals(dbVersion) || "ORACLE_12".equals(dbVersion) || "ORACLE_18".equals(dbVersion))){
setStatement.append("if("+ variable + " instanceof TalendTimestampWithTZ){\r\n");
setStatement.append("((oracle.jdbc.OraclePreparedStatement)" + pstmt + ").setTIMESTAMPTZ(" + paramIndex + ", new oracle.sql.TIMESTAMPTZ(connection_" + cid + ", " +
"((TalendTimestampWithTZ)"+ variable +").getTimestamp(),((TalendTimestampWithTZ)"+ variable +").getCalendar()));\r\n");