Skip to content

Debuggers: Add date format for ts @W-11016406 #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
neha-kanekar wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Debuggers: Add date format for ts @W-11016406 #83

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
54 changes: 52 additions & 2 deletions src/main/java/com/salesforce/cdp/queryservice/core/QueryServiceResultSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ public class QueryServiceResultSet implements ResultSet {
protected ResultSetMetaData resultSetMetaData;
private SimpleDateFormat dateFormatterWithTime = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
private SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd");
private final String dateSimple = "yyyy-MM-dd";
private final String dateISOStandard = "yyyy-MM-dd'T'HH:mm:ss";
private final String dateWithTime = "yyyy-MM-dd HH:mm:ss.SSS";
protected QueryServiceAbstractStatement statement;
private int currentPageNum = 1;

Expand Down Expand Up @@ -804,12 +807,14 @@ public Array getArray(String columnLabel) throws SQLException {

@Override
public Date getDate(int columnIndex, Calendar cal) throws SQLException {
log.info("QSRS: Inside 22");
errorOutIfClosed();
String columnNameByIndex = getColumnNameByIndex(columnIndex);
return getDate(columnNameByIndex, cal);
}

@Override
//Actual Method
/*@Override
public Date getDate(String columnLabel, Calendar cal) throws SQLException {
errorOutIfClosed();
Object value = getObject(columnLabel);
Expand All @@ -831,40 +836,85 @@ public Date getDate(String columnLabel, Calendar cal) throws SQLException {
catch (IllegalArgumentException | ParseException e) {
throw new SQLException("Invalid date from server: " + value, e);
}
}*/

//Modified method which gives correct result
@Override
public Date getDate(String columnLabel, Calendar cal) throws SQLException {
log.info("QSRS: Inside 4");
errorOutIfClosed();
Object value = getObject(columnLabel);
if (wasNull() || StringUtils.EMPTY.equals(value)) {
wasNull.set(true);
return null;
}
Date result = null;
String[] formats = new String[] {dateWithTime, dateISOStandard, dateSimple};
try {
String valueString = value.toString();
for (String format: formats) {
SimpleDateFormat sdFormat = new SimpleDateFormat(format);
sdFormat.setTimeZone(cal.getTimeZone());
try {
cal.setTime(sdFormat.parse(valueString));
log.info("QSRS: parsed date {}", valueString);
log.info("QSRS: parsed format {}", format);
result = new Date(cal.getTimeInMillis());
log.info("QSRS: parsed result {}", result);
return result;
} catch (ParseException e) {
log.info("QSRS: caught exp {}", e.getMessage());
log.warn("QSRS: Date format does not match the formatter, trying another format", e);
}
}
}
catch (IllegalArgumentException e) {
throw new SQLException("Invalid date from server: " + value, e);
}
log.info("QSRS: reached end");
return result;
}

@Override
public Time getTime(int columnIndex, Calendar cal) throws SQLException {
log.info("QSRS: Inside 21");
errorOutIfClosed();
String columnNameByIndex = getColumnNameByIndex(columnIndex);
return getTime(columnNameByIndex, cal);
}

@Override
public Time getTime(String columnLabel, Calendar cal) throws SQLException {
log.info("QSRS: Inside 20");
errorOutIfClosed();
Date date = getDate(columnLabel, cal);
if (wasNull()){
return null;
}
//
return new Time(date.getTime());
}

@Override
public Timestamp getTimestamp(int columnIndex, Calendar cal) throws SQLException {
errorOutIfClosed();
String columnNameByIndex = getColumnNameByIndex(columnIndex);
log.info("Inside timestamp 11");
return getTimestamp(columnNameByIndex, cal);
}

@Override
public Timestamp getTimestamp(String columnLabel, Calendar cal) throws SQLException {
errorOutIfClosed();
Date date = getDate(columnLabel, cal);
log.info("Inside timestamp 12");
if (wasNull()){
log.info("Inside timestamp null");
return null;
}
return new Timestamp(date.getTime());
Timestamp ts = new Timestamp(date.getTime());
log.info("Inside timestamp 13 {}", ts);
return ts;
}

@Override
Expand Down