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
Prev Previous commit
Next Next commit
feat: add support for and predicate in merge update
  • Loading branch information
@davidjgoss
davidjgoss committed Nov 8, 2023
commit 10457b67c378b5db7701533ebd6f2b72c65c840b
27 changes: 26 additions & 1 deletion src/main/java/net/sf/jsqlparser/statement/merge/MergeUpdate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,13 @@
public class MergeUpdate implements Serializable {

private List<UpdateSet> updateSets;
private Expression andPredicate;
private Expression whereCondition;
private Expression deleteWhereCondition;

public MergeUpdate() {
}

public MergeUpdate(List<UpdateSet> updateSets) {
this.updateSets = updateSets;
}
Expand All @@ -34,6 +38,14 @@ public MergeUpdate setUpdateSets(List<UpdateSet> updateSets) {
return this;
}

public Expression getAndPredicate() {
return andPredicate;
}

public void setAndPredicate(Expression andPredicate) {
this.andPredicate = andPredicate;
}

public Expression getWhereCondition() {
return whereCondition;
}
Expand All @@ -53,7 +65,11 @@ public void setDeleteWhereCondition(Expression deleteWhereCondition) {
@Override
public String toString() {
StringBuilder b = new StringBuilder();
b.append(" WHEN MATCHED THEN UPDATE SET ");
b.append(" WHEN MATCHED");
if (andPredicate != null) {
b.append(" AND ").append(andPredicate.toString());
}
b.append(" THEN UPDATE SET ");
UpdateSet.appendUpdateSetsTo(b, updateSets);

if (whereCondition != null) {
Expand All @@ -65,6 +81,11 @@ public String toString() {
return b.toString();
}

public MergeUpdate withAndPredicate(Expression andPredicate) {
this.setAndPredicate(andPredicate);
return this;
}

public MergeUpdate withWhereCondition(Expression whereCondition) {
this.setWhereCondition(whereCondition);
return this;
Expand All @@ -75,6 +96,10 @@ public MergeUpdate withDeleteWhereCondition(Expression deleteWhereCondition) {
return this;
}

public <E extends Expression> E getAndPredicate(Class<E> type) {
return type.cast(getAndPredicate());
}

public <E extends Expression> E getWhereCondition(Class<E> type) {
return type.cast(getWhereCondition());
}
Expand Down
7 changes: 6 additions & 1 deletion 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 @@ -226,7 +226,12 @@ public void visit(Merge merge) {
}

if (mergeUpdate != null) {
buffer.append(" WHEN MATCHED THEN UPDATE SET ");
buffer.append(" WHEN MATCHED");
if (mergeUpdate.getAndPredicate() != null) {
buffer.append(" AND ");
mergeUpdate.getAndPredicate().accept(expressionDeParser);
}
buffer.append(" THEN UPDATE SET ");
deparseUpdateSets(mergeUpdate.getUpdateSets(), buffer, expressionDeParser);

if (mergeUpdate.getWhereCondition() != null) {
Expand Down
9 changes: 6 additions & 3 deletions 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 @@ -1675,14 +1675,17 @@ Statement Merge( List<WithItem> with ) : {
}

MergeUpdate MergeUpdateClause() : {
MergeUpdate mu;
MergeUpdate mu = new MergeUpdate();
List<UpdateSet> updateSets;
Expression predicate;
Expression condition;
}
{
<K_WHEN> <K_MATCHED> <K_THEN> <K_UPDATE>
<K_WHEN> <K_MATCHED>
[ <K_AND> predicate = Expression() { mu.setAndPredicate(predicate); } ]
<K_THEN> <K_UPDATE>
<K_SET>
updateSets = UpdateSets() { mu = new MergeUpdate(updateSets); }
updateSets = UpdateSets() { mu.setUpdateSets(updateSets); }

[ <K_WHERE> condition = Expression() { mu.setWhereCondition(condition); }]
[ <K_DELETE> <K_WHERE> condition = Expression() { mu.setDeleteWhereCondition(condition); } ]
Expand Down
11 changes: 10 additions & 1 deletion 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 @@ -238,11 +238,20 @@ public void testOutputClause() throws JSQLParserException {
}

@Test
public void testSnowflakeMergeStatement() throws JSQLParserException {
public void testSnowflakeMergeStatementSimple() 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);
}

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

assertSqlCanBeParsedAndDeparsed(sql, true);
}
}