Merge branch 'DBTOOLS-2019_backward' into 'master'

DBTOOLS-2019 added disableAutoLoad param

See merge request codekeeper/pgcodekeeper-cli!34

Author: AXEPOH

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 
 - Added the `--parallel-load` parameter. When specified, databases are loaded in parallel; by default, loading is performed sequentially.
+- Added the `--disable-auto_load` parameter. When specified, automatic loading of auxiliary project files is disabled (.pgcodekeeperignore, .pgcodekeeperignoreschema, .dependencies).
 
 ### Changed
 

CHANGELOG.ru.md

@@ -10,6 +10,7 @@
 ### Добавлено
 
 - Добавлен параметр `--parallel-load`. При его указании загрузка баз данных выполняется параллельно, по умолчанию загрузка выполняется последовательно.
+- Добавлен параметр `--disable-auto_load`. При его указании отключается автоматическая загрузка вспомогательных файлов проекта (.pgcodekeeperignore, .pgcodekeeperignoreschema, .dependencies).
 
 ### Изменено
 

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

@@ -84,6 +84,7 @@ enum CliMode {
         this.dbType = PG;
         this.mode = CliMode.DIFF;
         this.parallelLoad = false;
+        this.disableAutoLoad = false;
     }
     // SONAR-ON
 
@@ -265,6 +266,9 @@ enum CliMode {
     @Option(name = "--parallel-load", aliases = "-par", usage = "parallel-load")
     private boolean parallelLoad;
 
+    @Option(name = "--disable-auto_load", usage = "disable-auto-load")
+    private boolean disableAutoLoad;
+
     CliMode getMode() {
         return mode;
     }
@@ -512,6 +516,11 @@ public boolean isParallelLoad() {
         return parallelLoad;
     }
 
+    @Override
+    public boolean isDisableAutoLoad() {
+        return disableAutoLoad;
+    }
+
     @Override
     public CliArgs copy() {
         var args = new CliArgs();

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

@@ -100,7 +100,8 @@ protected Object[][] getContents() {
                 {"graph-name", Messages.CliArgs_graph_name}, //$NON-NLS-1$
                 {"graph-filter-object", Messages.CliArgs_graph_filter_object}, //$NON-NLS-1$
                 {"graph-invert-filter", Messages.CliArgs_graph_invert_filter}, //$NON-NLS-1$
-                {"parallel-load", Messages.CliArgs_use_parallel_load} //$NON-NLS-1$
+                {"parallel-load", Messages.CliArgs_use_parallel_load}, //$NON-NLS-1$
+                {"disable-auto-load", Messages.CliArgs_disable_auto_load} //$NON-NLS-1$
         };
     }
 }

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

@@ -29,6 +29,7 @@ public class Messages {
     public static String CliArgs_comments_to_end;
     public static String CliArgs_concurrently_mode;
     public static String CliArgs_db_type;
+    public static String CliArgs_disable_auto_load;
     public static String CliArgs_drop_before_create;
     public static String CliArgs_enable_function_bodies_dependencies;
     public static String CliArgs_error_argument_null;

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

@@ -8,6 +8,7 @@ CliArgs_cluster_name = the name of the cluster that will be applied to all table
 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_disable_auto_load = disable automatic loading of project auxiliary files
 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

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

@@ -8,6 +8,7 @@ CliArgs_cluster_name = \u0438\u043C\u044F \u043A\u043B\u0430\u0441\u0442\u0435\u
 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_disable_auto_load = \u043E\u0442\u043A\u043B\u044E\u0447\u0430\u0435\u0442 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0443\u044E \u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0443 \u0432\u0441\u043F\u043E\u043C\u043E\u0433\u0430\u0442\u0435\u043B\u044C\u043D\u044B\u0445 \u0444\u0430\u0439\u043B\u043E\u0432 \u043F\u0440\u043E\u0435\u043A\u0442\u0430
 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

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

@@ -25,6 +25,8 @@ Usage
                                           = ON for MS SQL
  --db-type [PG | MS | CH]               : specify database type for work: PG,
                                           MS, CH (default: PG)
+ --disable-auto_load                    : disable automatic loading of project
+                                          auxiliary files
  --drop-before-create                   : print DROP before CREATE statement
  --enable-function-bodies-dependencies  : enable dependencies from bodies of
  (-f)                                     functions and procedures to other