Skip to content

Commit

Permalink
Merge origin/master
Browse files Browse the repository at this point in the history
  • Loading branch information
wumpz committed Jan 1, 2025
2 parents 5d1efce + 23cd338 commit 086ce2b
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
java-version: '11'
distribution: 'temurin'
- name: Build with Gradle
uses: gradle/gradle-build-action@v2.6.0
uses: gradle/gradle-build-action@v3.5.0
with:
arguments: check
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gradle_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
java-version: '11'
distribution: 'temurin'
- name: Build with Gradle
uses: gradle/gradle-build-action@v2.6.0
uses: gradle/gradle-build-action@v3.5.0
with:
arguments: publish
# arguments: build check publish
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sphinx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
ref: master
fetch-depth: 0
- name: Setup Gradle
uses: gradle/gradle-build-action@v2.4.2
uses: gradle/gradle-build-action@v3.5.0
- name: Run build with Gradle Wrapper
run: FLOATING_TOC=false gradle --no-build-cache clean xmldoc sphinx
run: FLOATING_TOC=false ./gradlew --no-build-cache clean xmldoc sphinx
- name: Deploy
uses: actions/configure-pages@v2
- name: Upload artifact
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx4G -Xss1m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError
org.gradle.jvmargs=-Xmx4G -Xss2m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError

org.gradle.caching=true

Expand Down
22 changes: 13 additions & 9 deletions src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
Original file line number Diff line number Diff line change
Expand Up @@ -2117,18 +2117,22 @@ Table Table() #TableName :
//String serverName = null, databaseName = null, schemaName = null, tableName = null;
ObjectNames data = null;
Token fileNameToken = null;
Table table;
}
{
data = RelObjectNames()
{
Table table = new Table(data.getNames());
linkAST(table,jjtThis);
return table;
}
|
fileNameToken = <S_CHAR_LITERAL>
(
data = RelObjectNames()
{
table = new Table(data.getNames());
}
|
fileNameToken = <S_CHAR_LITERAL>
{
table = new Table(fileNameToken.image);
}
)

{
Table table = new Table(fileNameToken.image);
linkAST(table,jjtThis);
return table;
}
Expand Down

0 comments on commit 086ce2b

Please sign in to comment.