DBTOOLS-1929 added on cluster for ch tables

Author: baslo2

src/main/java/org/pgcodekeeper/cli/CliArgs.java

@@ -256,6 +256,9 @@ enum CliMode {
     @Option(name="--graph-invert-filter", depends="--graph-filter-object", usage="graph-invert-filter")
     private boolean graphInvertFilter;
 
+    @Option(name="--cluster-name", usage="cluster-name")
+    private String сlusterName;
+
     CliMode getMode() {
         return mode;
     }
@@ -498,6 +501,11 @@ public IDatabaseProvider getProvider() {
         return provider;
     }
 
+    @Override
+    public String getClusterName() {
+        return сlusterName;
+    }
+
     @Override
     public CliArgs copy() {
         var args = new CliArgs();
@@ -552,6 +560,7 @@ public CliArgs copy() {
         args.timeZone = timeZone;
         args.usingTypeCastOff = usingTypeCastOff;
         args.provider = provider;
+        args.сlusterName = сlusterName;
         return args;
     }
 
@@ -681,6 +690,7 @@ private void checkDbTypesParam() throws CmdLineException {
                 DatabaseType.CH);
         badArgWithWrongDbType(concurrentlyMode, "--concurrently-mode (-C)", DatabaseType.CH); //$NON-NLS-1$
         badArgWithWrongDbType(commentsToEnd, "--comments-to-end", DatabaseType.CH); //$NON-NLS-1$
+        badArgWithWrongDbType(null != сlusterName, "--cluster-name", DatabaseType.PG, DatabaseType.MS); //$NON-NLS-1$
     }
 
     private void badArgWithCorrectModes(boolean condition, String param, CliMode... modes) throws CmdLineException {

src/main/java/org/pgcodekeeper/cli/localizations/CliArgsLocalizationsBundle.java

@@ -47,6 +47,7 @@ protected Object[][] getContents() {
             {"Version", Messages.CliArgs_Version}, //$NON-NLS-1$
             {"ListCharsets", Messages.CliArgs_list_charsets}, //$NON-NLS-1$
             {"ClearLibCache", Messages.CliArgs_clear_lib_cache}, //$NON-NLS-1$
+            {"cluster-name", Messages.CliArgs_cluster_name}, //$NON-NLS-1$
             {"mode", Messages.CliArgs_mode}, //$NON-NLS-1$
             {"source", Messages.CliArgs_source}, //$NON-NLS-1$
             {"target", Messages.CliArgs_target}, //$NON-NLS-1$

src/main/java/org/pgcodekeeper/cli/localizations/Messages.java

@@ -24,6 +24,7 @@ public class Messages {
     public static String CliArgs_add_transaction;
     public static String CliArgs_allow_danger_ddl;
     public static String CliArgs_allowed_object;
+    public static String CliArgs_cluster_name;
     public static String CliArgs_clear_lib_cache;
     public static String CliArgs_comments_to_end;
     public static String CliArgs_concurrently_mode;
@@ -32,11 +33,8 @@ public class Messages {
     public static String CliArgs_enable_function_bodies_dependencies;
     public static String CliArgs_error_argument_null;
     public static String CliArgs_error_concurrently_mode_wrong_option;
-    public static String CliArgs_error_different_types;
-    public static String CliArgs_error_message_cannot_database_with_project;
     public static String CliArgs_error_run_on_non_jdbc;
     public static String CliArgs_error_source_dest;
-    public static String CliArgs_error_source_non_db;
     public static String CliArgs_error_source_null;
     public static String CliArgs_error_target_non_db;
     public static String CliArgs_error_wrong_db_type;

src/main/resources/org/pgcodekeeper/cli/localizations/messages.properties

@@ -4,18 +4,16 @@ CliArgs_add_transaction = wrap generated script with transaction statements
 CliArgs_allow_danger_ddl = allows dangerous statements in safe-mode scripts
 CliArgs_allowed_object = build the script using these object types only, hide statements of other objects
 CliArgs_clear_lib_cache = clear library cache
+CliArgs_cluster_name = the name of the cluster that will be applied to all tables (experimentally, only for ClickHouse)
 CliArgs_comments_to_end = print comments at the end of the script
 CliArgs_concurrently_mode = print CREATE INDEX with CONCURRENTLY option for PostgreSQL and WITH ONLINE = ON for MS SQL
 CliArgs_db_type = specify database type for work: PG, MS, CH
 CliArgs_drop_before_create = print DROP before CREATE statement
 CliArgs_enable_function_bodies_dependencies = enable dependencies from bodies of functions and procedures to other functions or procedures
 CliArgs_error_argument_null = Please specify argument %s
 CliArgs_error_concurrently_mode_wrong_option = --concurrently-mode (-C) cannot be used with the option(s) --add-transaction (-X) for PostgreSQL.
-CliArgs_error_different_types = Source (%s) and target (%s) are of different types, possibly missing --db-type parameter.
-CliArgs_error_message_cannot_database_with_project = Cannot work with %s database as %s project.
 CliArgs_error_run_on_non_jdbc = Option --run-on (-R) must specify JDBC connection string.
 CliArgs_error_source_dest = Please specify both SOURCE and DEST.
-CliArgs_error_source_non_db = Source must be a database.
 CliArgs_error_source_null = Please specify SOURCE.
 CliArgs_error_target_non_db = Script can be applied only to database.
 CliArgs_error_wrong_db_type = %s cannot be used with --db-type %s option

src/main/resources/org/pgcodekeeper/cli/localizations/messages_ru_RU.properties

@@ -4,18 +4,16 @@ CliArgs_add_transaction = \u043E\u0431\u0435\u0440\u043D\u0443\u0442\u044C \u044
 CliArgs_allow_danger_ddl = \u0440\u0430\u0437\u0440\u0435\u0448\u0438\u0442\u044C \u043E\u043F\u0430\u0441\u043D\u044B\u0435 \u043E\u043F\u0435\u0440\u0430\u0442\u043E\u0440\u044B \u0432 \u0441\u043A\u0440\u0438\u043F\u0442\u0430\u0445 \u0432 \u0431\u0435\u0437\u043E\u043F\u0430\u0441\u043D\u043E\u043C \u0440\u0435\u0436\u0438\u043C\u0435
 CliArgs_allowed_object = \u043F\u043E\u0441\u0442\u0440\u043E\u0438\u0442\u044C \u0441\u043A\u0440\u0438\u043F\u0442, \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u044F \u0442\u043E\u043B\u044C\u043A\u043E \u044D\u0442\u0438 \u0442\u0438\u043F\u044B \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432 \u0438 \u0441\u043A\u0440\u044B\u0432\u0430\u044F \u043E\u0431\u044A\u0435\u043A\u0442\u044B \u0434\u0440\u0443\u0433\u0438\u0445 \u0442\u0438\u043F\u043E\u0432
 CliArgs_clear_lib_cache = \u043E\u0447\u0438\u0441\u0442\u0438\u0442\u044C \u043A\u044D\u0448 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A
+CliArgs_cluster_name = \u0438\u043C\u044F \u043A\u043B\u0430\u0441\u0442\u0435\u0440\u0430, \u043F\u0440\u0438\u043C\u0435\u043D\u044F\u0435\u043C\u043E\u0435 \u043A\u043E \u0432\u0441\u0435\u043C \u0442\u0430\u0431\u043B\u0438\u0446\u0430\u043C (\u044D\u043A\u0441\u043F\u0435\u0440\u0438\u043C\u0435\u043D\u0442\u0430\u043B\u044C\u043D\u043E, \u0442\u043E\u043B\u044C\u043A\u043E \u0434\u043B\u044F ClickHouse)
 CliArgs_comments_to_end = \u043F\u0435\u0447\u0430\u0442\u0430\u0442\u044C \u043A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0438 \u0432 \u043A\u043E\u043D\u0446\u0435 \u0441\u043A\u0440\u0438\u043F\u0442\u0430
 CliArgs_concurrently_mode = \u043F\u0435\u0447\u0430\u0442\u0430\u0442\u044C CREATE INDEX \u0441 \u043E\u043F\u0446\u0438\u0435\u0439 CONCURRENTLY \u0434\u043B\u044F PostgreSQL \u0438 WITH ONLINE = ON \u0434\u043B\u044F MS SQL
 CliArgs_db_type = \u0443\u043A\u0430\u0437\u0430\u0442\u044C \u0442\u0438\u043F \u0431\u0430\u0437\u044B \u0434\u0430\u043D\u043D\u044B\u0445 \u0434\u043B\u044F \u0440\u0430\u0431\u043E\u0442\u044B: PG, MS, CH
 CliArgs_drop_before_create = \u043F\u0435\u0447\u0430\u0442\u0430\u0442\u044C DROP \u043F\u0435\u0440\u0435\u0434 CREATE \u043A\u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0446\u0438\u0435\u0439
 CliArgs_enable_function_bodies_dependencies = \u0432\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0441\u0442\u0438 \u043E\u0442 \u0442\u0435\u043B \u0444\u0443\u043D\u043A\u0446\u0438\u0439 \u0438 \u043F\u0440\u043E\u0446\u0435\u0434\u0443\u0440 \u043A \u0434\u0440\u0443\u0433\u0438\u043C \u0444\u0443\u043D\u043A\u0446\u0438\u044F\u043C \u0438\u043B\u0438 \u043F\u0440\u043E\u0446\u0435\u0434\u0443\u0440\u0430\u043C
 CliArgs_error_argument_null = \u041F\u043E\u0436\u0430\u043B\u0443\u0439\u0441\u0442\u0430, \u0443\u043A\u0430\u0436\u0438\u0442\u0435 \u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442 %s
 CliArgs_error_concurrently_mode_wrong_option = --concurrently-mode (-C ) \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C\u0441\u044F \u0441 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u043E\u043C --add-transaction (-X) \u0434\u043B\u044F PostgreSQL.
-CliArgs_error_different_types = \u0418\u0441\u0442\u043E\u0447\u043D\u0438\u043A (%s) \u0438 \u043F\u0440\u0438\u0435\u043C\u043D\u0438\u043A (%s) \u0440\u0430\u0437\u043B\u0438\u0447\u0430\u044E\u0442\u0441\u044F \u043F\u043E \u0442\u0438\u043F\u0443, \u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u043F\u0440\u043E\u043F\u0443\u0449\u0435\u043D \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440 --db-type.
-CliArgs_error_message_cannot_database_with_project = \u041D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u0440\u0430\u0431\u043E\u0442\u0430\u0442\u044C \u0441 \u0431\u0430\u0437\u043E\u0439 \u0434\u0430\u043D\u043D\u044B\u0445 %s \u043A\u0430\u043A \u0441 \u043F\u0440\u043E\u0435\u043A\u0442\u043E\u043C %s.
 CliArgs_error_run_on_non_jdbc = \u041F\u0430\u0440\u0430\u043C\u0435\u0442\u0440 --run-on (-R) \u0434\u043E\u043B\u0436\u0435\u043D \u0443\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u0441\u0442\u0440\u043E\u043A\u0443 \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u044F JDBC.
 CliArgs_error_source_dest = \u041F\u043E\u0436\u0430\u043B\u0443\u0439\u0441\u0442\u0430, \u0443\u043A\u0430\u0436\u0438\u0442\u0435 \u043E\u0431\u0430 \u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442\u0430 SOURCE \u0438 DEST.
-CliArgs_error_source_non_db = \u0418\u0441\u0442\u043E\u0447\u043D\u0438\u043A\u043E\u043C \u0434\u043E\u043B\u0436\u043D\u0430 \u0431\u044B\u0442\u044C \u0431\u0430\u0437\u0430 \u0434\u0430\u043D\u043D\u044B\u0445.
 CliArgs_error_source_null = \u041F\u043E\u0436\u0430\u043B\u0443\u0439\u0441\u0442\u0430, \u0443\u043A\u0430\u0436\u0438\u0442\u0435 SOURCE.
 CliArgs_error_target_non_db = \u0421\u043A\u0440\u0438\u043F\u0442 \u043C\u043E\u0436\u043D\u043E \u043F\u0440\u0438\u043C\u0435\u043D\u0438\u0442\u044C \u0442\u043E\u043B\u044C\u043A\u043E \u043A \u0431\u0430\u0437\u0435 \u0434\u0430\u043D\u043D\u044B\u0445.
 CliArgs_error_wrong_db_type = %s \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D \u0441 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u043E\u043C --db-type %s

src/test/java/org/pgcodekeeper/cli/CliArgsTest.java

@@ -57,6 +57,9 @@ class CliArgsTest {
             "filename filename --simplify-views --db-type MS;"
                     + "--simplify-views cannot be used with --db-type MS option",
 
+            "jdbc:postgresql:q jdbc:postgresql:q2 --cluster-name test;"
+                    + "--cluster-name cannot be used with --db-type PG option"
+
     })
     void badArgsTest(String arguments, String message) {
         String[] args = arguments.split(" ");

src/test/resources/org/pgcodekeeper/cli/usage_check.txt

@@ -15,6 +15,9 @@ Usage
                                           types only, hide statements of other
                                           objects
  --clear-lib-cache                      : clear library cache
+ --cluster-name                         : the name of the cluster that will be
+                                          applied to all tables (experimentally,
+                                          only for ClickHouse)
  --comments-to-end                      : print comments at the end of the
                                           script
  --concurrently-mode (-C)               : print CREATE INDEX with CONCURRENTLY