Added parsing of table name (#117)

Author: alex268

jdbc/src/main/java/tech/ydb/jdbc/query/YdbQueryParser.java

@@ -291,6 +291,9 @@ public String parseSQL() throws SQLException {
                 case ',':
                     batcher.readComma();
                     break;
+                case '.':
+                    batcher.readPoint();
+                    break;
                 case '=':
                     batcher.readEqual();
                     break;

jdbc/src/main/java/tech/ydb/jdbc/query/YqlBatcher.java

@@ -38,6 +38,8 @@ private enum State {
         VALUES_CLOSE_PAREN,  // Readed ')'
 
         WHERE, // Readed WHERE keyword (only for UPDATE/DELETE)
+        WHERE_TABLE,  // Readed table name in WHERE clause as part of identifier
+        WHERE_POINT,  // Readed '.' after table name in WHERE clause
         WHERE_COLUMN, // Readed column name in WHERE clause
         WHERE_EQUAL,  // Readed '=' in WHERE clause
         WHERE_VALUE,  // Readed column value in WHERE clause (support only ?)
@@ -195,11 +197,24 @@ public void readComma() {
         state = State.ERROR;
     }
 
+    public void readPoint() {
+        if (state == State.WHERE_TABLE) {
+            state = State.WHERE_POINT;
+            return;
+        }
+        state = State.ERROR;
+    }
+
     public void readEqual() {
         if (state == State.COLUMNS_NAME && cmd == Cmd.UPDATE) {
             state = State.COLUMNS_EQUAL;
             return;
         }
+        if (state == State.WHERE_TABLE) { // special case with column name == table name
+            keyColumns.add(tableName);
+            state = State.WHERE_EQUAL;
+            return;
+        }
         if (state == State.WHERE_COLUMN && (cmd == Cmd.UPDATE || cmd == Cmd.DELETE)) {
             state = State.WHERE_EQUAL;
             return;
@@ -347,6 +362,17 @@ public void readIdentifier(char[] query, int start, int length) {
         }
 
         if (state == State.WHERE || state == State.WHERE_AND) {
+            String identifier = unquote(query, start, length);
+            if (tableName.equals(identifier)) {
+                state = State.WHERE_TABLE;
+            } else {
+                keyColumns.add(identifier);
+                state = State.WHERE_COLUMN;
+            }
+            return;
+        }
+
+        if (state == State.WHERE_POINT) {
             keyColumns.add(unquote(query, start, length));
             state = State.WHERE_COLUMN;
             return;

jdbc/src/test/java/tech/ydb/jdbc/query/YdbQueryParserTest.java

@@ -560,8 +560,8 @@ public void batchedReplaceOneColumnTest(String query) throws SQLException {
 
     @ParameterizedTest(name = "[{index}] {0} is batched update query")
     @ValueSource(strings = {
-        "Update table_name set c1 = ?, c2 = ?, c3 = ? where k1 = ? AND k2 = ?",
-        "\n  update `table_name` set\t`c1`=?,c2=?,c3=?\tWhere\nk1=? AND k2=?;;;",
+        "Update table_name set c1 = ?, c2 = ?, c3 = ? where table_name .k1 = ? AND k2 = ?",
+        "\n  update `table_name` set\t`c1`=?,c2=?,c3=?\tWhere\nk1=? AND `table_name`. `k2`=?;;;",
         "/* comment */ upDaTe `table_name` set  `c1` /* commect */ = ?, c2 = \n?, c3 = ? WHERE k1=? AND k2=?;;\n-- com",
         ";;UPDATE/* comment */table_name set  `c1`= ?, c2 = ?, c3 = ? WHERE k1\n=\t?--comment\nAND k2=?",
     })
@@ -588,8 +588,8 @@ public void batchedUpdateTest(String query) throws SQLException {
     @ValueSource(strings = {
         "Update one_column set c1 = ? where k1 = ?",
         "\n  update `one_column` set\t`c1`=?\tWhere\nk1=?;;;",
-        "/* comment */ upDaTe `one_column` set  `c1` /* commect */ = ? WHERE k1=?;;\n-- com",
-        ";;UPDATE/* comment */one_column set  `c1`= ? WHERE k1=--comment\n?",
+        "/* comment */ upDaTe `one_column` set  `c1` /* commect */ = ? WHERE `one_column`.k1=?;;\n-- com",
+        ";;UPDATE/* comment */one_column set  `c1`= ? WHERE one_column.`k1`=--comment\n?",
     })
     public void batchedUpdateOneColumnTest(String query) throws SQLException {
         YdbQueryParser parser = new YdbQueryParser(types, query, props);
@@ -610,12 +610,38 @@ public void batchedUpdateOneColumnTest(String query) throws SQLException {
         Assertions.assertEquals(Arrays.asList("c1"), batch.getColumns());
     }
 
+    @ParameterizedTest(name = "[{index}] {0} is batched update query")
+    @ValueSource(strings = {
+        "Update test_table set column = ? where test_table = ?",
+        "Update test_table set column = ? where test_table . test_table = ?",
+        "Update test_table set column = ? where `test_table`.test_table = ?",
+        "Update test_table set column = ? where test_table.`test_table` = ?",
+    })
+    public void batchedUpdateOneColumnWithTableName(String query) throws SQLException {
+        YdbQueryParser parser = new YdbQueryParser(types, query, props);
+        parser.parseSQL();
+
+        Assertions.assertEquals(1, parser.getStatements().size());
+        Assertions.assertEquals(QueryType.DATA_QUERY, parser.getStatements().get(0).getType());
+        Assertions.assertEquals(QueryCmd.UPDATE_REPLACE_DELETE, parser.getStatements().get(0).getCmd());
+
+        YqlBatcher batch = parser.getYqlBatcher();
+        Assertions.assertTrue(batch.isValidBatch());
+        Assertions.assertEquals(YqlBatcher.Cmd.UPDATE, batch.getCommand());
+
+        Assertions.assertEquals("test_table", batch.getTableName());
+        Assertions.assertEquals(1, batch.getKeyColumns().size());
+        Assertions.assertEquals(Arrays.asList("test_table"), batch.getKeyColumns());
+        Assertions.assertEquals(1, batch.getColumns().size());
+        Assertions.assertEquals(Arrays.asList("column"), batch.getColumns());
+    }
+
     @ParameterizedTest(name = "[{index}] {0} is batched delete query")
     @ValueSource(strings = {
-        "Delete from table_name where k1 = ? AND k2 = ?",
+        "Delete from table_name where k1 = ? AND `table_name`.k2 = ?",
         "\n  delete fRom `table_name`\tWhere\nk1=? AND k2=?;;;",
         "/* comment */ deLete from `table_name` WHERE k1=? AND k2=?;;\n-- com",
-        ";;DELETE/* comment */FRom table_name WHERE k1\n=\t?--comment\nAND k2=?",
+        ";;DELETE/* comment */FRom table_name WHERE k1\n=\t?--comment\nAND table_name.`k2`=?",
     })
     public void batchedDeleteTest(String query) throws SQLException {
         YdbQueryParser parser = new YdbQueryParser(types, query, props);
@@ -674,6 +700,9 @@ public void batchedDeleteOneColumnTest(String query) throws SQLException {
         "upsert into table_name set c1 = ?, c2 = ?, c3 = ?",
         "upsert table_name (c1, c2, c3) values (?, ?, ?)",
         "upsert table_name set c1 = ?, c2 = ?, c3 = ?",
+        "update table_name set c1 = ?, c2 = ?, c3 = ? where other.id=?",
+        "update table_name set c1 = ?, c2 = ?, c3 = ? where table_name.name.id=?",
+        "update table_name set c1 = ?, c2 = ?, c3 = ? where Table_name.id=?",
         "upsert into table_name (c1, , c3) values (?, ?)",
         "upsert into table_name (c1, c2) values (?,,?)",
         "upsert into table_name (c1, c2, c3) values (?, ?, ?,)",