Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion database-commons/src/main/java/io/cdap/plugin/util/DBUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,13 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Types;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.Hashtable;
import java.util.List;
import java.util.Objects;
import java.util.TimeZone;
import javax.annotation.Nullable;
import javax.management.InstanceNotFoundException;
import javax.management.IntrospectionException;
Expand All @@ -55,6 +59,18 @@
public final class DBUtils {
private static final Logger LOG = LoggerFactory.getLogger(DBUtils.class);

private static final Calendar PURE_GREGORIAN_CALENDAR = createPureGregorianCalender();

// Java by default uses October 15, 1582 as a Gregorian cut over date.
// Any timestamp created with time less than this cut over date is treated as Julian date.
// This causes old dates from database such as 0001-01-01 01:00:00 mapped to 0000-12-30
// Get the pure gregorian calendar so that all dates are treated as gregorian format.
private static Calendar createPureGregorianCalender() {
GregorianCalendar gc = new GregorianCalendar();
gc.setGregorianChange(new Date(Long.MIN_VALUE));
return gc;
}

/**
* Performs any Database related cleanup
*
Expand Down Expand Up @@ -116,7 +132,7 @@ public static Object transformValue(int sqlType, int precision, int scale,
case Types.TIME:
return resultSet.getTime(columnIndex);
case Types.TIMESTAMP:
return resultSet.getTimestamp(columnIndex);
return resultSet.getTimestamp(columnIndex, PURE_GREGORIAN_CALENDAR);
case Types.ROWID:
return resultSet.getString(columnIndex);
case Types.BLOB:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public String getConnectionString() {
} else if (OracleConstants.SERVICE_CONNECTION_TYPE.equals(getConnectionType())) {
return String.format(OracleConstants.ORACLE_CONNECTION_STRING_SERVICE_NAME_FORMAT, host, getPort(), database);
} else {
return String.format(OracleConstants.ORACLE_CONNECTION_STRING_SID_FORMAT, host, getPort(),database);
return String.format(OracleConstants.ORACLE_CONNECTION_STRING_SID_FORMAT, host, getPort(), database);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ private OracleConstants() {
public static final String CONNECTION_TYPE = "connectionType";
public static final String ROLE = "role";
public static final String NAME_DATABASE = "database";
public static final String TNS_CONNECTION_TYPE= "TNS";
public static final String TNS_CONNECTION_TYPE = "TNS";
}