Merge branch 'main' into issue-2329

# Conflicts:
#	jdbc-v2/src/test/java/com/clickhouse/jdbc/PreparedStatementTest.java

Author: mzitnik

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

@@ -43,13 +43,7 @@
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
 import java.time.temporal.ChronoField;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class PreparedStatementImpl extends StatementImpl implements PreparedStatement, JdbcV2Wrapper {
     private static final Logger LOG = LoggerFactory.getLogger(PreparedStatementImpl.class);
@@ -661,6 +655,8 @@ private static String encodeObject(Object x) throws SQLException {
                 }
                 tupleString.append(")");
                 return tupleString.toString();
+            } else if (x instanceof UUID) {
+                return "'" + escapeString(((UUID) x).toString()) + "'";
             }
 
             return escapeString(x.toString());//Escape single quotes

jdbc-v2/src/test/java/com/clickhouse/jdbc/PreparedStatementTest.java

@@ -579,6 +579,29 @@ void testClearParameters() throws Exception {
         }
     }
 
+    @Test(groups = {"integration"})
+    void testWriteUUID() throws Exception {
+        String sql = "insert into `test_issue_2327` (`id`, `uuid`) values (?, ?)";
+        try (Connection conn = getJdbcConnection();
+             PreparedStatementImpl ps = (PreparedStatementImpl) conn.prepareStatement(sql)) {
+
+            try (Statement stmt = conn.createStatement()) {
+                stmt.execute("CREATE TABLE IF NOT EXISTS `test_issue_2327` (`id` Nullable(String), `uuid` UUID) ENGINE Memory;");
+            }
+            UUID uuid = UUID.randomUUID();
+            ps.setString(1, "testId01");
+            ps.setObject(2, uuid);
+            ps.execute();
+
+            try (Statement stmt = conn.createStatement()) {
+                ResultSet rs = stmt.executeQuery("SELECT count(*) FROM `test_issue_2327`");
+                Assert.assertTrue(rs.next());
+                Assert.assertEquals(rs.getInt(1), 1);
+            }
+        }
+
+    }
+
     @Test(groups = {"integration"})
     void testWriteCollection() throws Exception {
         String sql = "insert into `test_issue_2329` (`id`, `name`, `age`, `arr`) values (?, ?, ?, ?)";
@@ -605,5 +628,4 @@ void testWriteCollection() throws Exception {
         }
 
     }
-
 }

performance/pom.xml

@@ -15,7 +15,7 @@
     <properties>
         <apache.httpclient.version>5.3.1</apache.httpclient.version>
         <slf4j.version>2.0.17</slf4j.version>
-        <ch.jdbc.revision>0.8.3-SNAPSHOT</ch.jdbc.revision>
+        <ch.jdbc.revision>0.8.4-SNAPSHOT</ch.jdbc.revision>
         <jmh.version>1.37</jmh.version>
         <testcontainers.version>1.20.6</testcontainers.version>