Skip to content

Commit f687f77

Browse files
manticore-projectsmanticore-projects
committed
feat: parsing Piped SQL
Signed-off-by: Andreas Reichel <andreas@manticore-projects.com>
1 parent 7364ff3 commit f687f77

File tree

10 files changed

+179
-27
lines changed

10 files changed

+179
-27
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Maven deploy snapshot](https://github.com/JSQLParser/JSqlParser/actions/workflows/maven_deploy.yml/badge.svg)](https://github.com/JSQLParser/JSqlParser/actions/workflows/maven_deploy.yml)
44
[![Gradle CI](https://github.com/JSQLParser/JSqlParser/actions/workflows/gradle.yml/badge.svg)](https://github.com/JSQLParser/JSqlParser/actions/workflows/gradle.yml)
5-
[![Coverage Status](https://coveralls.io/repos/JSQLParser/JSqlParser/badge.svg?branch=master)](https://coveralls.io/r/JSQLParser/JSqlParser?branch=master)
5+
[![Coverage Status](https://coveralls.io/repos/JSQLParser/JSqlParser/badge.svg?branch=master)](https://coveralls.io/r/JSQLParser/JSqlParser?branch=master)
66
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/6f9a2d7eb98f45969749e101322634a1)](https://www.codacy.com/gh/JSQLParser/JSqlParser/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=JSQLParser/JSqlParser&amp;utm_campaign=Badge_Grade)
77
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.jsqlparser/jsqlparser/badge.svg)](http://maven-badges.herokuapp.com/maven-central/com.github.jsqlparser/jsqlparser) [![Javadocs](https://www.javadoc.io/badge/com.github.jsqlparser/jsqlparser.svg)](https://www.javadoc.io/doc/com.github.jsqlparser/jsqlparser)
88
[![Gitter](https://badges.gitter.im/JSQLParser/JSqlParser.svg)](https://gitter.im/JSQLParser/JSqlParser?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)

‎src/main/java/module-info.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
module net.sf.jsqlparser {
1111
requires java.sql;
1212
requires java.logging;
13+
requires java.desktop;
1314

1415
exports net.sf.jsqlparser;
1516
exports net.sf.jsqlparser.expression;

‎src/main/java/net/sf/jsqlparser/statement/piped/PipeOperatorVisitor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public interface PipeOperatorVisitor<T> {
3131

3232
<S> T visit(TableSamplePipeOperator tableSample, S context);
3333

34-
<S> T visit(UnionPipeOperator union, S context);
34+
<S> T visit(SetOperationPipeOperator union, S context);
3535

3636
<S> T visit(UnPivotPipeOperator unPivot, S context);
3737

‎src/main/java/net/sf/jsqlparser/statement/piped/SetOperationPipeOperator.java‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
package net.sf.jsqlparser.statement.piped;
2+
3+
import net.sf.jsqlparser.statement.select.ParenthesedSelect;
4+
import net.sf.jsqlparser.statement.select.SetOperationList;
5+
6+
import java.util.ArrayList;
7+
8+
public class SetOperationPipeOperator extends PipeOperator {
9+
private ArrayList<ParenthesedSelect> selects;
10+
private SetOperationList.SetOperationType setOperationType;
11+
private String modifier;
12+
13+
public SetOperationPipeOperator(ParenthesedSelect select,
14+
SetOperationList.SetOperationType setOperationType, String modifier) {
15+
this.selects = new ArrayList<>();
16+
this.selects.add(select);
17+
18+
this.setOperationType = setOperationType;
19+
this.modifier = modifier;
20+
}
21+
22+
public SetOperationPipeOperator add(ParenthesedSelect select) {
23+
this.selects.add(select);
24+
return this;
25+
}
26+
27+
public ArrayList<ParenthesedSelect> getSelects() {
28+
return selects;
29+
}
30+
31+
public SetOperationPipeOperator setSelects(ArrayList<ParenthesedSelect> selects) {
32+
this.selects = selects;
33+
return this;
34+
}
35+
36+
public SetOperationList.SetOperationType getSetOperationType() {
37+
return setOperationType;
38+
}
39+
40+
public SetOperationPipeOperator setSetOperationType(
41+
SetOperationList.SetOperationType setOperationType) {
42+
this.setOperationType = setOperationType;
43+
return this;
44+
}
45+
46+
public String getModifier() {
47+
return modifier;
48+
}
49+
50+
public SetOperationPipeOperator setModifier(String modifier) {
51+
this.modifier = modifier;
52+
return this;
53+
}
54+
55+
@Override
56+
public StringBuilder appendTo(StringBuilder builder) {
57+
builder.append("|> ").append(setOperationType);
58+
if (modifier != null) {
59+
builder.append(" ").append(modifier);
60+
}
61+
62+
int i = 0;
63+
for (ParenthesedSelect select : selects) {
64+
if (i++ > 0) {
65+
builder.append(", ");
66+
}
67+
builder.append(select);
68+
}
69+
builder.append("\n");
70+
return builder;
71+
}
72+
73+
@Override
74+
public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
75+
return visitor.visit(this, context);
76+
}
77+
}

‎src/main/java/net/sf/jsqlparser/statement/piped/UnionPipeOperator.java‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -434,11 +434,11 @@ public <S> StringBuilder visit(IsBooleanExpression isBooleanExpression, S contex
434434
public <S> StringBuilder visit(IsUnknownExpression isUnknownExpression, S context) {
435435
isUnknownExpression.getLeftExpression().accept(this, context);
436436
if (isUnknownExpression.isNot()) {
437-
buffer.append(" IS NOT UNKNOWN");
437+
builder.append(" IS NOT UNKNOWN");
438438
} else {
439-
buffer.append(" IS UNKNOWN");
439+
builder.append(" IS UNKNOWN");
440440
}
441-
return buffer;
441+
return builder;
442442
}
443443

444444
@Override

‎src/main/java/net/sf/jsqlparser/util/deparser/InsertDeParser.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public void deParse(Insert insert) {
9191
}
9292

9393
if (insert.isOverriding()) {
94-
buffer.append("OVERRIDING SYSTEM VALUE ");
94+
builder.append("OVERRIDING SYSTEM VALUE ");
9595
}
9696

9797
if (insert.getPartitions() != null) {

‎src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import net.sf.jsqlparser.statement.piped.SetPipeOperator;
3838
import net.sf.jsqlparser.statement.piped.TableSamplePipeOperator;
3939
import net.sf.jsqlparser.statement.piped.UnPivotPipeOperator;
40-
import net.sf.jsqlparser.statement.piped.UnionPipeOperator;
40+
import net.sf.jsqlparser.statement.piped.SetOperationPipeOperator;
4141
import net.sf.jsqlparser.statement.piped.WherePipeOperator;
4242
import net.sf.jsqlparser.statement.piped.WindowPipeOperator;
4343
import net.sf.jsqlparser.statement.select.Distinct;
@@ -948,6 +948,7 @@ public <S> StringBuilder visit(OrderByPipeOperator orderBy, S context) {
948948
return builder;
949949
}
950950

951+
951952
@Override
952953
public <S> StringBuilder visit(PivotPipeOperator pivot, S context) {
953954
return builder;
@@ -986,7 +987,20 @@ public <S> StringBuilder visit(TableSamplePipeOperator tableSample, S context) {
986987
}
987988

988989
@Override
989-
public <S> StringBuilder visit(UnionPipeOperator union, S context) {
990+
public <S> StringBuilder visit(SetOperationPipeOperator setOperationPipeOperator, S context) {
991+
builder.append("|> ").append(setOperationPipeOperator.getSetOperationType());
992+
if (setOperationPipeOperator.getModifier() != null) {
993+
builder.append(" ").append(setOperationPipeOperator.getModifier());
994+
}
995+
996+
int i = 0;
997+
for (ParenthesedSelect select : setOperationPipeOperator.getSelects()) {
998+
if (i++ > 0) {
999+
builder.append(", ");
1000+
}
1001+
builder.append(select);
1002+
}
1003+
builder.append("\n");
9901004
return builder;
9911005
}
9921006

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

Lines changed: 40 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ import net.sf.jsqlparser.statement.merge.*;
6969
import net.sf.jsqlparser.statement.grant.*;
7070
import java.util.*;
7171
import java.util.AbstractMap.SimpleEntry;
72+
import net.sf.jsqlparser.statement.select.SetOperationList.SetOperationType;
7273

7374
import java.util.logging.Level;
7475
import java.util.logging.Logger;
@@ -2090,7 +2091,7 @@ String RelObjectNameWithoutValue() :
20902091
{ Token tk = null; }
20912092
{
20922093
( tk=<DATA_TYPE> | tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER> | tk=<K_DATE_LITERAL> | tk=<K_DATETIMELITERAL> | tk=<K_STRING_FUNCTION_NAME> | tk=<K_ISOLATION> | tk=<K_TIME_KEY_EXPR> | tk=<K_TEXT_LITERAL>
2093-
| tk="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | tk="ALGORITHM" | tk="ALTER" | tk="ANALYZE" | tk="APPLY" | tk="APPROXIMATE" | tk="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="AT" | tk="AUTHORIZATION" | tk="AUTO" | tk="AUTO_INCREMENT" | tk="BASE64" | tk="BEGIN" | tk="BERNOULLI" | tk="BINARY" | tk="BIT" | tk="BLOCK" | tk="BROWSE" | tk="BUFFERS" | tk="BY" | tk="BYTE" | tk="BYTES" | tk="CACHE" | tk="CALL" | tk="CASCADE" | tk="CASE" | tk="CAST" | tk="CHANGE" | tk="CHANGES" | tk="CHAR" | tk="CHARACTER" | tk="CHECKPOINT" | tk="CLOSE" | tk="COLLATE" | tk="COLUMN" | tk="COLUMNS" | tk="COMMENT" | tk="COMMIT" | tk="CONCURRENTLY" | tk="CONFLICT" | tk="CONSTRAINTS" | tk="CONVERT" | tk="COSTS" | tk="COUNT" | tk="CS" | tk="CYCLE" | tk="DATA" | tk="DATABASE" | tk="DATETIME" | tk="DBA_RECYCLEBIN" | tk="DDL" | tk="DECLARE" | tk="DEFERRABLE" | tk="DELAYED" | tk="DELETE" | tk="DESC" | tk="DESCRIBE" | tk="DISABLE" | tk="DISCONNECT" | tk="DIV" | tk="DML" | tk="DO" | tk="DOMAIN" | tk="DROP" | tk="DUMP" | tk="DUPLICATE" | tk="ELEMENTS" | tk="EMIT" | tk="ENABLE" | tk="ENCRYPTION" | tk="END" | tk="ENGINE" | tk="ERROR" | tk="ESCAPE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXPLICIT" | tk="EXTENDED" | tk="EXTRACT" | tk="FILTER" | tk="FIRST" | tk="FLUSH" | tk="FN" | tk="FOLLOWING" | tk="FORMAT" | tk="FULLTEXT" | tk="FUNCTION" | tk="GRANT" | tk="GROUP_CONCAT" | tk="GUARD" | tk="HASH" | tk="HIGH" | tk="HIGH_PRIORITY" | tk="HISTORY" | tk="HOPPING" | tk="INCLUDE" | tk="INCLUDE_NULL_VALUES" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INTERLEAVE" | tk="INTERPRET" | tk="INVALIDATE" | tk="INVERSE" | tk="ISNULL" | tk="JSON" | tk="JSON_ARRAY" | tk="JSON_ARRAYAGG" | tk="JSON_OBJECT" | tk="JSON_OBJECTAGG" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="LAST" | tk="LEADING" | tk="LESS" | tk="LINK" | tk="LOCAL" | tk="LOCK" | tk="LOCKED" | tk="LOG" | tk="LONGTEXT" | tk="LOOP" | tk="LOW" | tk="LOW_PRIORITY" | tk="MATCH" | tk="MATCHED" | tk="MATCH_ALL" | tk="MATCH_ANY" | tk="MATCH_PHRASE" | tk="MATCH_PHRASE_PREFIX" | tk="MATCH_REGEXP" | tk="MATERIALIZED" | tk="MAX" | tk="MAXVALUE" | tk="MEDIUMTEXT" | tk="MEMBER" | tk="MERGE" | tk="MIN" | tk="MINVALUE" | tk="MODIFY" | tk="MOVEMENT" | tk="NEXT" | tk="NO" | tk="NOCACHE" | tk="NOKEEP" | tk="NOLOCK" | tk="NOMAXVALUE" | tk="NOMINVALUE" | tk="NOORDER" | tk="NOTHING" | tk="NOTNULL" | tk="NOVALIDATE" | tk="NOWAIT" | tk="NULLS" | tk="OF" | tk="OFF" | tk="OPEN" | tk="OVER" | tk="OVERFLOW" | tk="OVERLAPS" | tk="OVERRIDING" | tk="OVERWRITE" | tk="PARALLEL" | tk="PARENT" | tk="PARTITION" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PLAN" | tk="PLUS" | tk="PRECEDING" | tk="PRIMARY" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="RAW" | tk="READ" | tk="RECURSIVE" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REFRESH" | tk="REGEXP" | tk="REGEXP_LIKE" | tk="REGISTER" | tk="REMOTE" | tk="RENAME" | tk="REPEATABLE" | tk="REPLACE" | tk="RESET" | tk="RESPECT" | tk="RESTART" | tk="RESTRICT" | tk="RESTRICTED" | tk="RESUMABLE" | tk="RESUME" | tk="RETURN" | tk="RLIKE" | tk="ROLLBACK" | tk="ROLLUP" | tk="ROOT" | tk="ROW" | tk="ROWS" | tk="RR" | tk="RS" | tk="SAFE_CAST" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SECURE" | tk="SEED" | tk="SEPARATOR" | tk="SEQUENCE" | tk="SESSION" | tk="SETS" | tk="SHARE" | tk="SHOW" | tk="SHUTDOWN" | tk="SIBLINGS" | tk="SIGNED" | tk="SIMILAR" | tk="SIZE" | tk="SKIP" | tk="STORED" | tk="STRING" | tk="STRUCT" | tk="SUMMARIZE" | tk="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="TEXT" | tk="THAN" | tk="THEN" | tk="TIMEOUT" | tk="TIMESTAMPTZ" | tk="TIMEZONE" | tk="TINYTEXT" | tk="TO" | tk="TRIGGER" | tk="TRUNCATE" | tk="TRY_CAST" | tk="TUMBLING" | tk="TYPE" | tk="UNLOGGED" | tk="UNQIESCE" | tk="UNSIGNED" | tk="UPDATE" | tk="UPSERT" | tk="UR" | tk="USER" | tk="VALIDATE" | tk="VERBOSE" | tk="VIEW" | tk="VOLATILE" | tk="WAIT" | tk="WITHIN" | tk="WITHOUT" | tk="WITHOUT_ARRAY_WRAPPER" | tk="WORK" | tk="XML" | tk="XMLAGG" | tk="XMLDATA" | tk="XMLSCHEMA" | tk="XMLTEXT" | tk="XSINIL" | tk="YAML" | tk="YES" | tk="ZONE" )
2094+
| tk="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | tk="AGGREGATE" | tk="ALGORITHM" | tk="ALTER" | tk="ANALYZE" | tk="APPLY" | tk="APPROXIMATE" | tk="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="AT" | tk="AUTHORIZATION" | tk="AUTO" | tk="AUTO_INCREMENT" | tk="BASE64" | tk="BEGIN" | tk="BERNOULLI" | tk="BINARY" | tk="BIT" | tk="BLOCK" | tk="BROWSE" | tk="BUFFERS" | tk="BY" | tk="BYTE" | tk="BYTES" | tk="CACHE" | tk="CALL" | tk="CASCADE" | tk="CASE" | tk="CAST" | tk="CHANGE" | tk="CHANGES" | tk="CHAR" | tk="CHARACTER" | tk="CHECKPOINT" | tk="CLOSE" | tk="COLLATE" | tk="COLUMN" | tk="COLUMNS" | tk="COMMENT" | tk="COMMIT" | tk="CONCURRENTLY" | tk="CONFLICT" | tk="CONSTRAINTS" | tk="CONVERT" | tk="COSTS" | tk="COUNT" | tk="CS" | tk="CYCLE" | tk="DATA" | tk="DATABASE" | tk="DATETIME" | tk="DBA_RECYCLEBIN" | tk="DDL" | tk="DECLARE" | tk="DEFERRABLE" | tk="DELAYED" | tk="DELETE" | tk="DESC" | tk="DESCRIBE" | tk="DISABLE" | tk="DISCONNECT" | tk="DIV" | tk="DML" | tk="DO" | tk="DOMAIN" | tk="DROP" | tk="DUMP" | tk="DUPLICATE" | tk="ELEMENTS" | tk="EMIT" | tk="ENABLE" | tk="ENCRYPTION" | tk="END" | tk="ENGINE" | tk="ERROR" | tk="ESCAPE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXPLICIT" | tk="EXTENDED" | tk="EXTRACT" | tk="FILTER" | tk="FIRST" | tk="FLUSH" | tk="FN" | tk="FOLLOWING" | tk="FORMAT" | tk="FULLTEXT" | tk="FUNCTION" | tk="GRANT" | tk="GROUP_CONCAT" | tk="GUARD" | tk="HASH" | tk="HIGH" | tk="HIGH_PRIORITY" | tk="HISTORY" | tk="HOPPING" | tk="INCLUDE" | tk="INCLUDE_NULL_VALUES" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INTERLEAVE" | tk="INTERPRET" | tk="INVALIDATE" | tk="INVERSE" | tk="ISNULL" | tk="JSON" | tk="JSON_ARRAY" | tk="JSON_ARRAYAGG" | tk="JSON_OBJECT" | tk="JSON_OBJECTAGG" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="LAST" | tk="LEADING" | tk="LESS" | tk="LINK" | tk="LOCAL" | tk="LOCK" | tk="LOCKED" | tk="LOG" | tk="LONGTEXT" | tk="LOOP" | tk="LOW" | tk="LOW_PRIORITY" | tk="MATCH" | tk="MATCHED" | tk="MATCH_ALL" | tk="MATCH_ANY" | tk="MATCH_PHRASE" | tk="MATCH_PHRASE_PREFIX" | tk="MATCH_REGEXP" | tk="MATERIALIZED" | tk="MAX" | tk="MAXVALUE" | tk="MEDIUMTEXT" | tk="MEMBER" | tk="MERGE" | tk="MIN" | tk="MINVALUE" | tk="MODIFY" | tk="MOVEMENT" | tk="NEXT" | tk="NO" | tk="NOCACHE" | tk="NOKEEP" | tk="NOLOCK" | tk="NOMAXVALUE" | tk="NOMINVALUE" | tk="NOORDER" | tk="NOTHING" | tk="NOTNULL" | tk="NOVALIDATE" | tk="NOWAIT" | tk="NULLS" | tk="OF" | tk="OFF" | tk="OPEN" | tk="OVER" | tk="OVERFLOW" | tk="OVERLAPS" | tk="OVERRIDING" | tk="OVERWRITE" | tk="PARALLEL" | tk="PARENT" | tk="PARTITION" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PLAN" | tk="PLUS" | tk="PRECEDING" | tk="PRIMARY" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="RAW" | tk="READ" | tk="RECURSIVE" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REFRESH" | tk="REGEXP" | tk="REGEXP_LIKE" | tk="REGISTER" | tk="REMOTE" | tk="RENAME" | tk="REPEATABLE" | tk="REPLACE" | tk="RESET" | tk="RESPECT" | tk="RESTART" | tk="RESTRICT" | tk="RESTRICTED" | tk="RESUMABLE" | tk="RESUME" | tk="RETURN" | tk="RLIKE" | tk="ROLLBACK" | tk="ROLLUP" | tk="ROOT" | tk="ROW" | tk="ROWS" | tk="RR" | tk="RS" | tk="SAFE_CAST" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SECURE" | tk="SEED" | tk="SEPARATOR" | tk="SEQUENCE" | tk="SESSION" | tk="SETS" | tk="SHARE" | tk="SHOW" | tk="SHUTDOWN" | tk="SIBLINGS" | tk="SIGNED" | tk="SIMILAR" | tk="SIZE" | tk="SKIP" | tk="STORED" | tk="STRING" | tk="STRUCT" | tk="SUMMARIZE" | tk="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="TEXT" | tk="THAN" | tk="THEN" | tk="TIMEOUT" | tk="TIMESTAMPTZ" | tk="TIMEZONE" | tk="TINYTEXT" | tk="TO" | tk="TRIGGER" | tk="TRUNCATE" | tk="TRY_CAST" | tk="TUMBLING" | tk="TYPE" | tk="UNLOGGED" | tk="UNQIESCE" | tk="UNSIGNED" | tk="UPDATE" | tk="UPSERT" | tk="UR" | tk="USER" | tk="VALIDATE" | tk="VERBOSE" | tk="VIEW" | tk="VOLATILE" | tk="WAIT" | tk="WITHIN" | tk="WITHOUT" | tk="WITHOUT_ARRAY_WRAPPER" | tk="WORK" | tk="XML" | tk="XMLAGG" | tk="XMLDATA" | tk="XMLSCHEMA" | tk="XMLTEXT" | tk="XSINIL" | tk="YAML" | tk="YES" | tk="ZONE" )
20942095
{ return tk.image; }
20952096
}
20962097

@@ -2355,15 +2356,12 @@ PipeOperator PipeOperator() #PipeOperator:
23552356
}
23562357
{
23572358
(
2359+
// SELECT covers also EXTEND, WINDOW and RENAME
23582360
operator = SelectPipeOperator()
2359-
// |
2360-
// operator = ExtendPipeOperator()
23612361
|
23622362
operator = SetPipeOperator()
23632363
|
23642364
operator = DropPipeOperator()
2365-
// |
2366-
// operator = RenamePipeOperator()
23672365
|
23682366
LOOKAHEAD(2) operator = AsPipeOperator()
23692367
|
@@ -2374,12 +2372,9 @@ PipeOperator PipeOperator() #PipeOperator:
23742372
LOOKAHEAD(2) operator = AggregatePipeOperator()
23752373
|
23762374
operator = OrderByPipeOperator()
2377-
// |
2378-
// operator = UnionPipeOperator();
2379-
// |
2380-
// operator = IntersectPipeOperator();
2381-
// |
2382-
// operator = ExceptPipeOperator();
2375+
|
2376+
// covers UNION, INTERSET, EXCEPT
2377+
operator = SetOperationPipeOperator()
23832378
|
23842379
operator = JoinPipeOperator()
23852380
)
@@ -2533,6 +2528,40 @@ LimitPipeOperator LimitPipeOperator():
25332528
}
25342529
}
25352530

2531+
SetOperationPipeOperator SetOperationPipeOperator():
2532+
{
2533+
SetOperationPipeOperator setOperationPipeOperator = null;
2534+
SetOperationType setOperationType;
2535+
Token modifierToken;
2536+
ParenthesedSelect select;
2537+
}
2538+
{
2539+
(
2540+
(
2541+
<K_UNION> ( modifierToken=<K_ALL> | modifierToken=<K_DISTINCT> ) { setOperationType = SetOperationType.UNION; }
2542+
select = ParenthesedSelect() { setOperationPipeOperator = new SetOperationPipeOperator(select, setOperationType, modifierToken.image); }
2543+
)
2544+
|
2545+
(
2546+
<K_INTERSECT> modifierToken=<K_DISTINCT> { setOperationType = SetOperationType.INTERSECT; }
2547+
select = ParenthesedSelect() { setOperationPipeOperator = new SetOperationPipeOperator(select, setOperationType, modifierToken.image); }
2548+
)
2549+
|
2550+
(
2551+
<K_EXCEPT> modifierToken=<K_DISTINCT> { setOperationType = SetOperationType.EXCEPT; }
2552+
select = ParenthesedSelect() { setOperationPipeOperator = new SetOperationPipeOperator(select, setOperationType, modifierToken.image); }
2553+
)
2554+
)
2555+
2556+
(
2557+
LOOKAHEAD(2) "," select = ParenthesedSelect() { setOperationPipeOperator.add(select); }
2558+
)*
2559+
2560+
{
2561+
return setOperationPipeOperator;
2562+
}
2563+
}
2564+
25362565
TableStatement TableStatement():
25372566
{
25382567
Table table = null;

‎src/test/java/net/sf/jsqlparser/statement/piped/SetOperationPipeOperatorTest.java‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package net.sf.jsqlparser.statement.piped;
2+
3+
import net.sf.jsqlparser.JSQLParserException;
4+
import net.sf.jsqlparser.test.TestUtils;
5+
import org.junit.jupiter.api.Test;
6+
7+
8+
class SetOperationPipeOperatorTest {
9+
10+
@Test
11+
void parseAndDeparseUnion() throws JSQLParserException {
12+
String sqlStr =
13+
"SELECT 3\n" +
14+
"|> UNION ALL\n" +
15+
" (SELECT 1),\n" +
16+
" (SELECT 2);";
17+
TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
18+
}
19+
20+
// @todo: parse SELECT * FROM UNNEST(ARRAY<INT64>[2, 3, 3, 5]) AS number
21+
22+
@Test
23+
void parseAndDeparseIntersect() throws JSQLParserException {
24+
String sqlStr =
25+
"SELECT * FROM UNNEST(ARRAY[1, 2, 3, 3, 4]) AS number\n" +
26+
"|> INTERSECT DISTINCT\n" +
27+
" (SELECT * FROM UNNEST(ARRAY[2, 3, 3, 5]) AS number);";
28+
TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
29+
}
30+
31+
@Test
32+
void parseAndDeparseExcept() throws JSQLParserException {
33+
String sqlStr =
34+
"SELECT * FROM UNNEST(ARRAY[1, 2, 3, 3, 4]) AS number\n" +
35+
"|> EXCEPT DISTINCT\n" +
36+
" (SELECT * FROM UNNEST(ARRAY[1, 2]) AS number);";
37+
TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
38+
}
39+
}

0 commit comments

Comments
 (0)