Skip to content

Commit 30bc368

Browse files
AS-3017: Fix a bug in CodeTableDaoImpl.
1 parent 0bd871b commit 30bc368

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

farms-api/farms-persistence/src/main/java/ca/bc/gov/farms/persistence/v1/dao/jdbc/CodeTableDaoImpl.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,13 @@ protected List<CodeDto> select(Connection conn, CodeTableConfig codeTableConfig,
120120
fetchSql = "SELECT " + codeTableConfig.getCodeTableName() + " CODE, DESCRIPTION, "
121121
+ (Boolean.TRUE.equals(codeTableConfig.getUseDisplayOrder()) ? "DISPLAY_ORDER, "
122122
: "row_number() OVER (ORDER BY DESCRIPTION) DISPLAY_ORDER, ")
123-
+ "EFFECTIVE_DATE, EXPIRY_DATE, "
123+
+ "ESTABLISHED_DATE, EXPIRY_DATE, "
124124
+ (Boolean.TRUE.equals(codeTableConfig.getUseRevisionCount()) ? "REVISION_COUNT, " : "")
125125
+ "CREATE_USER, CREATE_DATE, UPDATE_USER, UPDATE_DATE from " + codeTableConfig.getCodeTableName();
126126
}
127127

128128
fetchSql = "select * from (" + fetchSql + ") t "
129-
+ (effectiveAsOfDate == null ? "" : "WHERE ? BETWEEN EFFECTIVE_DATE AND EXPIRY_DATE");
129+
+ (effectiveAsOfDate == null ? "" : "WHERE ? BETWEEN ESTABLISHED_DATE AND EXPIRY_DATE");
130130

131131
logger.debug("fetchSql=" + fetchSql);
132132
try (PreparedStatement st = conn.prepareStatement(fetchSql)) {
@@ -146,7 +146,7 @@ protected List<CodeDto> select(Connection conn, CodeTableConfig codeTableConfig,
146146
dto.setCode(rs.getString("CODE"));
147147
dto.setDescription(rs.getString("DESCRIPTION"));
148148
dto.setDisplayOrder(getInteger(rs, "DISPLAY_ORDER"));
149-
dto.setEffectiveDate(getLocalDate(rs, "EFFECTIVE_DATE"));
149+
dto.setEffectiveDate(getLocalDate(rs, "ESTABLISHED_DATE"));
150150
dto.setExpiryDate(getLocalDate(rs, "EXPIRY_DATE"));
151151
if (!Boolean.FALSE.equals(codeTableConfig.getUseRevisionCount())) {
152152
dto.setRevisionCount(getLong(rs, "REVISION_COUNT"));
@@ -180,7 +180,7 @@ protected void insert(Connection conn, CodeTableConfig codeTableConfig, CodeDto
180180
+ codeTableConfig.getCodeTableName() + ", "
181181
+ "DESCRIPTION, "
182182
+ (Boolean.TRUE.equals(codeTableConfig.getUseDisplayOrder()) ? "DISPLAY_ORDER, " : "")
183-
+ "EFFECTIVE_DATE, "
183+
+ "ESTABLISHED_DATE, "
184184
+ "EXPIRY_DATE, "
185185
+ (Boolean.TRUE.equals(codeTableConfig.getUseRevisionCount()) ? "REVISION_COUNT, " : "")
186186
+ "CREATE_USER, "
@@ -241,7 +241,7 @@ protected void update(Connection conn, CodeTableConfig codeTableConfig, CodeDto
241241
updateSql = "UPDATE " + codeTableConfig.getCodeTableName() + " SET "
242242
+ "DESCRIPTION = ?, "
243243
+ (Boolean.TRUE.equals(codeTableConfig.getUseDisplayOrder()) ? "DISPLAY_ORDER = ?, " : "")
244-
+ "EFFECTIVE_DATE = ?, "
244+
+ "ESTABLISHED_DATE = ?, "
245245
+ "EXPIRY_DATE = " + (dto.getExpiryDate() == null ? "to_date('9999-12-31','YYYY-MM-DD')" : "?")
246246
+ ", "
247247
+ (Boolean.TRUE.equals(codeTableConfig.getUseRevisionCount())

0 commit comments

Comments
 (0)