Merge branch 'main' into fix_settings_mutability

Author: chernser

client-v2/src/main/java/com/clickhouse/client/api/data_formats/ClickHouseBinaryFormatReader.java

@@ -11,7 +11,12 @@
 import java.math.BigInteger;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
-import java.time.*;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZonedDateTime;
 import java.time.temporal.TemporalAmount;
 import java.util.List;
 import java.util.Map;

client-v2/src/main/java/com/clickhouse/client/api/data_formats/internal/AbstractBinaryFormatReader.java

@@ -135,7 +135,7 @@ public boolean readToPOJO(Map<String, POJOFieldDeserializer> deserializers, Obje
      * It is still internal method and should be used with care.
      * Usually this method is called to read next record into internal object and affects hasNext() method.
      * So after calling this one:
-     * - hasNext(), next() should not be called
+     * - hasNext(), next() and get methods cannot be called
      * - stream should be read with readRecord() method fully
      *
      * @param record

client-v2/src/test/java/com/clickhouse/client/query/QueryTests.java

@@ -10,7 +10,6 @@
 import com.clickhouse.client.api.ClientException;
 import com.clickhouse.client.api.DataTypeUtils;
 import com.clickhouse.client.api.ServerException;
-import com.clickhouse.client.api.command.CommandResponse;
 import com.clickhouse.client.api.command.CommandSettings;
 import com.clickhouse.client.api.data_formats.ClickHouseBinaryFormatReader;
 import com.clickhouse.client.api.data_formats.internal.BinaryStreamReader;
@@ -44,7 +43,6 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
-import org.testng.util.Strings;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;

examples/jdbc/src/main/java/com/clickhouse/examples/jdbc/Basic.java

@@ -59,13 +59,20 @@ static void insertDateWithPreparedStatement(String url, Properties properties) t
                 pstmt.setString(3, "Alice");//Set the third parameter to "Alice"
                 pstmt.setObject(4, Collections.singletonMap("key1", "value1"));
                 pstmt.addBatch();//Add the current parameters to the batch
+                pstmt.executeBatch();//Execute the batch
 
                 pstmt.setObject(1, ZonedDateTime.now());
                 pstmt.setInt(2, 2);//Set the second parameter to 2
                 pstmt.setString(3, "Bob");//Set the third parameter to "Bob"
                 pstmt.setObject(4, Collections.singletonMap("key2", "value2"));
                 pstmt.addBatch();//Add the current parameters to the batch
 
+                pstmt.setObject(1, ZonedDateTime.now());
+                pstmt.setInt(2, 2);//Set the second parameter to 2
+                pstmt.setString(3, "Chris");//Set the third parameter to "Chris"
+                pstmt.setObject(4, Collections.singletonMap("key3", "value3"));
+                pstmt.addBatch();//Add the current parameters to the batch
+
                 pstmt.executeBatch();//Execute the batch
             }
         }

jdbc-v2/src/main/antlr4/com/clickhouse/jdbc/internal/ClickHouseParser.g4

@@ -41,7 +41,7 @@ query
 
 // CTE statement
 ctes
-    : LPAREN? WITH (cteUnboundCol COMMA)* namedQuery (COMMA namedQuery)* RPAREN?
+    : LPAREN? WITH cteUnboundCol? (COMMA cteUnboundCol)* COMMA? namedQuery (COMMA namedQuery)* RPAREN?
     ;
 
 namedQuery
@@ -55,6 +55,8 @@ columnAliases
 cteUnboundCol
     : (literal AS identifier) # CteUnboundColLiteral
     | (QUERY AS identifier) # CteUnboundColParam
+    | LPAREN columnExpr RPAREN AS identifier # CteUnboundColExpr
+    | LPAREN ctes? selectStmt RPAREN AS identifier # CteUnboundNestedSelect
     ;
 
 // ALTER statement
@@ -438,6 +440,11 @@ fromClause
     : FROM joinExpr
     | FROM identifier LPAREN QUERY RPAREN
     | FROM ctes
+    | FROM identifier LPAREN viewParam (COMMA viewParam)?  RPAREN
+    ;
+
+viewParam
+    : identifier EQ_SINGLE (literal | QUERY)
     ;
 
 arrayJoinClause
@@ -937,6 +944,7 @@ columnExpr
     | LBRACKET columnExprList? RBRACKET                            # ColumnExprArray
     | columnIdentifier                                             # ColumnExprIdentifier
     | QUERY (CAST_OP identifier)?                                  # ColumnExprParam
+    | columnExpr REGEXP literal                                    # ColumnExprRegexp
     ;
 
 columnArgList

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

@@ -130,6 +130,10 @@ public void setDefaultQuerySettings(QuerySettings settings) {
         this.defaultQuerySettings = settings;
     }
 
+    public Calendar getDefaultCalendar() {
+        return defaultCalendar;
+    }
+
     public String getServerVersion() throws SQLException {
         GenericRecord result = client.queryAll("SELECT version() as server_version").stream()
                 .findFirst().orElseThrow(() -> new SQLException("Failed to retrieve server version.", ExceptionUtils.SQL_STATE_CLIENT_ERROR));

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

@@ -332,15 +332,23 @@ public long[] executeLargeBatch() throws SQLException {
     }
 
     private List<Integer> executeBatchImpl() throws SQLException {
+        List<Integer> results;
         if (insertStmtWithValues) {
-            return executeInsertBatch();
+            results = executeInsertBatch();
         } else {
-            List<Integer> results = new ArrayList<>();
+            results = new ArrayList<>();
             for (String sql : batch) {
                 results.add((int) executeUpdateImpl(sql, localSettings));
             }
-            return results;
         }
+        clearBatch();
+        return results;
+    }
+
+    @Override
+    public void clearBatch() throws SQLException {
+        super.clearBatch(); /// clear super#batch
+        batchValues.clear();
     }
 
     private List<Integer> executeInsertBatch() throws SQLException {

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

@@ -39,7 +39,7 @@
 
 public class ResultSetImpl implements ResultSet, JdbcV2Wrapper {
     private static final Logger log = LoggerFactory.getLogger(ResultSetImpl.class);
-    private ResultSetMetaData metaData;
+    private ResultSetMetaDataImpl metaData;
     protected ClickHouseBinaryFormatReader reader;
     private QueryResponse response;
     private boolean closed;
@@ -49,9 +49,9 @@ public class ResultSetImpl implements ResultSet, JdbcV2Wrapper {
 
     private final FeatureManager  featureManager;
 
-    private static final int AFTER_LAST = -1;
-    private static final int BEFORE_FIRST = 0;
-    private static final int FIRST_ROW = 1;
+    public static final int AFTER_LAST = -1;
+    public static final int BEFORE_FIRST = 0;
+    public static final int FIRST_ROW = 1;
     private int rowPos;
 
     private int fetchSize;

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

@@ -416,6 +416,7 @@ private List<Integer> executeBatchImpl() throws SQLException {
         for (String sql : batch) {
             results.add(executeUpdate(sql));
         }
+        clearBatch();
         return results;
     }