Skip to content

Commit 33953f9

Browse files
committed
fixed get calender inconsistency. added more words about why to reopen statement
1 parent b223c4c commit 33953f9

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

jdbc-v2/src/main/java/com/clickhouse/jdbc/ResultSetImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public ResultSetImpl(StatementImpl parentStatement, QueryResponse response, Clic
6969
JdbcUtils.DATA_TYPE_CLASS_MAP);
7070
this.closed = false;
7171
this.wasNull = false;
72-
this.defaultCalendar = parentStatement.connection.defaultCalendar;
72+
this.defaultCalendar = parentStatement.getConnection().defaultCalendar;
7373
this.rowPos = BEFORE_FIRST;
7474
this.fetchSize = parentStatement.getFetchSize();
7575
}

jdbc-v2/src/main/java/com/clickhouse/jdbc/StatementImpl.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,11 @@ protected ResultSetImpl executeQueryImpl(String sql, QuerySettings settings) thr
131131
// release before this one completes.
132132
if (resultSetAutoClose) {
133133
closeCurrentResultSet();
134-
this.closed = false; // restore state because we are going to create a new result set.
134+
// There is a feature `closeOnComplete` that dictate closing statement when all
135+
// result sets are closed. Call to `closeCurrentResultSet` will trigger this statement
136+
// closure. But it should not happen because this was introduces instead of spec and will be remove in future/
137+
// So we need make this statement open again because we going to create a new result set.
138+
this.closed = false;
135139
}
136140

137141
QuerySettings mergedSettings = QuerySettings.merge(settings, new QuerySettings());

0 commit comments

Comments
 (0)