Skip to content

Commit af426e0

Browse files
fudianchnfudianchn
committed
fix: parse comma-separated tuple assignments in SET lists
Signed-off-by: 付典 <fudianchn@gmail.com>
1 parent bb55bb9 commit af426e0

2 files changed

Lines changed: 190 additions & 2 deletions

File tree

‎src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5890,8 +5890,7 @@ List<UpdateSet> UpdateSets():
58905890
)
58915891

58925892
(
5893-
LOOKAHEAD(2) (
5894-
","
5893+
LOOKAHEAD(2) "," (
58955894
tableColumn=Column() "=" valueExpression=Expression()
58965895
{ updateSets.add( new UpdateSet (tableColumn, valueExpression)); }
58975896
|

‎src/test/java/net/sf/jsqlparser/statement/update/UpdateSetParsingTest.java‎

Lines changed: 189 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,189 @@
1+
/*-
2+
* #%L
3+
* JSQLParser library
4+
* %%
5+
* Copyright (C) 2004 - 2026 JSQLParser
6+
* %%
7+
* Dual licensed under GNU LGPL 2.1 or Apache License 2.0
8+
* #L%
9+
*/
10+
package net.sf.jsqlparser.statement.update;
11+
12+
import static net.sf.jsqlparser.test.TestUtils.assertSqlCanBeParsedAndDeparsed;
13+
import static org.junit.jupiter.api.Assertions.assertEquals;
14+
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
15+
import static org.junit.jupiter.api.Assertions.assertThrows;
16+
17+
import java.util.Arrays;
18+
import java.util.List;
19+
import java.util.stream.Stream;
20+
import net.sf.jsqlparser.JSQLParserException;
21+
import net.sf.jsqlparser.expression.operators.relational.ParenthesedExpressionList;
22+
import net.sf.jsqlparser.parser.CCJSqlParserUtil;
23+
import net.sf.jsqlparser.statement.Statement;
24+
import net.sf.jsqlparser.statement.insert.Insert;
25+
import net.sf.jsqlparser.statement.merge.Merge;
26+
import net.sf.jsqlparser.statement.merge.MergeUpdate;
27+
import net.sf.jsqlparser.statement.piped.FromQuery;
28+
import net.sf.jsqlparser.statement.piped.SetPipeOperator;
29+
import net.sf.jsqlparser.statement.select.ParenthesedSelect;
30+
import net.sf.jsqlparser.statement.select.PlainSelect;
31+
import net.sf.jsqlparser.statement.upsert.Upsert;
32+
import net.sf.jsqlparser.util.deparser.StatementDeParser;
33+
import org.junit.jupiter.api.Test;
34+
import org.junit.jupiter.params.ParameterizedTest;
35+
import org.junit.jupiter.params.provider.Arguments;
36+
import org.junit.jupiter.params.provider.EnumSource;
37+
import org.junit.jupiter.params.provider.MethodSource;
38+
import org.junit.jupiter.params.provider.ValueSource;
39+
40+
class UpdateSetParsingTest {
41+
42+
// These are consumers of the shared grammar, not claims of dialect-specific SQL validity.
43+
enum EntryPoint {
44+
UPDATE("UPDATE t SET "), INSERT_SET("INSERT INTO t SET "), INSERT_DUPLICATE(
45+
"INSERT INTO t VALUES (0) ON DUPLICATE KEY UPDATE "), INSERT_CONFLICT(
46+
"INSERT INTO t VALUES (0) ON CONFLICT (id) DO UPDATE SET "), MERGE_UPDATE(
47+
"MERGE INTO t USING s ON t.id = s.id WHEN MATCHED THEN UPDATE SET "), UPSERT_SET(
48+
"UPSERT INTO t SET "), PIPE_SET(
49+
"FROM t |> SET "), SELECT_SETTINGS(
50+
"SELECT * FROM t SETTINGS ");
51+
52+
private final String prefix;
53+
54+
EntryPoint(String prefix) {
55+
this.prefix = prefix;
56+
}
57+
58+
List<UpdateSet> getUpdateSets(Statement statement) {
59+
switch (this) {
60+
case UPDATE:
61+
return ((Update) statement).getUpdateSets();
62+
case INSERT_SET:
63+
return ((Insert) statement).getSetUpdateSets();
64+
case INSERT_DUPLICATE:
65+
return ((Insert) statement).getDuplicateAction().getUpdateSets();
66+
case INSERT_CONFLICT:
67+
return ((Insert) statement).getConflictAction().getUpdateSets();
68+
case MERGE_UPDATE:
69+
return ((MergeUpdate) ((Merge) statement).getOperations().get(0))
70+
.getUpdateSets();
71+
case UPSERT_SET:
72+
return ((Upsert) statement).getUpdateSets();
73+
case PIPE_SET:
74+
return ((SetPipeOperator) ((FromQuery) statement).getPipeOperators().get(0))
75+
.getUpdateSets();
76+
case SELECT_SETTINGS:
77+
return ((PlainSelect) statement).getSettings();
78+
default:
79+
throw new AssertionError(this);
80+
}
81+
}
82+
}
83+
84+
@ParameterizedTest
85+
@EnumSource(EntryPoint.class)
86+
void scalarAssignments(EntryPoint entryPoint) throws JSQLParserException {
87+
assertAssignments(entryPoint, "a = 1, b = 2, c = 3",
88+
new String[][] {{"a"}, {"b"}, {"c"}},
89+
new String[][] {{"1"}, {"2"}, {"3"}});
90+
}
91+
92+
@ParameterizedTest
93+
@EnumSource(EntryPoint.class)
94+
void singleTupleAssignment(EntryPoint entryPoint) throws JSQLParserException {
95+
assertAssignments(entryPoint, "(b, c) = (2, 3)",
96+
new String[][] {{"b", "c"}}, new String[][] {{"2", "3"}});
97+
}
98+
99+
@ParameterizedTest
100+
@EnumSource(EntryPoint.class)
101+
void tupleAssignmentFirst(EntryPoint entryPoint) throws JSQLParserException {
102+
assertAssignments(entryPoint, "(b, c) = (2, 3), a = 1",
103+
new String[][] {{"b", "c"}, {"a"}}, new String[][] {{"2", "3"}, {"1"}});
104+
}
105+
106+
static Stream<Arguments> assignmentsAfterScalar() {
107+
return Arrays.stream(EntryPoint.values()).flatMap(entryPoint -> Stream.of(
108+
Arguments.of(entryPoint, "a = 1, (b, c) = (2, 3)",
109+
new String[][] {{"a"}, {"b", "c"}},
110+
new String[][] {{"1"}, {"2", "3"}}),
111+
Arguments.of(entryPoint, "a = 1, (b, c) = (2, 3), d = 4",
112+
new String[][] {{"a"}, {"b", "c"}, {"d"}},
113+
new String[][] {{"1"}, {"2", "3"}, {"4"}}),
114+
Arguments.of(entryPoint, "a = 1, (b, c) = (2, 3), (d, e) = (4, 5)",
115+
new String[][] {{"a"}, {"b", "c"}, {"d", "e"}},
116+
new String[][] {{"1"}, {"2", "3"}, {"4", "5"}}),
117+
Arguments.of(entryPoint, "a = 1, (b, c) = (COALESCE(b, 2), c + 3), d = ?",
118+
new String[][] {{"a"}, {"b", "c"}, {"d"}},
119+
new String[][] {{"1"}, {"COALESCE(b, 2)", "c + 3"}, {"?"}}),
120+
Arguments.of(entryPoint, "a = 1, (b, c) = (SELECT x, y FROM s), d = 4",
121+
new String[][] {{"a"}, {"b", "c"}, {"d"}},
122+
new String[][] {{"1"}, {"(SELECT x, y FROM s)"}, {"4"}})));
123+
}
124+
125+
@ParameterizedTest
126+
@MethodSource("assignmentsAfterScalar")
127+
void tupleAssignmentsAfterScalar(EntryPoint entryPoint, String assignments,
128+
String[][] columns, String[][] values) throws JSQLParserException {
129+
assertAssignments(entryPoint, assignments, columns, values);
130+
}
131+
132+
@Test
133+
void tupleSubqueryAndFollowingClauses() throws JSQLParserException {
134+
String sql = "UPDATE t SET a = DEFAULT, (b, c) = (SELECT x, y FROM s WHERE s.id = t.id), "
135+
+ "d = 4 WHERE t.id = 1 RETURNING a, b, c, d";
136+
Statement statement = assertSqlCanBeParsedAndDeparsed(sql);
137+
assertUpdateSets(EntryPoint.UPDATE.getUpdateSets(statement),
138+
new String[][] {{"a"}, {"b", "c"}, {"d"}},
139+
new String[][] {{"DEFAULT"}, {"(SELECT x, y FROM s WHERE s.id = t.id)"}, {"4"}});
140+
Update update = (Update) statement;
141+
assertEquals("t.id = 1", update.getWhere().toString());
142+
assertEquals(" RETURNING a, b, c, d", update.getReturningClause().toString());
143+
}
144+
145+
@ParameterizedTest
146+
@ValueSource(strings = {"a = 1 (b, c) = (2, 3)", "(b, c) = (2, 3) (d, e) = (4, 5)",
147+
"a = 1,", "a = 1,, (b, c) = (2, 3)"})
148+
void rejectsMissingOrExtraSeparators(String assignments) {
149+
assertThrows(JSQLParserException.class,
150+
() -> CCJSqlParserUtil.parse(EntryPoint.UPDATE.prefix + assignments));
151+
}
152+
153+
private static void assertAssignments(EntryPoint entryPoint, String assignments,
154+
String[][] columns, String[][] values) throws JSQLParserException {
155+
Statement statement =
156+
assertSqlCanBeParsedAndDeparsed(entryPoint.prefix + assignments, true);
157+
assertUpdateSets(entryPoint.getUpdateSets(statement), columns, values);
158+
assertUpdateSets(entryPoint.getUpdateSets(CCJSqlParserUtil.parse(statement.toString())),
159+
columns, values);
160+
StringBuilder builder = new StringBuilder();
161+
statement.accept(new StatementDeParser(builder));
162+
assertUpdateSets(entryPoint.getUpdateSets(CCJSqlParserUtil.parse(builder.toString())),
163+
columns, values);
164+
}
165+
166+
private static void assertUpdateSets(List<UpdateSet> updateSets, String[][] columns,
167+
String[][] values) {
168+
assertEquals(columns.length, updateSets.size());
169+
for (int i = 0; i < columns.length; i++) {
170+
UpdateSet updateSet = updateSets.get(i);
171+
assertEquals(columns[i].length, updateSet.getColumns().size());
172+
assertEquals(values[i].length, updateSet.getValues().size());
173+
for (int j = 0; j < columns[i].length; j++) {
174+
assertEquals(columns[i][j], updateSet.getColumn(j).getColumnName());
175+
}
176+
for (int j = 0; j < values[i].length; j++) {
177+
assertEquals(values[i][j], updateSet.getValue(j).toString());
178+
}
179+
if (columns[i].length > 1) {
180+
assertInstanceOf(ParenthesedExpressionList.class, updateSet.getColumns());
181+
if (values[i][0].startsWith("(SELECT")) {
182+
assertInstanceOf(ParenthesedSelect.class, updateSet.getValue(0));
183+
} else {
184+
assertInstanceOf(ParenthesedExpressionList.class, updateSet.getValues());
185+
}
186+
}
187+
}
188+
}
189+
}

0 commit comments

Comments
 (0)