Skip to content

Commit f3e8952

Browse files
build: Sphinx build fixes
1 parent c53667f commit f3e8952

7 files changed

Lines changed: 615 additions & 548 deletions

File tree

.github/workflows/sphinx.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup Gradle
1919
uses: gradle/gradle-build-action@v2
2020
- name: Run build with Gradle Wrapper
21-
run: gradle sphinx
21+
run: gradle --no-build-cache clean xmldoc sphinx
2222
- name: Deploy
2323
uses: actions/configure-pages@v2
2424
- name: Upload artifact

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
# Exclude the Auto-generated Changelog
99
/src/site/sphinx/changelog.rst
10+
/src/site/sphinx/javadoc.rst
11+
/src/site/sphinx/syntax.rst
1012

1113
# Generated by javacc-maven-plugin
1214
/bin

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ task sphinx(type: Exec) {
422422
, "sphinx-prompt"
423423
, "sphinx_substitution_extensions"
424424
, "sphinx_issues"
425-
, "sphinx_tabs"
425+
, "sphinx_tabs.tabs"
426426
, "sphinx_inline_tabs"
427427
, "pygments"
428428
]

src/site/sphinx/changelog.rst

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,57 @@ Latest Changes since |JSQLPARSER_VERSION|
88
=============================================================
99

1010

11+
* **test: add unit test for issue #1778**
12+
13+
Andreas Reichel, 2023-05-11
14+
* **style: appease PMD/Codacy**
15+
16+
Andreas Reichel, 2023-05-11
17+
* **style: appease PMD/Codacy**
18+
19+
Andreas Reichel, 2023-05-11
20+
* **feat: `MEMBER OF` condition as shown at https://dev.mysql.com/doc/refman/8.0/en/json-search-functions.html#operator_member-of**
21+
22+
Andreas Reichel, 2023-05-11
23+
* **feat: access Elements of Array Columns**
24+
25+
Andreas Reichel, 2023-05-11
26+
* **feat: JdbcNamedParameter allows "&" (instead of ":")**
27+
28+
Andreas Reichel, 2023-05-11
29+
* **fix: Java Version 8**
30+
31+
Andreas Reichel, 2023-05-09
32+
* **refactor: generify `SelectItem` and remove `FunctionItem` and `ExpressionListItem`**
33+
34+
Andreas Reichel, 2023-05-09
35+
* **style: replace all List<Expression> with ExpressionList<> and enforce policy via Acceptance Test**
36+
37+
Andreas Reichel, 2023-05-09
38+
* **fix: find the correct position when field belongs to an internal class**
39+
40+
Andreas Reichel, 2023-05-09
41+
* **style: Appease PMD**
42+
43+
Andreas Reichel, 2023-05-07
44+
* **style: Appease Checkstyle**
45+
46+
Andreas Reichel, 2023-05-07
47+
* **test: Disable API Sanitation for the moment**
48+
49+
Andreas Reichel, 2023-05-07
50+
* **refactor: `Insert` uses `ExpressionList` and `UpdateSet`**
51+
52+
Andreas Reichel, 2023-05-07
53+
* **build: improve Gradle Build**
54+
55+
Andreas Reichel, 2023-05-07
56+
* **refactor: remove SimpleFunction**
57+
58+
Andreas Reichel, 2023-05-06
59+
* **doc: RR chart colors cater for Dark Mode**
60+
61+
Andreas Reichel, 2023-05-06
1162
* **doc: Better Sphinx Tabs**
1263

1364
Andreas Reichel, 2023-05-06

src/site/sphinx/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
needs_sphinx = '1.0'
55
add_function_parentheses = True
66

7-
extensions = ['myst_parser', 'sphinx.ext.autodoc', 'sphinx.ext.autosectionlabel', 'sphinx.ext.extlinks', 'sphinx-prompt', 'sphinx_substitution_extensions', 'sphinx_issues', 'sphinx_inline_tabs', 'pygments.sphinxext', ]
7+
extensions = ['myst_parser', 'sphinx.ext.autodoc', 'sphinx.ext.autosectionlabel', 'sphinx.ext.extlinks', 'sphinx-prompt', 'sphinx_substitution_extensions', 'sphinx_issues', 'sphinx_tabs.tabs', 'sphinx_inline_tabs', 'pygments.sphinxext', ]
88

99
issues_github_path = "JSQLParser/JSqlParser"
1010

src/site/sphinx/syntax.rst

Lines changed: 547 additions & 545 deletions
Large diffs are not rendered by default.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package net.sf.jsqlparser.statement;
2+
3+
import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
4+
import net.sf.jsqlparser.schema.Column;
5+
6+
/**
7+
* @see https://docs.oracle.com/en/database/oracle/oracle-database/21/lnpls/RETURNING-INTO-clause.html#GUID-38F735B9-1100-45AF-AE71-18FB74A899BE
8+
*/
9+
public class ReturningClause {
10+
private String returnKeyword = "RETURNING";
11+
ExpressionList<Column> columns;
12+
}

0 commit comments

Comments
 (0)