diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 8d7cb06..943b66b 100755 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -26,7 +26,7 @@ jobs: - name: Assemble run: | - ./gradlew -i tanzawa-core:showTsubakuroManifest clean assemble + ./gradlew -i tgsql:core:showTsubakuroManifest clean assemble - name: Check run: | diff --git a/.gitignore b/.gitignore index 9546efd..f4a89ad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ # Gradle .gradle/ /build -/modules/*/build +/modules/**/build /buildSrc/build # Eclipse @@ -9,14 +9,14 @@ /.project /.classpath /.settings -/modules/*/bin -/modules/*/.project -/modules/*/.classpath -/modules/*/.settings +/modules/**/bin +/modules/**/.project +/modules/**/.classpath +/modules/**/.settings # IDEA /.idea -/modules/*/out +/modules/**/out # VSCode /.vscode diff --git a/README.md b/README.md index dcf3ac1..dd796e8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ -# Tanzawa: Tsurugi SQL console +# Tanzawa: Tsurugi command line tools written in Java -Tsurugi SQL console (Tanzawa) is a text based SQL client program. +## Available Tools + +- [tgsql](./modules/tgsql/cli) - Text based SQL client program. ## Requirements @@ -12,6 +14,20 @@ Tsurugi SQL console (Tanzawa) is a text based SQL client program. ./gradlew assemble ``` +### for Eclipse Buildship users + +If you work with [Eclipse Buildship](https://github.com/eclipse/buildship), the following [Gradle initialization script](https://docs.gradle.org/current/userguide/init_scripts.html) avoids the conflict of each project name on the Eclipse workspace. + +```gradle +allprojects { project -> + if (project != project.rootProject) { + project.tasks.matching { it.name == 'eclipseProject' }.each { task -> + task.projectModel.name = (project.rootProject.name + project.path).replace(':', '-') + } + } +} +``` + ## How to test ```sh diff --git a/modules/cli/README.md b/modules/tgsql/cli/README.md similarity index 100% rename from modules/cli/README.md rename to modules/tgsql/cli/README.md diff --git a/modules/cli/build.gradle b/modules/tgsql/cli/build.gradle similarity index 96% rename from modules/cli/build.gradle rename to modules/tgsql/cli/build.gradle index d89292e..76636c6 100644 --- a/modules/cli/build.gradle +++ b/modules/tgsql/cli/build.gradle @@ -6,7 +6,7 @@ plugins { dependencies { // dependent projects - implementation project(':tanzawa-core') + implementation project(':tgsql:core') runtimeOnly "com.tsurugidb.tsubakuro:tsubakuro-ipc:${tsubakuroVersion}" runtimeOnly "com.tsurugidb.tsubakuro:tsubakuro-stream:${tsubakuroVersion}" diff --git a/modules/cli/src/main/java/com/tsurugidb/console/cli/Main.java b/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/Main.java similarity index 100% rename from modules/cli/src/main/java/com/tsurugidb/console/cli/Main.java rename to modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/Main.java diff --git a/modules/cli/src/main/java/com/tsurugidb/console/cli/argument/CliArgument.java b/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/argument/CliArgument.java similarity index 100% rename from modules/cli/src/main/java/com/tsurugidb/console/cli/argument/CliArgument.java rename to modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/argument/CliArgument.java diff --git a/modules/cli/src/main/java/com/tsurugidb/console/cli/argument/CliMode.java b/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/argument/CliMode.java similarity index 100% rename from modules/cli/src/main/java/com/tsurugidb/console/cli/argument/CliMode.java rename to modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/argument/CliMode.java diff --git a/modules/cli/src/main/java/com/tsurugidb/console/cli/argument/package-info.java b/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/argument/package-info.java similarity index 100% rename from modules/cli/src/main/java/com/tsurugidb/console/cli/argument/package-info.java rename to modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/argument/package-info.java diff --git a/modules/cli/src/main/java/com/tsurugidb/console/cli/config/CliEnvironment.java b/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/config/CliEnvironment.java similarity index 100% rename from modules/cli/src/main/java/com/tsurugidb/console/cli/config/CliEnvironment.java rename to modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/config/CliEnvironment.java diff --git a/modules/cli/src/main/java/com/tsurugidb/console/cli/config/ConfigBuilder.java b/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/config/ConfigBuilder.java similarity index 100% rename from modules/cli/src/main/java/com/tsurugidb/console/cli/config/ConfigBuilder.java rename to modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/config/ConfigBuilder.java diff --git a/modules/cli/src/main/java/com/tsurugidb/console/cli/config/ConsoleConfigBuilder.java b/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/config/ConsoleConfigBuilder.java similarity index 100% rename from modules/cli/src/main/java/com/tsurugidb/console/cli/config/ConsoleConfigBuilder.java rename to modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/config/ConsoleConfigBuilder.java diff --git a/modules/cli/src/main/java/com/tsurugidb/console/cli/config/ExecConfigBuilder.java b/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/config/ExecConfigBuilder.java similarity index 100% rename from modules/cli/src/main/java/com/tsurugidb/console/cli/config/ExecConfigBuilder.java rename to modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/config/ExecConfigBuilder.java diff --git a/modules/cli/src/main/java/com/tsurugidb/console/cli/config/ExplainConfigBuilder.java b/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/config/ExplainConfigBuilder.java similarity index 100% rename from modules/cli/src/main/java/com/tsurugidb/console/cli/config/ExplainConfigBuilder.java rename to modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/config/ExplainConfigBuilder.java diff --git a/modules/cli/src/main/java/com/tsurugidb/console/cli/config/ScriptConfigBuilder.java b/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/config/ScriptConfigBuilder.java similarity index 100% rename from modules/cli/src/main/java/com/tsurugidb/console/cli/config/ScriptConfigBuilder.java rename to modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/config/ScriptConfigBuilder.java diff --git a/modules/cli/src/main/java/com/tsurugidb/console/cli/config/package-info.java b/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/config/package-info.java similarity index 100% rename from modules/cli/src/main/java/com/tsurugidb/console/cli/config/package-info.java rename to modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/config/package-info.java diff --git a/modules/cli/src/main/java/com/tsurugidb/console/cli/explain/ExplainConvertRunner.java b/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/explain/ExplainConvertRunner.java similarity index 100% rename from modules/cli/src/main/java/com/tsurugidb/console/cli/explain/ExplainConvertRunner.java rename to modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/explain/ExplainConvertRunner.java diff --git a/modules/cli/src/main/java/com/tsurugidb/console/cli/package-info.java b/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/package-info.java similarity index 100% rename from modules/cli/src/main/java/com/tsurugidb/console/cli/package-info.java rename to modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/package-info.java diff --git a/modules/cli/src/main/java/com/tsurugidb/console/cli/repl/ReplCvKey.java b/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/repl/ReplCvKey.java similarity index 100% rename from modules/cli/src/main/java/com/tsurugidb/console/cli/repl/ReplCvKey.java rename to modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/repl/ReplCvKey.java diff --git a/modules/cli/src/main/java/com/tsurugidb/console/cli/repl/ReplDefaultCredentialSessionConnector.java b/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/repl/ReplDefaultCredentialSessionConnector.java similarity index 100% rename from modules/cli/src/main/java/com/tsurugidb/console/cli/repl/ReplDefaultCredentialSessionConnector.java rename to modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/repl/ReplDefaultCredentialSessionConnector.java diff --git a/modules/cli/src/main/java/com/tsurugidb/console/cli/repl/ReplEngine.java b/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/repl/ReplEngine.java similarity index 100% rename from modules/cli/src/main/java/com/tsurugidb/console/cli/repl/ReplEngine.java rename to modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/repl/ReplEngine.java diff --git a/modules/cli/src/main/java/com/tsurugidb/console/cli/repl/ReplReporter.java b/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/repl/ReplReporter.java similarity index 100% rename from modules/cli/src/main/java/com/tsurugidb/console/cli/repl/ReplReporter.java rename to modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/repl/ReplReporter.java diff --git a/modules/cli/src/main/java/com/tsurugidb/console/cli/repl/ReplResultProcessor.java b/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/repl/ReplResultProcessor.java similarity index 100% rename from modules/cli/src/main/java/com/tsurugidb/console/cli/repl/ReplResultProcessor.java rename to modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/repl/ReplResultProcessor.java diff --git a/modules/cli/src/main/java/com/tsurugidb/console/cli/repl/ReplScript.java b/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/repl/ReplScript.java similarity index 100% rename from modules/cli/src/main/java/com/tsurugidb/console/cli/repl/ReplScript.java rename to modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/repl/ReplScript.java diff --git a/modules/cli/src/main/java/com/tsurugidb/console/cli/repl/ReplThreadExecutor.java b/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/repl/ReplThreadExecutor.java similarity index 100% rename from modules/cli/src/main/java/com/tsurugidb/console/cli/repl/ReplThreadExecutor.java rename to modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/repl/ReplThreadExecutor.java diff --git a/modules/cli/src/main/java/com/tsurugidb/console/cli/repl/jline/ReplJLineCompleter.java b/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/repl/jline/ReplJLineCompleter.java similarity index 100% rename from modules/cli/src/main/java/com/tsurugidb/console/cli/repl/jline/ReplJLineCompleter.java rename to modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/repl/jline/ReplJLineCompleter.java diff --git a/modules/cli/src/main/java/com/tsurugidb/console/cli/repl/jline/ReplJLineHistory.java b/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/repl/jline/ReplJLineHistory.java similarity index 100% rename from modules/cli/src/main/java/com/tsurugidb/console/cli/repl/jline/ReplJLineHistory.java rename to modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/repl/jline/ReplJLineHistory.java diff --git a/modules/cli/src/main/java/com/tsurugidb/console/cli/repl/jline/ReplJLineParser.java b/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/repl/jline/ReplJLineParser.java similarity index 100% rename from modules/cli/src/main/java/com/tsurugidb/console/cli/repl/jline/ReplJLineParser.java rename to modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/repl/jline/ReplJLineParser.java diff --git a/modules/cli/src/main/java/com/tsurugidb/console/cli/repl/jline/ReplJLineReader.java b/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/repl/jline/ReplJLineReader.java similarity index 100% rename from modules/cli/src/main/java/com/tsurugidb/console/cli/repl/jline/ReplJLineReader.java rename to modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/repl/jline/ReplJLineReader.java diff --git a/modules/cli/src/main/java/com/tsurugidb/console/cli/repl/jline/ReplJLineTerminal.java b/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/repl/jline/ReplJLineTerminal.java similarity index 100% rename from modules/cli/src/main/java/com/tsurugidb/console/cli/repl/jline/ReplJLineTerminal.java rename to modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/repl/jline/ReplJLineTerminal.java diff --git a/modules/cli/src/main/java/com/tsurugidb/console/cli/repl/jline/SimpleCompleterCandidate.java b/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/repl/jline/SimpleCompleterCandidate.java similarity index 100% rename from modules/cli/src/main/java/com/tsurugidb/console/cli/repl/jline/SimpleCompleterCandidate.java rename to modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/repl/jline/SimpleCompleterCandidate.java diff --git a/modules/cli/src/main/java/com/tsurugidb/console/cli/repl/jline/package-info.java b/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/repl/jline/package-info.java similarity index 100% rename from modules/cli/src/main/java/com/tsurugidb/console/cli/repl/jline/package-info.java rename to modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/repl/jline/package-info.java diff --git a/modules/cli/src/main/java/com/tsurugidb/console/cli/repl/package-info.java b/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/repl/package-info.java similarity index 100% rename from modules/cli/src/main/java/com/tsurugidb/console/cli/repl/package-info.java rename to modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/repl/package-info.java diff --git a/modules/cli/src/test/java/com/tsurugidb/console/cli/argument/CliArgumentTest.java b/modules/tgsql/cli/src/test/java/com/tsurugidb/console/cli/argument/CliArgumentTest.java similarity index 100% rename from modules/cli/src/test/java/com/tsurugidb/console/cli/argument/CliArgumentTest.java rename to modules/tgsql/cli/src/test/java/com/tsurugidb/console/cli/argument/CliArgumentTest.java diff --git a/modules/cli/src/test/java/com/tsurugidb/console/cli/repl/ReplReporterTest.java b/modules/tgsql/cli/src/test/java/com/tsurugidb/console/cli/repl/ReplReporterTest.java similarity index 100% rename from modules/cli/src/test/java/com/tsurugidb/console/cli/repl/ReplReporterTest.java rename to modules/tgsql/cli/src/test/java/com/tsurugidb/console/cli/repl/ReplReporterTest.java diff --git a/modules/cli/src/test/java/com/tsurugidb/console/cli/repl/jline/ReplJLineParserTest.java b/modules/tgsql/cli/src/test/java/com/tsurugidb/console/cli/repl/jline/ReplJLineParserTest.java similarity index 100% rename from modules/cli/src/test/java/com/tsurugidb/console/cli/repl/jline/ReplJLineParserTest.java rename to modules/tgsql/cli/src/test/java/com/tsurugidb/console/cli/repl/jline/ReplJLineParserTest.java diff --git a/modules/cli/src/test/java/com/tsurugidb/console/cli/repl/jline/SimpleCompleterCandidateTest.java b/modules/tgsql/cli/src/test/java/com/tsurugidb/console/cli/repl/jline/SimpleCompleterCandidateTest.java similarity index 100% rename from modules/cli/src/test/java/com/tsurugidb/console/cli/repl/jline/SimpleCompleterCandidateTest.java rename to modules/tgsql/cli/src/test/java/com/tsurugidb/console/cli/repl/jline/SimpleCompleterCandidateTest.java diff --git a/modules/core/README.md b/modules/tgsql/core/README.md similarity index 98% rename from modules/core/README.md rename to modules/tgsql/core/README.md index 866833a..a774788 100644 --- a/modules/core/README.md +++ b/modules/tgsql/core/README.md @@ -51,7 +51,7 @@ see [grammar-rule.md](../../docs/grammar-rule.md). ```sh # cd /path/to/tanzawa -./gradlew :tanzawa-core:test \ +./gradlew :tgsql:core:test \ -Ptanzawa.dot=/path/to/dot \ -Ptest.logLevel=debug ``` diff --git a/modules/core/build.gradle b/modules/tgsql/core/build.gradle similarity index 100% rename from modules/core/build.gradle rename to modules/tgsql/core/build.gradle diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/ScriptRunner.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/ScriptRunner.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/ScriptRunner.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/ScriptRunner.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/config/ScriptClientVariableMap.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/config/ScriptClientVariableMap.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/config/ScriptClientVariableMap.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/config/ScriptClientVariableMap.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/config/ScriptColor.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/config/ScriptColor.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/config/ScriptColor.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/config/ScriptColor.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/config/ScriptCommitMode.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/config/ScriptCommitMode.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/config/ScriptCommitMode.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/config/ScriptCommitMode.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/config/ScriptConfig.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/config/ScriptConfig.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/config/ScriptConfig.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/config/ScriptConfig.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/config/ScriptCvKey.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/config/ScriptCvKey.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/config/ScriptCvKey.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/config/ScriptCvKey.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/config/package-info.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/config/package-info.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/config/package-info.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/config/package-info.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/credential/CredentialEnvironment.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/credential/CredentialEnvironment.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/credential/CredentialEnvironment.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/credential/CredentialEnvironment.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/credential/DefaultCredentialSessionConnector.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/credential/DefaultCredentialSessionConnector.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/credential/DefaultCredentialSessionConnector.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/credential/DefaultCredentialSessionConnector.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/credential/package-info.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/credential/package-info.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/credential/package-info.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/credential/package-info.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/exception/ScriptInterruptedException.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/exception/ScriptInterruptedException.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/exception/ScriptInterruptedException.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/exception/ScriptInterruptedException.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/exception/ScriptMessageException.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/exception/ScriptMessageException.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/exception/ScriptMessageException.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/exception/ScriptMessageException.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/exception/ScriptNoMessageException.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/exception/ScriptNoMessageException.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/exception/ScriptNoMessageException.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/exception/ScriptNoMessageException.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/exception/package-info.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/exception/package-info.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/exception/package-info.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/exception/package-info.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/IoSupplier.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/IoSupplier.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/IoSupplier.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/IoSupplier.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/AbstractEngine.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/AbstractEngine.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/AbstractEngine.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/AbstractEngine.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/BasicEngine.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/BasicEngine.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/BasicEngine.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/BasicEngine.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/CommandPath.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/CommandPath.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/CommandPath.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/CommandPath.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/Engine.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/Engine.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/Engine.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/Engine.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/EngineConfigurationException.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/EngineConfigurationException.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/EngineConfigurationException.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/EngineConfigurationException.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/EngineException.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/EngineException.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/EngineException.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/EngineException.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/ExecutorUtil.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/ExecutorUtil.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/ExecutorUtil.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/ExecutorUtil.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/HelpMessage.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/HelpMessage.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/HelpMessage.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/HelpMessage.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/CompleterCandidateWords.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/CompleterCandidateWords.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/CompleterCandidateWords.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/CompleterCandidateWords.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/ConnectCommand.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/ConnectCommand.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/ConnectCommand.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/ConnectCommand.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/DisconnectCommand.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/DisconnectCommand.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/DisconnectCommand.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/DisconnectCommand.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/ExitCommand.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/ExitCommand.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/ExitCommand.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/ExitCommand.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/HaltCommand.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/HaltCommand.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/HaltCommand.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/HaltCommand.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/HelpCommand.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/HelpCommand.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/HelpCommand.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/HelpCommand.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/HistoryCommand.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/HistoryCommand.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/HistoryCommand.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/HistoryCommand.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/SetCommand.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/SetCommand.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/SetCommand.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/SetCommand.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/ShowCommand.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/ShowCommand.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/ShowCommand.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/ShowCommand.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/SpecialCommand.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/SpecialCommand.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/SpecialCommand.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/SpecialCommand.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/StatusCommand.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/StatusCommand.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/StatusCommand.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/StatusCommand.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/TimingCommand.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/TimingCommand.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/TimingCommand.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/TimingCommand.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/package-info.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/package-info.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/package-info.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/command/package-info.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/package-info.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/package-info.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/engine/package-info.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/engine/package-info.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/explain/DotOutputHandler.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/explain/DotOutputHandler.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/explain/DotOutputHandler.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/explain/DotOutputHandler.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/explain/OptionHandler.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/explain/OptionHandler.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/explain/OptionHandler.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/explain/OptionHandler.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/explain/PlanGraphOutputHandler.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/explain/PlanGraphOutputHandler.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/explain/PlanGraphOutputHandler.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/explain/PlanGraphOutputHandler.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/explain/StatementMetadataHandler.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/explain/StatementMetadataHandler.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/explain/StatementMetadataHandler.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/explain/StatementMetadataHandler.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/explain/Util.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/explain/Util.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/explain/Util.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/explain/Util.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/explain/package-info.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/explain/package-info.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/explain/package-info.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/explain/package-info.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/package-info.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/package-info.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/package-info.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/package-info.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/report/BasicReporter.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/report/BasicReporter.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/report/BasicReporter.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/report/BasicReporter.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/report/HistoryEntry.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/report/HistoryEntry.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/report/HistoryEntry.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/report/HistoryEntry.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/report/PlanGraphReporter.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/report/PlanGraphReporter.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/report/PlanGraphReporter.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/report/PlanGraphReporter.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/report/ScriptReporter.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/report/ScriptReporter.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/report/ScriptReporter.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/report/ScriptReporter.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/report/package-info.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/report/package-info.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/report/package-info.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/report/package-info.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/result/BasicResultProcessor.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/result/BasicResultProcessor.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/result/BasicResultProcessor.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/result/BasicResultProcessor.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/result/ResultProcessor.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/result/ResultProcessor.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/result/ResultProcessor.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/result/ResultProcessor.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/result/ResultSetUtil.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/result/ResultSetUtil.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/result/ResultSetUtil.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/result/ResultSetUtil.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/result/StandardWriterSupplier.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/result/StandardWriterSupplier.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/result/StandardWriterSupplier.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/result/StandardWriterSupplier.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/result/package-info.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/result/package-info.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/result/package-info.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/result/package-info.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/sql/BasicSqlProcessor.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/sql/BasicSqlProcessor.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/sql/BasicSqlProcessor.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/sql/BasicSqlProcessor.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/sql/PreparedStatementResult.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/sql/PreparedStatementResult.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/sql/PreparedStatementResult.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/sql/PreparedStatementResult.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/sql/SqlProcessor.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/sql/SqlProcessor.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/sql/SqlProcessor.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/sql/SqlProcessor.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/executor/sql/package-info.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/sql/package-info.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/executor/sql/package-info.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/executor/sql/package-info.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/model/CallStatement.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/model/CallStatement.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/model/CallStatement.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/model/CallStatement.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/model/CommitStatement.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/model/CommitStatement.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/model/CommitStatement.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/model/CommitStatement.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/model/ErroneousStatement.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/model/ErroneousStatement.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/model/ErroneousStatement.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/model/ErroneousStatement.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/model/ExplainStatement.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/model/ExplainStatement.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/model/ExplainStatement.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/model/ExplainStatement.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/model/Region.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/model/Region.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/model/Region.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/model/Region.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/model/Regioned.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/model/Regioned.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/model/Regioned.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/model/Regioned.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/model/SimpleStatement.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/model/SimpleStatement.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/model/SimpleStatement.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/model/SimpleStatement.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/model/SpecialStatement.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/model/SpecialStatement.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/model/SpecialStatement.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/model/SpecialStatement.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/model/StartTransactionStatement.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/model/StartTransactionStatement.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/model/StartTransactionStatement.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/model/StartTransactionStatement.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/model/Statement.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/model/Statement.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/model/Statement.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/model/Statement.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/model/Value.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/model/Value.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/model/Value.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/model/Value.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/model/package-info.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/model/package-info.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/model/package-info.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/model/package-info.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/package-info.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/package-info.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/package-info.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/package-info.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/parser/ParseException.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/parser/ParseException.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/parser/ParseException.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/parser/ParseException.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/parser/Segment.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/parser/Segment.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/parser/Segment.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/parser/Segment.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/parser/SegmentAnalyzer.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/parser/SegmentAnalyzer.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/parser/SegmentAnalyzer.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/parser/SegmentAnalyzer.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/parser/SqlParser.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/parser/SqlParser.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/parser/SqlParser.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/parser/SqlParser.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/parser/SqlScanner.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/parser/SqlScanner.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/parser/SqlScanner.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/parser/SqlScanner.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/parser/StartTransactionCandidate.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/parser/StartTransactionCandidate.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/parser/StartTransactionCandidate.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/parser/StartTransactionCandidate.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/parser/TokenCategory.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/parser/TokenCategory.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/parser/TokenCategory.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/parser/TokenCategory.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/parser/TokenCursor.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/parser/TokenCursor.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/parser/TokenCursor.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/parser/TokenCursor.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/parser/TokenInfo.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/parser/TokenInfo.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/parser/TokenInfo.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/parser/TokenInfo.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/parser/TokenKind.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/parser/TokenKind.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/parser/TokenKind.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/parser/TokenKind.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/parser/package-info.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/parser/package-info.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/parser/package-info.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/parser/package-info.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/util/TanzawaVersion.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/util/TanzawaVersion.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/util/TanzawaVersion.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/util/TanzawaVersion.java diff --git a/modules/core/src/main/java/com/tsurugidb/console/core/util/package-info.java b/modules/tgsql/core/src/main/java/com/tsurugidb/console/core/util/package-info.java similarity index 100% rename from modules/core/src/main/java/com/tsurugidb/console/core/util/package-info.java rename to modules/tgsql/core/src/main/java/com/tsurugidb/console/core/util/package-info.java diff --git a/modules/core/src/main/jflex/SqlScanner.jflex b/modules/tgsql/core/src/main/jflex/SqlScanner.jflex similarity index 100% rename from modules/core/src/main/jflex/SqlScanner.jflex rename to modules/tgsql/core/src/main/jflex/SqlScanner.jflex diff --git a/modules/core/src/main/resources/com/tsurugidb/console/help.properties b/modules/tgsql/core/src/main/resources/com/tsurugidb/console/help.properties similarity index 100% rename from modules/core/src/main/resources/com/tsurugidb/console/help.properties rename to modules/tgsql/core/src/main/resources/com/tsurugidb/console/help.properties diff --git a/modules/core/src/test/java/com/tsurugidb/console/core/ScriptRunnerTest.java b/modules/tgsql/core/src/test/java/com/tsurugidb/console/core/ScriptRunnerTest.java similarity index 100% rename from modules/core/src/test/java/com/tsurugidb/console/core/ScriptRunnerTest.java rename to modules/tgsql/core/src/test/java/com/tsurugidb/console/core/ScriptRunnerTest.java diff --git a/modules/core/src/test/java/com/tsurugidb/console/core/config/ScriptCvKeyBooleanTest.java b/modules/tgsql/core/src/test/java/com/tsurugidb/console/core/config/ScriptCvKeyBooleanTest.java similarity index 100% rename from modules/core/src/test/java/com/tsurugidb/console/core/config/ScriptCvKeyBooleanTest.java rename to modules/tgsql/core/src/test/java/com/tsurugidb/console/core/config/ScriptCvKeyBooleanTest.java diff --git a/modules/core/src/test/java/com/tsurugidb/console/core/executor/engine/BasicEngineTest.java b/modules/tgsql/core/src/test/java/com/tsurugidb/console/core/executor/engine/BasicEngineTest.java similarity index 100% rename from modules/core/src/test/java/com/tsurugidb/console/core/executor/engine/BasicEngineTest.java rename to modules/tgsql/core/src/test/java/com/tsurugidb/console/core/executor/engine/BasicEngineTest.java diff --git a/modules/core/src/test/java/com/tsurugidb/console/core/executor/engine/CommandPathTest.java b/modules/tgsql/core/src/test/java/com/tsurugidb/console/core/executor/engine/CommandPathTest.java similarity index 100% rename from modules/core/src/test/java/com/tsurugidb/console/core/executor/engine/CommandPathTest.java rename to modules/tgsql/core/src/test/java/com/tsurugidb/console/core/executor/engine/CommandPathTest.java diff --git a/modules/core/src/test/java/com/tsurugidb/console/core/executor/engine/HelpMessageTest.java b/modules/tgsql/core/src/test/java/com/tsurugidb/console/core/executor/engine/HelpMessageTest.java similarity index 100% rename from modules/core/src/test/java/com/tsurugidb/console/core/executor/engine/HelpMessageTest.java rename to modules/tgsql/core/src/test/java/com/tsurugidb/console/core/executor/engine/HelpMessageTest.java diff --git a/modules/core/src/test/java/com/tsurugidb/console/core/executor/engine/TestUtil.java b/modules/tgsql/core/src/test/java/com/tsurugidb/console/core/executor/engine/TestUtil.java similarity index 100% rename from modules/core/src/test/java/com/tsurugidb/console/core/executor/engine/TestUtil.java rename to modules/tgsql/core/src/test/java/com/tsurugidb/console/core/executor/engine/TestUtil.java diff --git a/modules/core/src/test/java/com/tsurugidb/console/core/executor/engine/command/ConnectCommandTest.java b/modules/tgsql/core/src/test/java/com/tsurugidb/console/core/executor/engine/command/ConnectCommandTest.java similarity index 100% rename from modules/core/src/test/java/com/tsurugidb/console/core/executor/engine/command/ConnectCommandTest.java rename to modules/tgsql/core/src/test/java/com/tsurugidb/console/core/executor/engine/command/ConnectCommandTest.java diff --git a/modules/core/src/test/java/com/tsurugidb/console/core/executor/explain/DotOutputHandlerTest.java b/modules/tgsql/core/src/test/java/com/tsurugidb/console/core/executor/explain/DotOutputHandlerTest.java similarity index 100% rename from modules/core/src/test/java/com/tsurugidb/console/core/executor/explain/DotOutputHandlerTest.java rename to modules/tgsql/core/src/test/java/com/tsurugidb/console/core/executor/explain/DotOutputHandlerTest.java diff --git a/modules/core/src/test/java/com/tsurugidb/console/core/executor/explain/StatementMetadataHandlerTest.java b/modules/tgsql/core/src/test/java/com/tsurugidb/console/core/executor/explain/StatementMetadataHandlerTest.java similarity index 100% rename from modules/core/src/test/java/com/tsurugidb/console/core/executor/explain/StatementMetadataHandlerTest.java rename to modules/tgsql/core/src/test/java/com/tsurugidb/console/core/executor/explain/StatementMetadataHandlerTest.java diff --git a/modules/core/src/test/java/com/tsurugidb/console/core/executor/report/PlanGraphReporterTest.java b/modules/tgsql/core/src/test/java/com/tsurugidb/console/core/executor/report/PlanGraphReporterTest.java similarity index 100% rename from modules/core/src/test/java/com/tsurugidb/console/core/executor/report/PlanGraphReporterTest.java rename to modules/tgsql/core/src/test/java/com/tsurugidb/console/core/executor/report/PlanGraphReporterTest.java diff --git a/modules/core/src/test/java/com/tsurugidb/console/core/executor/report/ScriptReporterTest.java b/modules/tgsql/core/src/test/java/com/tsurugidb/console/core/executor/report/ScriptReporterTest.java similarity index 100% rename from modules/core/src/test/java/com/tsurugidb/console/core/executor/report/ScriptReporterTest.java rename to modules/tgsql/core/src/test/java/com/tsurugidb/console/core/executor/report/ScriptReporterTest.java diff --git a/modules/core/src/test/java/com/tsurugidb/console/core/executor/result/BasicResultProcessorTest.java b/modules/tgsql/core/src/test/java/com/tsurugidb/console/core/executor/result/BasicResultProcessorTest.java similarity index 100% rename from modules/core/src/test/java/com/tsurugidb/console/core/executor/result/BasicResultProcessorTest.java rename to modules/tgsql/core/src/test/java/com/tsurugidb/console/core/executor/result/BasicResultProcessorTest.java diff --git a/modules/core/src/test/java/com/tsurugidb/console/core/executor/sql/BasicSqlProcessorTest.java b/modules/tgsql/core/src/test/java/com/tsurugidb/console/core/executor/sql/BasicSqlProcessorTest.java similarity index 100% rename from modules/core/src/test/java/com/tsurugidb/console/core/executor/sql/BasicSqlProcessorTest.java rename to modules/tgsql/core/src/test/java/com/tsurugidb/console/core/executor/sql/BasicSqlProcessorTest.java diff --git a/modules/core/src/test/java/com/tsurugidb/console/core/parser/SegmentAnalyzerTest.java b/modules/tgsql/core/src/test/java/com/tsurugidb/console/core/parser/SegmentAnalyzerTest.java similarity index 100% rename from modules/core/src/test/java/com/tsurugidb/console/core/parser/SegmentAnalyzerTest.java rename to modules/tgsql/core/src/test/java/com/tsurugidb/console/core/parser/SegmentAnalyzerTest.java diff --git a/modules/core/src/test/java/com/tsurugidb/console/core/parser/SqlParserTest.java b/modules/tgsql/core/src/test/java/com/tsurugidb/console/core/parser/SqlParserTest.java similarity index 100% rename from modules/core/src/test/java/com/tsurugidb/console/core/parser/SqlParserTest.java rename to modules/tgsql/core/src/test/java/com/tsurugidb/console/core/parser/SqlParserTest.java diff --git a/modules/core/src/test/java/com/tsurugidb/console/core/parser/SqlScannerTest.java b/modules/tgsql/core/src/test/java/com/tsurugidb/console/core/parser/SqlScannerTest.java similarity index 100% rename from modules/core/src/test/java/com/tsurugidb/console/core/parser/SqlScannerTest.java rename to modules/tgsql/core/src/test/java/com/tsurugidb/console/core/parser/SqlScannerTest.java diff --git a/modules/core/src/test/java/com/tsurugidb/console/core/util/TanzawaVersionTest.java b/modules/tgsql/core/src/test/java/com/tsurugidb/console/core/util/TanzawaVersionTest.java similarity index 100% rename from modules/core/src/test/java/com/tsurugidb/console/core/util/TanzawaVersionTest.java rename to modules/tgsql/core/src/test/java/com/tsurugidb/console/core/util/TanzawaVersionTest.java diff --git a/modules/core/src/test/resources/META-INF/tsurugidb/tanzawa-version-test.properties b/modules/tgsql/core/src/test/resources/META-INF/tsurugidb/tanzawa-version-test.properties similarity index 100% rename from modules/core/src/test/resources/META-INF/tsurugidb/tanzawa-version-test.properties rename to modules/tgsql/core/src/test/resources/META-INF/tsurugidb/tanzawa-version-test.properties diff --git a/modules/core/src/test/resources/com/tsurugidb/console/core/executor/engine/explain-find-project-write.json b/modules/tgsql/core/src/test/resources/com/tsurugidb/console/core/executor/engine/explain-find-project-write.json similarity index 100% rename from modules/core/src/test/resources/com/tsurugidb/console/core/executor/engine/explain-find-project-write.json rename to modules/tgsql/core/src/test/resources/com/tsurugidb/console/core/executor/engine/explain-find-project-write.json diff --git a/modules/core/src/test/resources/com/tsurugidb/console/help_testing.properties b/modules/tgsql/core/src/test/resources/com/tsurugidb/console/help_testing.properties similarity index 100% rename from modules/core/src/test/resources/com/tsurugidb/console/help_testing.properties rename to modules/tgsql/core/src/test/resources/com/tsurugidb/console/help_testing.properties diff --git a/settings.gradle b/settings.gradle index bf5032d..adb401a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,11 +1,22 @@ rootProject.name = 'tanzawa' -include 'tanzawa-core' -include 'tanzawa-cli' +include 'tgsql:core' +include 'tgsql:cli' -rootProject.children.each { project -> - var dirName = project.name.substring('tanzawa-'.length()); - project.projectDir = new File(settingsDir, "modules/${dirName}") - assert project.projectDir.isDirectory() +def setProjectDir(ProjectDescriptor project) { + if (project.parent == null) { + // root project + } else if (project.parent.parent == null) { + // first-level subprojects + var baseDir = new File(settingsDir, "modules") + project.projectDir = new File(baseDir, project.name) + } else { + // nested subprojects + var baseDir = project.parent.projectDir + project.projectDir = new File(baseDir, project.name) + } + project.children.each { it -> setProjectDir(it) } } +setProjectDir(rootProject) +