removed unwanted change. Fixed tests

Author: chernser

client-v2/src/test/java/com/clickhouse/client/datatypes/DataTypeTests.java

@@ -1541,10 +1541,10 @@ public void testJSONScanDoesNotLeakKeysAcrossRows() throws Exception {
                 .serverSetting("allow_experimental_json_type", "1");
 
         client.execute("DROP TABLE IF EXISTS " + table).get().close();
-        client.execute(tableDefinition(table, "data JSON"), cmdSettings).get().close();
-        client.execute("INSERT INTO " + table + " VALUES ('{\"a\": \"foo\"}'::JSON), ('{\"b\": \"bar\"}'::JSON)").get().close();
+        client.execute(tableDefinition(table, "id UInt32", "data JSON"), cmdSettings).get().close();
+        client.execute("INSERT INTO " + table + " VALUES (1, '{\"a\": \"foo\"}'::JSON), (2, '{\"b\": \"bar\"}'::JSON)", cmdSettings).get().close();
 
-        List<GenericRecord> records = client.queryAll("SELECT * FROM " + table + " ORDER BY data");
+        List<GenericRecord> records = client.queryAll("SELECT * FROM " + table + " ORDER BY id");
         Assert.assertEquals(records.size(), 2);
 
         for (GenericRecord record : records) {

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

@@ -135,7 +135,6 @@ private String buildSQL() throws SQLException {
     public ResultSet executeQuery() throws SQLException {
         ensureOpen();
         String buildSQL = buildSQL();
-        System.out.println(buildSQL);
         return super.executeQueryImpl(buildSQL, localSettings);
     }
 
@@ -485,6 +484,7 @@ public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) throws S
         ensureOpen();
         TimeZone tz = (cal == null ? defaultCalendar : cal).getTimeZone();
         values[parameterIndex - 1] = encodeObject(DataTypeUtils.toZonedDateTime(x, tz));
+        values[parameterIndex - 1] = encodeObject(DataTypeUtils.toZonedDateTime(x, tz));
     }
 
     @Override
@@ -744,10 +744,6 @@ private String encodeObject(Object x) throws SQLException {
 
     private static final char QUOTE = '\'';
 
-    /** Matches a datetime string that ends with a decimal point followed only by zeros, e.g. "2024-09-10 22:58:20.0".
-     *  Such strings are produced by {@link Timestamp#toString()} and are rejected by ClickHouse DateTime. */
-    private static final Pattern TRAILING_ZERO_FRACTION = Pattern.compile("(\\d{4}-\\d{2}-\\d{2}[T ]\\d{2}:\\d{2}:\\d{2})\\.0+$");
-
     private static final char O_BRACKET = '[';
     private static final char C_BRACKET = ']';
 
@@ -758,12 +754,7 @@ private String encodeObject(Object x, Long length) throws SQLException {
             if (x == null) {
                 return "NULL";
             } else if (x instanceof String) {
-                String s = (String) x;
-                Matcher m = TRAILING_ZERO_FRACTION.matcher(s);
-                if (m.matches()) {
-                    s = m.group(1);
-                }
-                return QUOTE + SQLUtils.escapeSingleQuotes(s) + QUOTE;
+                return QUOTE + SQLUtils.escapeSingleQuotes((String) x) + QUOTE;
             } else if (x instanceof Boolean) {
                 return (Boolean) x ? "1" : "0";
             } else if (x instanceof Date) {