Skip to content

feat: add support for snowflake merge statements #1887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
manticore-projects merged 3 commits into from
Nov 10, 2023
Merged

feat: add support for snowflake merge statements #1887

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ae84af
feat: support snowflake merge statements
davidjgoss Nov 7, 2023
10457b6
feat: add support for and predicate in merge update
davidjgoss Nov 8, 2023
93b3930
feat: add support for and predicate in merge insert
davidjgoss Nov 8, 2023
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
Next Next commit
feat: support snowflake merge statements 
Adds support for the ON clause of a MERGE statement to be without
enclosing parens, as is the convention in Snowflake.
  • Loading branch information
@davidjgoss
davidjgoss committed Nov 8, 2023
commit 0ae84affd0f2b4c6ae0a0be195eaabd971ffd319
3 changes: 1 addition & 2 deletions src/main/java/net/sf/jsqlparser/statement/merge/Merge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,8 @@ public String toString() {
b.append(table);
b.append(" USING ");
b.append(fromItem);
b.append(" ON (");
b.append(" ON ");
b.append(onCondition);
b.append(")");

if (insertFirst && mergeInsert != null) {
b.append(mergeInsert);
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/net/sf/jsqlparser/util/deparser/StatementDeParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,9 +216,8 @@ public void visit(Merge merge) {
buffer.append(" USING ");
merge.getFromItem().accept(selectDeParser);

buffer.append(" ON (");
buffer.append(" ON ");
merge.getOnCondition().accept(expressionDeParser);
buffer.append(")");

MergeInsert mergeInsert = merge.getMergeInsert();
MergeUpdate mergeUpdate = merge.getMergeUpdate();
Expand Down
2 changes: 1 addition & 1 deletion src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1659,7 +1659,7 @@ Statement Merge( List<WithItem> with ) : {
{
<K_MERGE> { merge.setOracleHint(getOracleHint()); } <K_INTO> table=TableWithAlias() { merge.setTable(table); }
<K_USING> fromItem = FromItem() { merge.setFromItem(fromItem); }
<K_ON> "(" condition = Expression() { merge.setOnCondition(condition); } ")"
<K_ON> condition = Expression() { merge.setOnCondition(condition); }

[
( LOOKAHEAD(2) update = MergeUpdateClause() { merge.setMergeUpdate(update); }
Expand Down
9 changes: 9 additions & 0 deletions src/test/java/net/sf/jsqlparser/statement/merge/MergeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,4 +236,13 @@ public void testOutputClause() throws JSQLParserException {
+ " TAB_MergeActions_RoomLocation";
assertSqlCanBeParsedAndDeparsed(sqlStr, true);
}

@Test
public void testSnowflakeMergeStatement() throws JSQLParserException {
String sql = "MERGE INTO target\n" +
" USING src ON target.k = src.k\n" +
" WHEN MATCHED THEN UPDATE SET target.v = src.v";

assertSqlCanBeParsedAndDeparsed(sql, true);
}
}