Skip to content

Commit 086ce2b

Browse files
committed
Merge origin/master
2 parents 5d1efce + 23cd338 commit 086ce2b

File tree

5 files changed

+18
-14
lines changed

5 files changed

+18
-14
lines changed

.github/workflows/gradle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
java-version: '11'
2828
distribution: 'temurin'
2929
- name: Build with Gradle
30-
uses: gradle/gradle-build-action@v2.6.0
30+
uses: gradle/gradle-build-action@v3.5.0
3131
with:
3232
arguments: check
3333
env:

.github/workflows/gradle_publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
java-version: '11'
2929
distribution: 'temurin'
3030
- name: Build with Gradle
31-
uses: gradle/gradle-build-action@v2.6.0
31+
uses: gradle/gradle-build-action@v3.5.0
3232
with:
3333
arguments: publish
3434
# arguments: build check publish

.github/workflows/sphinx.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
ref: master
2020
fetch-depth: 0
2121
- name: Setup Gradle
22-
uses: gradle/gradle-build-action@v2.4.2
22+
uses: gradle/gradle-build-action@v3.5.0
2323
- name: Run build with Gradle Wrapper
24-
run: FLOATING_TOC=false gradle --no-build-cache clean xmldoc sphinx
24+
run: FLOATING_TOC=false ./gradlew --no-build-cache clean xmldoc sphinx
2525
- name: Deploy
2626
uses: actions/configure-pages@v2
2727
- name: Upload artifact

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Specifies the JVM arguments used for the daemon process.
22
# The setting is particularly useful for tweaking memory settings.
3-
org.gradle.jvmargs=-Xmx4G -Xss1m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError
3+
org.gradle.jvmargs=-Xmx4G -Xss2m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError
44

55
org.gradle.caching=true
66

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2117,18 +2117,22 @@ Table Table() #TableName :
21172117
//String serverName = null, databaseName = null, schemaName = null, tableName = null;
21182118
ObjectNames data = null;
21192119
Token fileNameToken = null;
2120+
Table table;
21202121
}
21212122
{
2122-
data = RelObjectNames()
2123-
{
2124-
Table table = new Table(data.getNames());
2125-
linkAST(table,jjtThis);
2126-
return table;
2127-
}
2128-
|
2129-
fileNameToken = <S_CHAR_LITERAL>
2123+
(
2124+
data = RelObjectNames()
2125+
{
2126+
table = new Table(data.getNames());
2127+
}
2128+
|
2129+
fileNameToken = <S_CHAR_LITERAL>
2130+
{
2131+
table = new Table(fileNameToken.image);
2132+
}
2133+
)
2134+
21302135
{
2131-
Table table = new Table(fileNameToken.image);
21322136
linkAST(table,jjtThis);
21332137
return table;
21342138
}

0 commit comments

Comments
 (0)