Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1172,7 +1172,7 @@ tableArgExpr
// Databases

databaseIdentifier
: identifier
: identifier (DOT identifier)*
;

// Basics
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -265,18 +265,51 @@ public void enterAssignmentValuesList(ClickHouseParser.AssignmentValuesListConte
}


private String extractTableName(ClickHouseParser.TableIdentifierContext tableId) {
if (tableId == null) {
return null;
}

StringBuilder tableName = new StringBuilder();

// Handle database identifier if present
if (tableId.databaseIdentifier() != null) {
ClickHouseParser.DatabaseIdentifierContext dbCtx = tableId.databaseIdentifier();
// Database identifier can have multiple parts: identifier (DOT identifier)*
List<ClickHouseParser.IdentifierContext> dbParts = dbCtx.identifier();
for (int i = 0; i < dbParts.size(); i++) {
if (i > 0) {
tableName.append('.');
}
tableName.append(SQLUtils.unquoteIdentifier(dbParts.get(i).getText()));
}

// Only append dot if table identifier exists
if (tableId.identifier() != null) {
tableName.append('.');
}
}

// Handle table identifier
if (tableId.identifier() != null) {
tableName.append(SQLUtils.unquoteIdentifier(tableId.identifier().getText()));
}

return tableName.toString();
}

@Override
public void enterTableExprIdentifier(ClickHouseParser.TableExprIdentifierContext ctx) {
if (ctx.tableIdentifier() != null) {
parsedStatement.setTable(SQLUtils.unquoteIdentifier(ctx.tableIdentifier().getText()));
parsedStatement.setTable(extractTableName(ctx.tableIdentifier()));
}
}

@Override
public void enterInsertStmt(ClickHouseParser.InsertStmtContext ctx) {
ClickHouseParser.TableIdentifierContext tableId = ctx.tableIdentifier();
if (tableId != null) {
parsedStatement.setTable(SQLUtils.unquoteIdentifier(tableId.getText()));
parsedStatement.setTable(extractTableName(tableId));
}

ClickHouseParser.ColumnsClauseContext columns = ctx.columnsClause();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,31 @@ public void testStmtWithUUID() {
Assert.assertFalse(stmt.isHasErrors());
}

@Test
public void testMultiDotNotation() {
// Test with three parts: a.b.c where a.b is database and c is table
String sql1 = "SELECT * FROM a.b.c WHERE id = ?";
ParsedPreparedStatement stmt1 = parser.parsePreparedStatement(sql1);
Assert.assertEquals(stmt1.getArgCount(), 1);
Assert.assertFalse(stmt1.isHasErrors());
Assert.assertEquals(stmt1.getTable(), "a.b.c");

// Test with quoted identifiers
String sql2 = "SELECT * FROM `db.part1`.`table` WHERE id = ?";
ParsedPreparedStatement stmt2 = parser.parsePreparedStatement(sql2);
Assert.assertEquals(stmt2.getArgCount(), 1);
Assert.assertFalse(stmt2.isHasErrors());
Assert.assertEquals(stmt2.getTable(), "db.part1.table");

// Test INSERT with multi-dot notation
String sql3 = "INSERT INTO a.b.c (col1, col2) VALUES (?, ?)";
ParsedPreparedStatement stmt3 = parser.parsePreparedStatement(sql3);
Assert.assertEquals(stmt3.getArgCount(), 2);
Assert.assertFalse(stmt3.isHasErrors());
Assert.assertTrue(stmt3.isInsert());
Assert.assertEquals(stmt3.getTable(), "a.b.c");
}

@Test(dataProvider = "testCreateStmtDP")
public void testCreateStatement(String sql) {
ParsedPreparedStatement stmt = parser.parsePreparedStatement(sql);
Expand Down
Loading