fixed expected format of the fixed date time values

chernser · chernser · commit 797e50c7650e · 2025-07-28T15:00:40.000-07:00
diff --git a/jdbc-v2/src/main/java/com/clickhouse/jdbc/PreparedStatementImpl.java b/jdbc-v2/src/main/java/com/clickhouse/jdbc/PreparedStatementImpl.java
@@ -360,7 +360,7 @@ private List<Integer> executeInsertBatch() throws SQLException {
     @Override
     public void setCharacterStream(int parameterIndex, Reader x, int length) throws SQLException {
         ensureOpen();
-        setCharacterStream(1, x, (long)length);
+        setCharacterStream(parameterIndex, x, (long)length);
     }
 
     @Override
diff --git a/jdbc-v2/src/test/java/com/clickhouse/jdbc/DataTypeTests.java b/jdbc-v2/src/test/java/com/clickhouse/jdbc/DataTypeTests.java
@@ -562,18 +562,18 @@ public void testDateTypes() throws SQLException {
             assertEquals(rs.getString("date32"), "1970-01-01");
             assertEquals(rs.getString("dateTime"), "1970-01-01 00:00:00");
             assertEquals(rs.getString("dateTime32"), "1970-01-01 00:00:00");
-            assertEquals(rs.getString("dateTime643"), "1970-01-01T00:00Z[UTC]");
-            assertEquals(rs.getString("dateTime646"), "1970-01-01T00:00Z[UTC]");
-            assertEquals(rs.getString("dateTime649"), "1970-01-01T00:00Z[UTC]");
+            assertEquals(rs.getString("dateTime643"), "1970-01-01 00:00:00");
+            assertEquals(rs.getString("dateTime646"), "1970-01-01 00:00:00");
+            assertEquals(rs.getString("dateTime649"), "1970-01-01 00:00:00");
 
             assertTrue(rs.next());
             assertEquals(rs.getString("date"), "2149-06-06");
             assertEquals(rs.getString("date32"), "2299-12-31");
             assertEquals(rs.getString("dateTime"), "2106-02-07 06:28:15");
             assertEquals(rs.getString("dateTime32"), "2106-02-07 06:28:15");
-            assertEquals(rs.getString("dateTime643"), "2261-12-31T23:59:59.999Z[UTC]");
-            assertEquals(rs.getString("dateTime646"), "2261-12-31T23:59:59.999999Z[UTC]");
-            assertEquals(rs.getString("dateTime649"), "2261-12-31T23:59:59.999999999Z[UTC]");
+            assertEquals(rs.getString("dateTime643"), "2261-12-31 23:59:59.999");
+            assertEquals(rs.getString("dateTime646"), "2261-12-31 23:59:59.999999");
+            assertEquals(rs.getString("dateTime649"), "2261-12-31 23:59:59.999999999");
 
             ZoneId tzServer = ZoneId.of(((ConnectionImpl) conn).getClient().getServerTimeZone());
             assertTrue(rs.next());
@@ -593,13 +593,13 @@ public void testDateTypes() throws SQLException {
                     Instant.ofEpochMilli(dateTime32.getTime()).atZone(tzServer)));
             assertEquals(
                 rs.getString("dateTime643"),
-                dateTime643.toInstant().atZone(tzServer).toString());
+                DataTypeUtils.DATETIME_WITH_NANOS_FORMATTER.format(dateTime643.toInstant().atZone(tzServer)));
             assertEquals(
                 rs.getString("dateTime646"),
-                dateTime646.toInstant().atZone(tzServer).toString());
+                    DataTypeUtils.DATETIME_WITH_NANOS_FORMATTER.format(dateTime646.toInstant().atZone(tzServer)));
             assertEquals(
                 rs.getString("dateTime649"),
-                dateTime649.toInstant().atZone(tzServer).toString());
+                DataTypeUtils.DATETIME_WITH_NANOS_FORMATTER.format(dateTime649.toInstant().atZone(tzServer)));
 
             assertFalse(rs.next());
         }
@@ -1507,21 +1507,21 @@ public void testTypeConversions() throws Exception {
                     assertEquals(rs.getTimestamp(6).toString(), "2024-12-01 12:34:56.789");
                     assertTrue(rs.getObject(6) instanceof Timestamp);
                     assertEquals(rs.getObject(6), Timestamp.valueOf("2024-12-01 12:34:56.789"));
-                    assertEquals(rs.getString(6), "2024-12-01T12:34:56.789Z[UTC]");
+                    assertEquals(rs.getString(6), "2024-12-01 12:34:56.789");
                     assertEquals(rs.getObject(6, LocalDateTime.class), LocalDateTime.of(2024, 12, 1, 12, 34, 56, 789000000));
                     assertEquals(String.valueOf(rs.getObject(6, new HashMap<String, Class<?>>(){{put(JDBCType.TIMESTAMP.getName(), LocalDateTime.class);}})), "2024-12-01T12:34:56.789");
 
                     assertEquals(rs.getTimestamp(7).toString(), "2024-12-01 12:34:56.789789");
                     assertTrue(rs.getObject(7) instanceof Timestamp);
                     assertEquals(rs.getObject(7), Timestamp.valueOf("2024-12-01 12:34:56.789789"));
-                    assertEquals(rs.getString(7), "2024-12-01T12:34:56.789789Z[UTC]");
+                    assertEquals(rs.getString(7), "2024-12-01 12:34:56.789789");
                     assertEquals(rs.getObject(7, LocalDateTime.class), LocalDateTime.of(2024, 12, 1, 12, 34, 56, 789789000));
                     assertEquals(String.valueOf(rs.getObject(7, new HashMap<String, Class<?>>(){{put(JDBCType.TIMESTAMP.getName(), OffsetDateTime.class);}})), "2024-12-01T12:34:56.789789Z");
 
                     assertEquals(rs.getTimestamp(8).toString(), "2024-12-01 12:34:56.789789789");
                     assertTrue(rs.getObject(8) instanceof Timestamp);
                     assertEquals(rs.getObject(8), Timestamp.valueOf("2024-12-01 12:34:56.789789789"));
-                    assertEquals(rs.getString(8), "2024-12-01T12:34:56.789789789Z[UTC]");
+                    assertEquals(rs.getString(8), "2024-12-01 12:34:56.789789789");
                     assertEquals(rs.getObject(8, LocalDateTime.class), LocalDateTime.of(2024, 12, 1, 12, 34, 56, 789789789));
                     assertEquals(String.valueOf(rs.getObject(8, new HashMap<String, Class<?>>(){{put(JDBCType.TIMESTAMP.getName(), ZonedDateTime.class);}})), "2024-12-01T12:34:56.789789789Z[UTC]");
                 }
diff --git a/jdbc-v2/src/test/java/com/clickhouse/jdbc/PreparedStatementTest.java b/jdbc-v2/src/test/java/com/clickhouse/jdbc/PreparedStatementTest.java
@@ -295,7 +295,7 @@ public void testTuple() throws Exception {
         }
     }
 
-    @Test(groups = {"integrations"})
+    @Test(groups = {"integration"})
     public void testSetAsciiStream() throws Exception {
         final String value = "Some long string with '' to check quote escaping";
         try (Connection conn = getJdbcConnection()) {
@@ -313,7 +313,7 @@ public void testSetAsciiStream() throws Exception {
         }
     }
 
-    @Test(groups = {"integrations"})
+    @Test(groups = {"integration"})
     public void testSetUnicodeStream() throws Exception {
         final String value = "Some long string with '' to check quote escaping";
         try (Connection conn = getJdbcConnection()) {
@@ -331,7 +331,7 @@ public void testSetUnicodeStream() throws Exception {
         }
     }
 
-    @Test(groups = {"integrations"})
+    @Test(groups = {"integration"})
     public void testSetBinaryStream() throws Exception {
         final String value = "Some long string with '' to check quote escaping";
         try (Connection conn = getJdbcConnection()) {

Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,7 @@ private List<Integer> executeInsertBatch() throws SQLException {`
`360`	`360`	`@Override`
`361`	`361`	`public void setCharacterStream(int parameterIndex, Reader x, int length) throws SQLException {`
`362`	`362`	`ensureOpen();`
`363`		`- setCharacterStream(1, x, (long)length);`
	`363`	`+ setCharacterStream(parameterIndex, x, (long)length);`
`364`	`364`	`}`
`365`	`365`
`366`	`366`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ public void testTuple() throws Exception {`
`295`	`295`	`}`
`296`	`296`	`}`
`297`	`297`
`298`		`- @Test(groups = {"integrations"})`
	`298`	`+ @Test(groups = {"integration"})`
`299`	`299`	`public void testSetAsciiStream() throws Exception {`
`300`	`300`	`final String value = "Some long string with '' to check quote escaping";`
`301`	`301`	`try (Connection conn = getJdbcConnection()) {`
`@@ -313,7 +313,7 @@ public void testSetAsciiStream() throws Exception {`
`313`	`313`	`}`
`314`	`314`	`}`
`315`	`315`
`316`		`- @Test(groups = {"integrations"})`
	`316`	`+ @Test(groups = {"integration"})`
`317`	`317`	`public void testSetUnicodeStream() throws Exception {`
`318`	`318`	`final String value = "Some long string with '' to check quote escaping";`
`319`	`319`	`try (Connection conn = getJdbcConnection()) {`
`@@ -331,7 +331,7 @@ public void testSetUnicodeStream() throws Exception {`
`331`	`331`	`}`
`332`	`332`	`}`
`333`	`333`
`334`		`- @Test(groups = {"integrations"})`
	`334`	`+ @Test(groups = {"integration"})`
`335`	`335`	`public void testSetBinaryStream() throws Exception {`
`336`	`336`	`final String value = "Some long string with '' to check quote escaping";`
`337`	`337`	`try (Connection conn = getJdbcConnection()) {`