Skip to content

Commit 1d532c3

Browse files
committed
Merge master into introducing-template-modern
2 parents 9ea8e4c + 79a887a commit 1d532c3

File tree

70 files changed

+785
-251
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+785
-251
lines changed

README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ Also I would like to know about needed examples or documentation stuff.
4949

5050
## Extensions in the latest SNAPSHOT version 1.2
5151

52+
* introduced more AST node links
53+
* support for aliased table in **insert into** statement
54+
* **SQL_CALC_FOUND_ROWS** support
55+
* support for more complex expressions within **case expr when expr then expr end**.
56+
* support for **<<** and **>>** left and right shift operations
5257
* breaking **API** change: merge of *within group* and *over* (window expressions)
5358
* first support for *use* statements
5459
* first support for *call* statements
@@ -76,6 +81,10 @@ This will produce the jsqlparser-VERSION.jar file in the target/ directory.
7681

7782
**To build this project without using Maven, one has to build the parser by JavaCC using the CLI options it provids.**
7883

84+
## Debugging through problems
85+
86+
Refer to the [Visualize Parsing](https://github.com/JSQLParser/JSqlParser/wiki/Examples-of-SQL-parsing#visualize-parsing) section to learn how to run the parser in debug mode.
87+
7988
## Source Code conventions
8089

8190
Recently a checkstyle process was integrated into the build process. JSqlParser follows the sun java format convention. There are no TABs allowed. Use spaces.

nb-configuration.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
Any value defined here will override the pom.xml file value but is only applicable to the current project.
1515
-->
1616
<netbeans.compile.on.save>none</netbeans.compile.on.save>
17-
<com-junichi11-netbeans-changelf.enable>true</com-junichi11-netbeans-changelf.enable>
17+
<com-junichi11-netbeans-changelf.enable>false</com-junichi11-netbeans-changelf.enable>
1818
<com-junichi11-netbeans-changelf.use-project>true</com-junichi11-netbeans-changelf.use-project>
1919
<com-junichi11-netbeans-changelf.lf-kind>LF</com-junichi11-netbeans-changelf.lf-kind>
2020
<com-junichi11-netbeans-changelf.use-global>false</com-junichi11-netbeans-changelf.use-global>

pom.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,24 @@
4949
<version>2.7.22</version>
5050
<scope>test</scope>
5151
</dependency>
52+
<dependency>
53+
<groupId>org.seleniumhq.selenium</groupId>
54+
<artifactId>selenium-java</artifactId>
55+
<scope>test</scope>
56+
<version>2.44.0</version>
57+
</dependency>
58+
<dependency>
59+
<groupId>com.opera</groupId>
60+
<artifactId>operadriver</artifactId>
61+
<scope>test</scope>
62+
<version>1.5</version>
63+
<exclusions>
64+
<exclusion>
65+
<groupId>org.seleniumhq.selenium</groupId>
66+
<artifactId>selenium-remote-driver</artifactId>
67+
</exclusion>
68+
</exclusions>
69+
</dependency>
5270
</dependencies>
5371

5472
<developers>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@
2121
*/
2222
package net.sf.jsqlparser.expression;
2323

24+
import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
2425
import net.sf.jsqlparser.statement.select.SubSelect;
2526

26-
public class AllComparisonExpression implements Expression {
27+
public class AllComparisonExpression extends ASTNodeAccessImpl implements Expression {
2728

2829
private final SubSelect subSelect;
2930

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
*/
2222
package net.sf.jsqlparser.expression;
2323

24+
import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
2425
import net.sf.jsqlparser.statement.select.OrderByElement;
2526

2627
import java.util.List;
@@ -35,7 +36,7 @@
3536
*
3637
* @author tw
3738
*/
38-
public class AnalyticExpression implements Expression {
39+
public class AnalyticExpression extends ASTNodeAccessImpl implements Expression {
3940

4041
private ExpressionList partitionExpressionList;
4142
private List<OrderByElement> orderByElements;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,15 @@
2121
*/
2222
package net.sf.jsqlparser.expression;
2323

24+
import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
2425
import net.sf.jsqlparser.statement.select.SubSelect;
2526

2627
/**
2728
* Combines ANY and SOME expressions.
2829
*
2930
* @author toben
3031
*/
31-
public class AnyComparisonExpression implements Expression {
32+
public class AnyComparisonExpression extends ASTNodeAccessImpl implements Expression {
3233

3334
private final SubSelect subSelect;
3435
private final AnyType anyType;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@
2121
*/
2222
package net.sf.jsqlparser.expression;
2323

24+
import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
25+
2426
/**
2527
* A basic class for binary expressions, that is expressions having a left member and a right member
2628
* which are in turn expressions.
2729
*/
28-
public abstract class BinaryExpression implements Expression {
30+
public abstract class BinaryExpression extends ASTNodeAccessImpl implements Expression {
2931

3032
private Expression leftExpression;
3133
private Expression rightExpression;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
import java.util.List;
2525

26+
import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
2627
import net.sf.jsqlparser.statement.select.PlainSelect;
2728

2829
/**
@@ -56,7 +57,7 @@
5657
*
5758
* @author Havard Rast Blok
5859
*/
59-
public class CaseExpression implements Expression {
60+
public class CaseExpression extends ASTNodeAccessImpl implements Expression {
6061

6162
private Expression switchExpression;
6263
private List<WhenClause> whenClauses;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@
2121
*/
2222
package net.sf.jsqlparser.expression;
2323

24+
import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
2425
import net.sf.jsqlparser.statement.create.table.ColDataType;
2526

2627
/**
2728
*
2829
* @author tw
2930
*/
30-
public class CastExpression implements Expression {
31+
public class CastExpression extends ASTNodeAccessImpl implements Expression {
3132

3233
private Expression leftExpression;
3334
private ColDataType type;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,13 @@
3939
*/
4040
package net.sf.jsqlparser.expression;
4141

42+
import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
43+
4244
/**
4345
*
4446
* @author toben
4547
*/
46-
public class DateTimeLiteralExpression implements Expression {
48+
public class DateTimeLiteralExpression extends ASTNodeAccessImpl implements Expression {
4749

4850
private String value;
4951
private DateTime type;

0 commit comments

Comments
 (0)