Compare commits

...

5 Commits

Author SHA1 Message Date
Dmytro Sylaiev
4378ed4f37 Revert "fix(TDI-39175): Revert unsafe changes, move it into mysql component (#1533)"
This reverts commit 73b9b1a46f.
2017-07-18 14:24:52 +03:00
Dmytro Sylaiev
6c9c7594f1 Revert "Igonchar/revert codegen (#1530)"
This reverts commit 3ae65cab86.
2017-07-18 14:24:52 +03:00
Dmytro Sylaiev
3ea8dd8489 Revert "TUP-6845:Get error when open SQL Builder with Repository type on (#1528)"
This reverts commit 4ccd8bd8e7.
2017-07-18 14:24:52 +03:00
Dmytro Sylaiev
3b3af284c9 Revert "fix(TDI-38433):tRedshiftBulkExec should involve DB schema when check (#1519)"
This reverts commit 952fbfad7e.
2017-07-18 14:24:52 +03:00
Dmytro Sylaiev
e5c3c10868 Revert "fix(TDI-37942): Fix handling of base64 encoded LDIF entry (#1522)"
This reverts commit a28b6289f1.
2017-07-18 14:24:52 +03:00
2 changed files with 14 additions and 15 deletions

View File

@@ -70,7 +70,6 @@ imports="
public void generateYearResultSet(String firstConnName, IMetadataColumn column, int currentColNo) {
%>
//check if year is null in DB
String yearStringValue_<%=cid %> = rs_<%=cid%>.getString(<%if(isDynamic){%>column_index_<%=cid%><%}else{%><%=currentColNo%><%}%>);
if (null != yearStringValue_<%=cid %>) {
Integer yearValue_<%=cid%> = rs_<%=cid%>.getInt(<%if(isDynamic){%>column_index_<%=cid%><%}else{%><%=currentColNo%><%}%>);
@@ -84,22 +83,18 @@ imports="
//-----------according schema type to generate ResultSet
public void generateTimestampResultSet(String firstConnName, IMetadataColumn column, int currentColNo) {
if ("YEAR".equalsIgnoreCase(column.getType())) {
generateYearResultSet(firstConnName, column, currentColNo);
} else {
%>
if(rs_<%=cid %>.getString(<%if(isDynamic){%>column_index_<%=cid%><%}else{%><%=currentColNo%><%}%>) != null) {
String dateString_<%=cid%> = rs_<%=cid%>.getString(<%if(isDynamic){%>column_index_<%=cid%><%}else{%><%=currentColNo%><%}%>);
if (!("0000-00-00").equals(dateString_<%=cid%>) && !("0000-00-00 00:00:00").equals(dateString_<%=cid%>)) {
<%=firstConnName%>.<%=column.getLabel()%> = rs_<%=cid%>.getTimestamp(<%if(isDynamic){%>column_index_<%=cid%><%}else{%><%=currentColNo%><%}%>);
} else {
<%=firstConnName%>.<%=column.getLabel()%> = (java.util.Date) year0_<%=cid%>.clone();
}
} else {
<%=firstConnName%>.<%=column.getLabel()%> = null;
}
if(rs_<%=cid %>.getString(<%if(isDynamic){%>column_index_<%=cid%><%}else{%><%=currentColNo%><%}%>) != null) {
String dateString_<%=cid%> = rs_<%=cid%>.getString(<%if(isDynamic){%>column_index_<%=cid%><%}else{%><%=currentColNo%><%}%>);
if (!("0000-00-00").equals(dateString_<%=cid%>) && !("0000-00-00 00:00:00").equals(dateString_<%=cid%>)) {
<%=firstConnName%>.<%=column.getLabel()%> = rs_<%=cid%>.getTimestamp(<%if(isDynamic){%>column_index_<%=cid%><%}else{%><%=currentColNo%><%}%>);
} else {
<%=firstConnName%>.<%=column.getLabel()%> = (java.util.Date) year0_<%=cid%>.clone();
}
} else {
<%=firstConnName%>.<%=column.getLabel()%> = null;
}
<%
}
}
//---------end according schema type to generate ResultSet

View File

@@ -233,6 +233,10 @@ imports="
if("vertica_id".equalsIgnoreCase(dbms) && "DATE".equalsIgnoreCase(column.getType())){
%>
<%dbInputBeginUtil.generateOthersResultSet(firstConnName, column, currentColNo, "Date");%>
<%
} else if ("mysql_id".equalsIgnoreCase(dbms) && "YEAR".equalsIgnoreCase(column.getType()) && (dbInputBeginUtil instanceof DBInputBeginUtil)){
%>
<%((DBInputBeginUtil)dbInputBeginUtil).generateYearResultSet(firstConnName, column, currentColNo);%>
<%
}else{
%>