Skip to content

Commit 0b50da4

Browse files
feat: old TSQL Joins *= and =*
2 parents e3afa5f + 786c8fc commit 0b50da4

File tree

9 files changed

+132
-10
lines changed

9 files changed

+132
-10
lines changed

src/main/java/net/sf/jsqlparser/expression/ExpressionVisitor.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
import net.sf.jsqlparser.expression.operators.conditional.OrExpression;
2626
import net.sf.jsqlparser.expression.operators.conditional.XorExpression;
2727
import net.sf.jsqlparser.expression.operators.relational.Between;
28+
import net.sf.jsqlparser.expression.operators.relational.ContainedBy;
29+
import net.sf.jsqlparser.expression.operators.relational.Contains;
30+
import net.sf.jsqlparser.expression.operators.relational.DoubleAnd;
2831
import net.sf.jsqlparser.expression.operators.relational.EqualsTo;
2932
import net.sf.jsqlparser.expression.operators.relational.ExistsExpression;
3033
import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
@@ -43,11 +46,10 @@
4346
import net.sf.jsqlparser.expression.operators.relational.MinorThan;
4447
import net.sf.jsqlparser.expression.operators.relational.MinorThanEquals;
4548
import net.sf.jsqlparser.expression.operators.relational.NotEqualsTo;
46-
import net.sf.jsqlparser.expression.operators.relational.DoubleAnd;
47-
import net.sf.jsqlparser.expression.operators.relational.Contains;
48-
import net.sf.jsqlparser.expression.operators.relational.ContainedBy;
4949
import net.sf.jsqlparser.expression.operators.relational.RegExpMatchOperator;
5050
import net.sf.jsqlparser.expression.operators.relational.SimilarToExpression;
51+
import net.sf.jsqlparser.expression.operators.relational.TSQLLeftJoin;
52+
import net.sf.jsqlparser.expression.operators.relational.TSQLRightJoin;
5153
import net.sf.jsqlparser.schema.Column;
5254
import net.sf.jsqlparser.statement.select.AllColumns;
5355
import net.sf.jsqlparser.statement.select.AllTableColumns;
@@ -239,4 +241,9 @@ public interface ExpressionVisitor {
239241
void visit(TrimFunction trimFunction);
240242

241243
void visit(RangeExpression rangeExpression);
244+
245+
void visit(TSQLLeftJoin tsqlLeftJoin);
246+
247+
void visit(TSQLRightJoin tsqlRightJoin);
248+
242249
}

src/main/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapter.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import net.sf.jsqlparser.expression.operators.relational.NotEqualsTo;
4949
import net.sf.jsqlparser.expression.operators.relational.RegExpMatchOperator;
5050
import net.sf.jsqlparser.expression.operators.relational.SimilarToExpression;
51+
import net.sf.jsqlparser.expression.operators.relational.*;
5152
import net.sf.jsqlparser.schema.Column;
5253
import net.sf.jsqlparser.statement.select.AllColumns;
5354
import net.sf.jsqlparser.statement.select.AllTableColumns;
@@ -670,4 +671,15 @@ public void visit(RangeExpression rangeExpression) {
670671
rangeExpression.getStartExpression().accept(this);
671672
rangeExpression.getEndExpression().accept(this);
672673
}
674+
675+
@Override
676+
public void visit(TSQLLeftJoin tsqlLeftJoin) {
677+
visitBinaryExpression(tsqlLeftJoin);
678+
}
679+
680+
@Override
681+
public void visit(TSQLRightJoin tsqlRightJoin) {
682+
visitBinaryExpression(tsqlRightJoin);
683+
}
684+
673685
}
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/*
2+
* #%L JSQLParser library %% Copyright (C) 2004 - 2013 JSQLParser %% This program is free software:
3+
* you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License
4+
* as published by the Free Software Foundation, either version 2.1 of the License, or (at your
5+
* option) any later version.
6+
*
7+
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
8+
* even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
9+
* General Lesser Public License for more details.
10+
*
11+
* You should have received a copy of the GNU General Lesser Public License along with this program.
12+
* If not, see <http://www.gnu.org/licenses/lgpl-2.1.html>. #L%
13+
*/
14+
package net.sf.jsqlparser.expression.operators.relational;
15+
16+
import net.sf.jsqlparser.expression.ExpressionVisitor;
17+
18+
public class TSQLLeftJoin extends ComparisonOperator {
19+
20+
public TSQLLeftJoin() {
21+
super("*=");
22+
}
23+
24+
@Override
25+
public void accept(ExpressionVisitor expressionVisitor) {
26+
expressionVisitor.visit(this);
27+
}
28+
}
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/*
2+
* #%L JSQLParser library %% Copyright (C) 2004 - 2013 JSQLParser %% This program is free software:
3+
* you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License
4+
* as published by the Free Software Foundation, either version 2.1 of the License, or (at your
5+
* option) any later version.
6+
*
7+
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
8+
* even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
9+
* General Lesser Public License for more details.
10+
*
11+
* You should have received a copy of the GNU General Lesser Public License along with this program.
12+
* If not, see <http://www.gnu.org/licenses/lgpl-2.1.html>. #L%
13+
*/
14+
package net.sf.jsqlparser.expression.operators.relational;
15+
16+
import net.sf.jsqlparser.expression.ExpressionVisitor;
17+
18+
public class TSQLRightJoin extends ComparisonOperator {
19+
20+
public TSQLRightJoin() {
21+
super("=*");
22+
}
23+
24+
@Override
25+
public void accept(ExpressionVisitor expressionVisitor) {
26+
expressionVisitor.visit(this);
27+
}
28+
}

src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@
101101
import net.sf.jsqlparser.expression.operators.relational.NotEqualsTo;
102102
import net.sf.jsqlparser.expression.operators.relational.RegExpMatchOperator;
103103
import net.sf.jsqlparser.expression.operators.relational.SimilarToExpression;
104+
import net.sf.jsqlparser.expression.operators.relational.TSQLLeftJoin;
105+
import net.sf.jsqlparser.expression.operators.relational.TSQLRightJoin;
104106
import net.sf.jsqlparser.parser.CCJSqlParserUtil;
105107
import net.sf.jsqlparser.schema.Column;
106108
import net.sf.jsqlparser.schema.Table;
@@ -1133,6 +1135,16 @@ public void visit(ShowTablesStatement showTables) {
11331135
"Finding tables from ShowTablesStatement is not supported");
11341136
}
11351137

1138+
@Override
1139+
public void visit(TSQLLeftJoin tsqlLeftJoin) {
1140+
visitBinaryExpression(tsqlLeftJoin);
1141+
}
1142+
1143+
@Override
1144+
public void visit(TSQLRightJoin tsqlRightJoin) {
1145+
visitBinaryExpression(tsqlRightJoin);
1146+
}
1147+
11361148
@Override
11371149
public void visit(VariableAssignment var) {
11381150
var.getVariable().accept(this);

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@
103103
import net.sf.jsqlparser.expression.operators.relational.RegExpMatchOperator;
104104
import net.sf.jsqlparser.expression.operators.relational.SimilarToExpression;
105105
import net.sf.jsqlparser.expression.operators.relational.SupportsOldOracleJoinSyntax;
106+
import net.sf.jsqlparser.expression.operators.relational.TSQLLeftJoin;
107+
import net.sf.jsqlparser.expression.operators.relational.TSQLRightJoin;
106108
import net.sf.jsqlparser.schema.Column;
107109
import net.sf.jsqlparser.schema.Table;
108110
import net.sf.jsqlparser.statement.select.AllColumns;
@@ -1093,4 +1095,15 @@ public void visit(GeometryDistance geometryDistance) {
10931095
visitOldOracleJoinBinaryExpression(geometryDistance,
10941096
" " + geometryDistance.getStringExpression() + " ");
10951097
}
1098+
1099+
@Override
1100+
public void visit(TSQLLeftJoin tsqlLeftJoin) {
1101+
visitBinaryExpression(tsqlLeftJoin, " *= ");
1102+
}
1103+
1104+
@Override
1105+
public void visit(TSQLRightJoin tsqlRightJoin) {
1106+
visitBinaryExpression(tsqlRightJoin, " =* ");
1107+
}
1108+
10961109
}

src/main/java/net/sf/jsqlparser/util/validation/validator/ExpressionValidator.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@
104104
import net.sf.jsqlparser.expression.operators.relational.RegExpMatchOperator;
105105
import net.sf.jsqlparser.expression.operators.relational.SimilarToExpression;
106106
import net.sf.jsqlparser.expression.operators.relational.SupportsOldOracleJoinSyntax;
107+
import net.sf.jsqlparser.expression.operators.relational.TSQLLeftJoin;
108+
import net.sf.jsqlparser.expression.operators.relational.TSQLRightJoin;
107109
import net.sf.jsqlparser.parser.feature.Feature;
108110
import net.sf.jsqlparser.schema.Column;
109111
import net.sf.jsqlparser.statement.select.AllColumns;
@@ -694,4 +696,16 @@ public void visit(RangeExpression rangeExpression) {
694696
rangeExpression.getStartExpression().accept(this);
695697
rangeExpression.getEndExpression().accept(this);
696698
}
699+
700+
@Override
701+
public void visit(TSQLLeftJoin tsqlLeftJoin) {
702+
tsqlLeftJoin.getLeftExpression().accept(this);
703+
tsqlLeftJoin.getRightExpression().accept(this);
704+
}
705+
706+
@Override
707+
public void visit(TSQLRightJoin tsqlRightJoin) {
708+
tsqlRightJoin.getLeftExpression().accept(this);
709+
tsqlRightJoin.getRightExpression().accept(this);
710+
}
697711
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1752,7 +1752,7 @@ The following tokens are allowed as Names for Schema, Table, Column and Aliases
17521752
String RelObjectNameWithoutValue() :
17531753
{ Token tk = null; }
17541754
{
1755-
( 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>
1755+
( 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>
17561756
| tk="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | tk="ALGORITHM" | tk="ALTER" | tk="ANALYZE" | tk="APPLY" | tk="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="AT" | tk="AUTHORIZATION" | tk="AUTO" | 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="CONFLICT" | tk="CONVERT" | tk="COSTS" | tk="CS" | tk="CYCLE" | tk="DATABASE" | tk="DDL" | tk="DECLARE" | tk="DEFAULT" | 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="END" | tk="ESCAPE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXPLICIT" | tk="EXTENDED" | tk="EXTRACT" | tk="FALSE" | tk="FILTER" | tk="FIRST" | tk="FLUSH" | tk="FN" | tk="FOLLOWING" | tk="FORMAT" | tk="FULLTEXT" | tk="FUNCTION" | tk="GLOBAL" | tk="GRANT" | tk="GUARD" | tk="HISTORY" | tk="HOPPING" | tk="INCLUDE" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INTERLEAVE" | tk="INTERPRET" | tk="ISNULL" | tk="JSON" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="LAST" | tk="LEADING" | tk="LINK" | tk="LOCAL" | tk="LOCKED" | tk="LOG" | tk="MATCH" | tk="MATCHED" | tk="MATERIALIZED" | tk="MAXVALUE" | tk="MEMBER" | tk="MERGE" | 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="OVERLAPS" | tk="PARALLEL" | tk="PARENT" | tk="PARTITION" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PRECEDING" | tk="PRECISION" | tk="PRIMARY" | tk="PRIOR" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="RAW" | tk="READ" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REFRESH" | tk="REGISTER" | tk="RENAME" | tk="REPEATABLE" | tk="REPLACE" | tk="RESET" | tk="RESTART" | tk="RESTRICT" | tk="RESTRICTED" | tk="RESUMABLE" | tk="RESUME" | tk="RLIKE" | tk="ROLLBACK" | tk="ROOT" | tk="ROW" | tk="ROWS" | tk="RR" | tk="RS" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SEED" | tk="SEPARATOR" | tk="SEQUENCE" | tk="SESSION" | tk="SETS" | tk="SHOW" | tk="SHUTDOWN" | tk="SIBLINGS" | tk="SIGNED" | tk="SIMILAR" | tk="SIZE" | tk="SKIP" | tk="STORED" | tk="STRING" | tk="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="THEN" | tk="TIMEOUT" | tk="TIMESTAMPTZ" | tk="TO" | tk="TRIGGER" | tk="TRUE" | tk="TRUNCATE" | 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="WAIT" | tk="WITHIN" | tk="WITHOUT" | tk="WORK" | tk="XML" | tk="XMLAGG" | tk="XMLDATA" | tk="XMLSCHEMA" | tk="XMLTEXT" | tk="XSINIL" | tk="YAML" | tk="YES" | tk="ZONE" )
17571757
{ return tk.image; }
17581758
}
@@ -3406,6 +3406,8 @@ Expression RegularCondition() #RegularCondition:
34063406
| token=<OP_MINORTHANEQUALS> { result = new MinorThanEquals(token.image); }
34073407
| token=<OP_NOTEQUALSSTANDARD> { result = new NotEqualsTo(token.image); }
34083408
| token=<OP_NOTEQUALSBANG> { result = new NotEqualsTo(token.image); }
3409+
| "*=" { result = new TSQLLeftJoin(); }
3410+
| "=*" { result = new TSQLRightJoin(); }
34093411
| token=<OP_DOUBLEAND> { result = new DoubleAnd(); }
34103412
| token=<OP_CONTAINS> { result = new Contains(); }
34113413
| token=<OP_CONTAINEDBY> { result = new ContainedBy(); }

src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2252,6 +2252,18 @@ public void testIsNotFalse() throws JSQLParserException {
22522252
assertSqlCanBeParsedAndDeparsed(statement);
22532253
}
22542254

2255+
@Test
2256+
public void testTSQLJoin() throws JSQLParserException {
2257+
String stmt = "SELECT * FROM tabelle1, tabelle2 WHERE tabelle1.a *= tabelle2.b";
2258+
assertSqlCanBeParsedAndDeparsed(stmt);
2259+
}
2260+
2261+
@Test
2262+
public void testTSQLJoin2() throws JSQLParserException {
2263+
String stmt = "SELECT * FROM tabelle1, tabelle2 WHERE tabelle1.a =* tabelle2.b";
2264+
assertSqlCanBeParsedAndDeparsed(stmt);
2265+
}
2266+
22552267
@Test
22562268
public void testOracleJoin() throws JSQLParserException {
22572269
String stmt = "SELECT * FROM tabelle1, tabelle2 WHERE tabelle1.a = tabelle2.b(+)";
@@ -2418,12 +2430,6 @@ public void testExtractFrom4() throws JSQLParserException {
24182430
assertSqlCanBeParsedAndDeparsed(stmt);
24192431
}
24202432

2421-
// @Test
2422-
// public void testExtractFromIssue673() throws JSQLParserException {
2423-
// String stmt = "select EXTRACT(DAY FROM (SYSDATE - to_date('20180101', 'YYYYMMDD' ) ) DAY TO
2424-
// SECOND) from dual";
2425-
// assertSqlCanBeParsedAndDeparsed(stmt);
2426-
// }
24272433
@Test
24282434
public void testProblemFunction() throws JSQLParserException {
24292435
String stmt = "SELECT test() FROM testtable";

0 commit comments

Comments
 (0)