added a few more tests

Author: chernser

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

@@ -901,6 +901,7 @@ keyword
     | NO
     | NOT
     | NULLS
+    | NULL_SQL
     | NAME
     | OFFSET
     | ON

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

@@ -1080,4 +1080,33 @@ public void testParamWithCast() throws Exception {
             }
         }
     }
+    
+    @Test(groups = {"integration"})
+    public void testSelectWithTableAliasAsKeyword() throws Exception {
+        try (Connection conn = getJdbcConnection()) {
+            String[] keywords = {
+                    "ALL", "AND", "ANY", "AS", "ASC", "BY", "CREATE", "DATABASE", "DELETE", "DESC", "DISTINCT", "DROP", "EXISTS", "FROM", "GRANT", "GROUP", "HAVING", "INSERT", "INTO", "LIMIT", "NOT", "NULL", "ON", "ORDER", "REVOKE", "SELECT", "SET", "TABLE", "TO", "UPDATE", "VALUES", "VIEW", "WHILE", "WITH", "WHERE"
+            };
+
+            for (String keyword : keywords) {
+                final String table = keyword;
+                try (Statement stmt = conn.createStatement()) {
+                    stmt.execute("DROP TABLE IF EXISTS " + table);
+                    stmt.execute("CREATE TABLE " + table + " (v1 Int32, v2 String) Engine MergeTree ORDER BY ()");
+                    stmt.execute("INSERT INTO `" + table + "` VALUES (1000, 'test')");
+                }
+
+                try (PreparedStatement stmt = conn.prepareStatement("SELECT v1, v2 FROM " + table + " AS " + keyword + " WHERE v1 = ? AND v2 = ?")) {
+                    stmt.setInt(1, 1000);
+                    stmt.setString(2, "test");
+                    stmt.execute();
+                    try (ResultSet rs = stmt.getResultSet()) {
+                        assertTrue(rs.next());
+                        Assert.assertEquals(rs.getInt(1), 1000);
+                        Assert.assertEquals(rs.getString(2), "test");
+                    }
+                }
+            }
+        }
+    }
 }

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

@@ -2,6 +2,7 @@
 
 import com.clickhouse.client.api.ClientConfigProperties;
 import com.clickhouse.client.api.query.GenericRecord;
+import com.clickhouse.jdbc.internal.ClickHouseParser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
@@ -729,4 +730,27 @@ public void testDDLStatements() throws Exception {
             }
         }
     }
+
+    @Test(groups = {"integration"})
+    public void testSelectWithKeywordsAsTableAlias() throws Exception {
+        String[] keywords = {
+                "ALL", "AND", "ANY", "AS", "ASC", "BY", "CREATE", "DATABASE", "DELETE", "DESC", "DISTINCT", "DROP", "EXISTS", "FROM", "GRANT", "GROUP", "HAVING", "INSERT", "INTO", "LIMIT", "NOT", "NULL", "ON", "ORDER", "REVOKE", "SELECT", "SET", "TABLE", "TO", "UPDATE", "VALUES", "VIEW", "WHILE", "WITH", "WHERE"
+        };
+
+        try (Connection conn = getJdbcConnection()) {
+            for (String keyword : keywords) {
+                String createSql = "CREATE TABLE IF NOT EXISTS " + getDatabase() + "." + keyword + "(id UInt8) ENGINE = MergeTree ORDER BY id";
+                String insertSql = "INSERT INTO " + getDatabase() + "." + keyword + " VALUES (1)";
+                String selectSql = "SELECT * FROM " + getDatabase() + "." + keyword + " AS " + keyword;
+                try (Statement stmt = conn.createStatement()) {
+                    Assert.assertFalse(stmt.execute(createSql));
+                    Assert.assertFalse(stmt.execute(insertSql));
+                    try (ResultSet rs = stmt.executeQuery(selectSql)) {
+                        Assert.assertTrue(rs.next());
+                        Assert.assertEquals(rs.getInt(1), 1);
+                    }
+                }
+            }
+        }
+    }
 }