JSQLParser 5.0

.github/workflows/sphinx.yml

@@ -9,7 +9,7 @@ jobs:
       - name: Install XSLT Processor
         run: sudo apt-get install xsltproc sphinx-common
       - name: Install dependencies
-        run: pip install sphinx_rtd_theme sphinx-book-theme myst_parser sphinx-prompt sphinx_substitution_extensions sphinx_issues sphinx_tabs pygments
+        run: pip install sphinx_rtd_theme sphinx-book-theme myst_parser sphinx-prompt sphinx_substitution_extensions sphinx_issues sphinx-tabs sphinx_inline_tabs pygments
       - name: Checkout project sources
         uses: actions/checkout@v2
         with:
@@ -18,7 +18,7 @@ jobs:
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
       - name: Run build with Gradle Wrapper
-        run: gradle sphinx
+        run: gradle --no-build-cache clean xmldoc sphinx
       - name: Deploy
         uses: actions/configure-pages@v2
       - name: Upload artifact

.gitignore

@@ -7,6 +7,8 @@
 
 # Exclude the Auto-generated Changelog
 /src/site/sphinx/changelog.rst
+/src/site/sphinx/javadoc_stable.rst
+/src/site/sphinx/syntax_stable.rst
 
 # Generated by javacc-maven-plugin
 /bin
@@ -27,3 +29,5 @@
 /nbproject/
 
 /.gradle
+/src/site/sphinx/javadoc_snapshot.rst
+/src/site/sphinx/syntax_snapshot.rst

README.md

@@ -19,29 +19,34 @@ SELECT 1 FROM dual WHERE a = b
 
 ```text
  SQL Text
-  └─Statements: net.sf.jsqlparser.statement.select.PlainSelect
-      ├─selectItems -> Collection<SelectExpressionItem>
-      │  └─selectItems: net.sf.jsqlparser.statement.select.SelectExpressionItem
-      │     └─LongValue: 1
-      ├─Table: dual
-      └─where: net.sf.jsqlparser.expression.operators.relational.EqualsTo
-         ├─Column: a
-         └─Column: b
+   └─Statements: net.sf.jsqlparser.statement.select.Select
+       ├─selectItems -> Collection<SelectItem>
+       │  └─LongValue: 1
+       ├─Table: dual
+       └─where: net.sf.jsqlparser.expression.operators.relational.EqualsTo
+          ├─Column: a
+          └─Column: b
 ```
 
 ```java
-Statement statement = CCJSqlParserUtil.parse(sqlStr);
-if (statement instanceof PlainSelect) {
-    PlainSelect plainSelect = (PlainSelect) statement;
+String sqlStr = "select 1 from dual where a=b";
 
-    SelectExpressionItem selectExpressionItem =
-            (SelectExpressionItem) plainSelect.getSelectItems().get(0);
+PlainSelect select = (PlainSelect) CCJSqlParserUtil.parse(sqlStr);
 
-    Table table = (Table) plainSelect.getFromItem();
+SelectItem selectItem =
+        select.getSelectItems().get(0);
+Assertions.assertEquals(
+        new LongValue(1)
+        , selectItem.getExpression());
 
-    EqualsTo equalsTo = (EqualsTo) plainSelect.getWhere();
-    Column a = (Column) equalsTo.getLeftExpression();
-    Column b = (Column) equalsTo.getRightExpression();
+Table table = (Table) select.getFromItem();
+Assertions.assertEquals("dual", table.getName());
+
+EqualsTo equalsTo = (EqualsTo) select.getWhere();
+Column a = (Column) equalsTo.getLeftExpression();
+Column b = (Column) equalsTo.getRightExpression();
+Assertions.assertEquals("a", a.getColumnName());
+Assertions.assertEquals("b", b.getColumnName());
 }
 ```