Merge pull request #351 from CourseOrchestra/fix-timestamp-view

fix code generation for views with timestamp-with-timezone columns

Author: anlug1

celesta-maven-plugin/src/test/resources/gen-cursors/expectedGenerationResults/data/view/TestTableVCursor.java

@@ -3,11 +3,16 @@
 import java.lang.reflect.Field;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.util.Calendar;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.TimeZone;
 import javax.annotation.Generated;
 import ru.curs.celesta.CallContext;
 import ru.curs.celesta.ICelesta;
@@ -32,6 +37,8 @@ public final class TestTableVCursor extends ViewCursor implements Iterable<TestT
 
  private Integer id;
 
+ private ZonedDateTime toDelete;
+
  {
  this.COLUMNS = new TestTableVCursor.Columns(callContext().getCelesta());
  }
@@ -57,6 +64,13 @@ public void setId(Integer id) {
  this.id = id;
  }
 
+ public ZonedDateTime getToDelete() {
+ return this.toDelete;
+ }
+ public void setToDelete(ZonedDateTime toDelete) {
+ this.toDelete = toDelete;
+ }
+
  @Override
  protected Object _getFieldValue(String name) {
  try {
@@ -89,16 +103,26 @@ protected void _parseResult(ResultSet rs) throws SQLException {
  this.id = null;
  }
  }
+
+ if (this.inRec("toDelete")) {
+ Timestamp ts = rs.getTimestamp("toDelete", Calendar.getInstance(TimeZone.getTimeZone("UTC")));
+ if (ts != null) {
+ this.toDelete = ZonedDateTime.of(ts.toLocalDateTime(), ZoneOffset.systemDefault());
+ } else {
+ this.toDelete = null;
+ }
+ }
  }
 
  @Override
  public void _clearBuffer(boolean withKeys) {
  this.id = null;
+ this.toDelete = null;
  }
 
  @Override
  public Object[] _currentValues() {
- return new Object[] {id};
+ return new Object[] {id, toDelete};
  }
 
  @Override
@@ -118,6 +142,7 @@ public TestTableVCursor _getBufferCopy(CallContext context, List<String> fields)
  public void copyFieldsFrom(BasicCursor c) {
  TestTableVCursor from = (TestTableVCursor)c;
  this.id = from.id;
+ this.toDelete = from.toDelete;
  }
 
  @Override
@@ -151,5 +176,9 @@ public Columns(ICelesta celesta) {
  public ColumnMeta<Integer> id() {
  return (ColumnMeta<Integer>) this.element.getColumns().get("id");
  }
+
+ public ColumnMeta<ZonedDateTime> toDelete() {
+ return (ColumnMeta<ZonedDateTime>) this.element.getColumns().get("toDelete");
+ }
  }
 }

celesta-maven-plugin/src/test/resources/score/scorePart2/data/view/views.sql

@@ -4,7 +4,7 @@ set schema test;
  {implements: [java.io.Serializable, java.lang.Cloneable]}
  */
 create view testTableV AS
- SELECT id from testTable;
+ SELECT id, toDelete from testTable;
 
 /*
  {implements: [java.io.Serializable, java.lang.Cloneable]}

celesta-sql/src/main/java/ru/curs/celesta/score/ViewColumnType.java

@@ -129,7 +129,7 @@ public Class<?> getJavaClass() {
  DATE_WITH_TIME_ZONE {
  @Override
  public String jdbcGetterName() {
- return "getString";
+ return "getTimestamp";
  }
 
  @Override