Skip to content

Commit 31ef1aa

Browse files
Assorted Fixes #7 (#1745)
* Fixes #1684: Support CREATE MATERIALIZED VIEW with AUTO REFRESH Support parsing create view statements in Redshift with AUTO REFRESH option. * Reduce cyclomatic complexity in CreateView.toString Extract adding the force option into a dedicated method resulting in the cyclomatic complexity reduction of the CreateView.toString method. * Enhanced Keywords Add Keywords and document, which keywords are allowed for what purpose * Fix incorrect tests * Define Reserved Keywords explicitly Derive All Keywords from Grammar directly Generate production for Object Names (semi-) automatically Add parametrized Keyword Tests * Fix test resources * Adjust Gradle to JUnit 5 Parallel Test execution Gradle Caching Explicitly request for latest JavaCC 7.0.10 * Do not mark SpeedTest for concurrent execution * Remove unused imports * Adjust Gradle to JUnit 5 Parallel Test execution Gradle Caching Explicitly request for latest JavaCC 7.0.10 * Do not mark SpeedTest for concurrent execution * Remove unused imports * Sphinx Documentation Update the MANTICORE Sphinx Theme, but ignore it in GIT Add the content to the Sphinx sites Add a Gradle function to derive Stable and Snapshot version from GIT Tags Add a Gradle GIT change task Add a Gradle sphinx task Add a special Test case for illustrating the use of JSQLParser * doc: request for `Conventional Commit` messages * feat: make important Classes Serializable Implement Serializable for persisting via ObjectOutputStream * chore: Make Serializable * doc: Better integration of the RR diagrams - apply neutral Sphinx theme - insert the RR diagrams into the sphinx sources - better documentation on Gradle dependencies - link GitHub repository * Merge * feat: Oracle Alternative Quoting - add support for Oracle Alternative Quoting e.g. `q'(...)'` - fixes #1718 - add a Logo and FavIcon to the Website - document recent changes on Quoting/Escaping - add an example on building SQL from Java - rework the README.md, promote the Website - add Spotless Formatter, using Google Java Style (with Tab=4 Spaces) * style: Appease PMD/Codacy * doc: fix the issue template - fix the issue template - fix the -SNAPSHOT version number * Update issue templates * Update issue templates * feat: Support more Statement Separators - `GO` - Slash `/` - Two empty lines * feat: FETCH uses EXPRESSION - `FETCH` uses `EXPRESSION` instead of SimpleJDBCParameter only - Visit/Accept `FETCH` `EXPRESSION` instead of `append` to String - Visit/Accept `OFFSET` `EXPRESSION` instead of `append` to String - Gradle: remove obsolete/incompatible `jvmArgs` from Test() * style: apply Spotless * test: commit missing test * fix: JSon Operator can use Simple Function Supports `Function() ->> Literal` (although `Function()` would not allow Nested Expression Parameters) fixes #1571 * style: Reformat changed files and headers * style: Remove unused variable * feat: Add support for Hangul "\uAC00"-"\uD7A3" fixes #1747 * style: expose `SetStatement` key-value list fixes #1746 * style: Appease PMD/Codacy * feat: `ConflictTarget` allows multiple `IndexColumnNames` fixes #1749 fixes #1633 fixes #955 * doc: fix reference in the Java Doc * build: better Upload Groovy Task --------- Co-authored-by: zaza <tzarna@gmail.com>
1 parent 476d969 commit 31ef1aa

File tree

17 files changed

+957
-659
lines changed

17 files changed

+957
-659
lines changed

build.gradle

Lines changed: 35 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ plugins {
1414

1515
// download the RR tools which have no Maven Repository
1616
id "de.undercouch.download" version "latest.release"
17+
id 'org.hidetake.ssh' version "latest.release"
1718

1819
id "se.bjurr.gitchangelog.git-changelog-gradle-plugin" version "latest.release"
1920
}
@@ -85,8 +86,8 @@ dependencies {
8586
testImplementation 'org.mockito:mockito-junit-jupiter:4.+'
8687

8788
// enforce latest version of JavaCC
88-
testImplementation 'net.java.dev.javacc:javacc:7.0.12'
89-
javacc 'net.java.dev.javacc:javacc:7.0.12'
89+
testImplementation 'net.java.dev.javacc:javacc:+'
90+
javacc 'net.java.dev.javacc:javacc:+'
9091
}
9192

9293
compileJavacc {
@@ -98,6 +99,11 @@ java {
9899
withJavadocJar()
99100
}
100101

102+
javadoc {
103+
options.addBooleanOption('html5', true)
104+
options.addBooleanOption("Xdoclint:none", true)
105+
}
106+
101107
test {
102108
environment = [ 'EXPORT_TEST_TO_FILE': 'True' ]
103109
useJUnitPlatform()
@@ -231,7 +237,7 @@ spotless {
231237

232238
format 'misc', {
233239
// define the files to apply `misc` to
234-
target '*.gradle', '*.md', '.gitignore'
240+
target '*.rst', '*.md', '.gitignore'
235241

236242
// define the steps to apply to those files
237243
trimTrailingWhitespace()
@@ -426,36 +432,33 @@ tasks.withType(JavaCompile) {
426432
options.encoding = 'UTF-8'
427433
}
428434

429-
task upload(type: Exec) {
430-
dependsOn(build, gitChangelogTask)
431-
432-
def versionStable = getVersion(false)
433-
434-
if( findProperty("${project.name}.host")==null ) {
435-
println(
436-
"""
437-
Property \"${project.name}.host\' not found.
438-
Please define \"${project.name}.host\" in the Gradle configuration (e. g. \$HOME/.gradle/gradle.properties.
439-
"""
440-
)
441-
} else {
442-
443-
// define the USERNAME and HOST properties in ~/.gradle/gradle.properties
444-
args = ["sftp://${findProperty("${project.name}.username")}@${findProperty("${project.name}.host")}/download"]
445-
446-
executable "sftp"
447-
448-
standardInput = new ByteArrayInputStream("""<<EOF
449-
mkdir ${project.name}-${versionStable}
450-
cd ${project.name}-${versionStable}
451-
put build/libs/*
452-
quit
453-
EOF"""
454-
.getBytes(Charset.defaultCharset()))
435+
remotes {
436+
webServer {
437+
host = findProperty("${project.name}.host")
438+
user = findProperty("${project.name}.username")
439+
identity = new File("${System.properties['user.home']}/.ssh/id_rsa")
440+
}
441+
}
455442

456-
standardOutput = new ByteArrayOutputStream()
457-
ext.output = {
458-
return standardOutput.toString()
443+
task upload {
444+
doFirst {
445+
if( findProperty("${project.name}.host")==null ) {
446+
println(
447+
"""
448+
Property \"${project.name}.host\' not found.
449+
Please define \"${project.name}.host\" in the Gradle configuration (e. g. \$HOME/.gradle/gradle.properties.
450+
"""
451+
)
452+
}
453+
}
454+
doLast {
455+
ssh.run {
456+
session(remotes.webServer) {
457+
def versionStable = getVersion(false)
458+
execute "mkdir -p download/${project.name}-${versionStable}"
459+
put from: "${project.buildDir}/libs", into: "download/${project.name}-${versionStable}"
460+
}
459461
}
460462
}
461463
}
464+

gradle/wrapper/gradle-wrapper.jar

2.02 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)