Merge branch 'DBTOOLS-869_add_option_for_alt_locations' into 'master'

DBTOOLS-869 added option for alt locations

See merge request codekeeper/pgcodekeeper-cli!48

Author: AXEPOH

CHANGELOG.md

@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
+- Added `--structure-file` parameter for parse mode, which allows specifying the path to a properties file with directory layout overrides for project export.
+
 ### Changed
 
 ### Fixed

CHANGELOG.ru.md

@@ -9,6 +9,8 @@
 
 ### Добавлено
 
+- Добавлен параметр `--structure-file` для режима parse, позволяющий указать путь к properties-файлу с альтернативной структурой директорий объектов при экспорте проекта.
+
 ### Изменено
 
 ### Исправлено

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

@@ -243,6 +243,9 @@ enum CliMode {
     @Option(name = "--update-project", usage = "update-project")
     private boolean projUpdate;
 
+    @Option(name = "--structure-file", metaVar = CliArgsLocalizationsBundle.PATH, usage = "structure-file")
+    private String structureFile;
+
     @Option(name = "--graph-depth", metaVar = CliArgsLocalizationsBundle.N, usage = "graph-depth")
     private int graphDepth;
 
@@ -485,6 +488,10 @@ public boolean isProjUpdate() {
         return projUpdate;
     }
 
+    public String getStructureFile() {
+        return structureFile;
+    }
+
     public Collection<String> getGraphNames() {
         return Collections.unmodifiableCollection(graphNames);
     }
@@ -581,6 +588,7 @@ public CliArgs copy() {
         args.postFilePath = postFilePath;
         args.preFilePath = preFilePath;
         args.projUpdate = projUpdate;
+        args.structureFile = structureFile;
         args.runOnDb = runOnDb;
         args.runOnTarget = runOnTarget;
         args.safeMode = safeMode;
@@ -676,8 +684,13 @@ private void checkParams() throws CmdLineException {
             if (runOnDb != null && !runOnDb.startsWith(URL_START_JDBC)) {
                 badArgs(Messages.CliArgs_error_run_on_non_jdbc);
             }
-        } else if (CliMode.PARSE == mode && outputTarget == null) {
-            badArgs(Messages.CliArgs_error_argument_null.formatted("\"-o (--output)\"")); //$NON-NLS-1$
+        } else if (CliMode.PARSE == mode) {
+            if (outputTarget == null) {
+                badArgs(Messages.CliArgs_error_argument_null.formatted("\"-o (--output)\"")); //$NON-NLS-1$
+            }
+            if (projUpdate && structureFile != null) {
+                badArgs(Messages.CliArgs_error_structure_file_with_update);
+            }
         }
     }
 
@@ -711,6 +724,7 @@ private void checkModeParams() throws CmdLineException {
         badArgWithCorrectModes(!sourceLibs.isEmpty(), "--tgt-lib", CliMode.DIFF); //$NON-NLS-1$
         badArgWithCorrectModes(!sourceLibsWithoutPriv.isEmpty(), "--tgt-lib-no-priv", CliMode.DIFF); //$NON-NLS-1$
         badArgWithCorrectModes(projUpdate, "--update-project", CliMode.PARSE); //$NON-NLS-1$
+        badArgWithCorrectModes(structureFile != null, "--structure-file", CliMode.PARSE); //$NON-NLS-1$
         badArgWithCorrectModes(!graphNames.isEmpty(), "--graph-name", CliMode.GRAPH); //$NON-NLS-1$
         badArgWithCorrectModes(DEFAULT_DEPTH != graphDepth, "--graph-depth", CliMode.GRAPH); //$NON-NLS-1$
         badArgWithCorrectModes(!graphFilterTypes.isEmpty(), "--graph-filter-object", CliMode.GRAPH); //$NON-NLS-1$

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

@@ -58,8 +58,10 @@ public void exportProject() throws IOException, InterruptedException {
         var newDbLoader = getDatabaseLoader(arguments.getNewSrc(),
                 arguments.getTargetLibXmls(), arguments.getTargetLibs(), arguments.getTargetLibsWithoutPriv());
 
+        String structureFile = arguments.getStructureFile();
         PgCodeKeeperApi.exportToProject(arguments.getProvider(), null, newDbLoader,
-                Path.of(arguments.getOutputTarget()), diffSettings);
+                Path.of(arguments.getOutputTarget()), false,
+                structureFile == null ? null : Paths.get(structureFile), diffSettings);
 
         assertErrorsEmpty();
     }

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

@@ -95,6 +95,7 @@ protected Object[][] getContents() {
                 { "ignore-concurrent-modification", Messages.CliArgs_ignore_concurrent_modification }, //$NON-NLS-1$
                 { "db-type", Messages.CliArgs_db_type }, //$NON-NLS-1$
                 { "update-project", Messages.CliArgs_update_project }, //$NON-NLS-1$
+                { "structure-file", Messages.CliArgs_structure_file }, //$NON-NLS-1$
                 { "graph-depth", Messages.CliArgs_graph_depth }, //$NON-NLS-1$
                 { "graph-reverse", Messages.CliArgs_graph_reverse }, //$NON-NLS-1$
                 { "graph-name", Messages.CliArgs_graph_name }, //$NON-NLS-1$

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

@@ -37,6 +37,7 @@ public class Messages {
     public static String CliArgs_error_run_on_non_jdbc;
     public static String CliArgs_error_source_dest;
     public static String CliArgs_error_source_null;
+    public static String CliArgs_error_structure_file_with_update;
     public static String CliArgs_error_target_non_db;
     public static String CliArgs_error_wrong_db_type;
     public static String CliArgs_error_wrong_mode;
@@ -78,6 +79,7 @@ public class Messages {
     public static String CliArgs_src_lib_no_priv;
     public static String CliArgs_src_lib_xml;
     public static String CliArgs_stop_not_allowed;
+    public static String CliArgs_structure_file;
     public static String CliArgs_target;
     public static String CliArgs_tgt_lib;
     public static String CliArgs_tgt_lib_no_priv;

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

@@ -37,6 +37,8 @@ CliArgs_error_source_dest = Please specify both SOURCE and DEST.
 
 CliArgs_error_source_null = Please specify SOURCE.
 
+CliArgs_error_structure_file_with_update = --structure-file cannot be used with --update-project.
+
 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
@@ -117,6 +119,8 @@ CliArgs_src_lib_xml = add xml with libraries to source\nspecify multiple times t
 
 CliArgs_stop_not_allowed = exit with an error when --allowed-object hides a dependency statement from the script
 
+CliArgs_structure_file = path to a properties file with directory layout overrides for parse mode
+
 CliArgs_target = destination for schema changes (diff mode only)
 
 CliArgs_tgt_lib = add library to destination\nspecify multiple times to use several libraries

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

@@ -37,6 +37,8 @@ CliArgs_error_source_dest = \u041F\u043E\u0436\u0430\u043B\u0443\u0439\u0441\u04
 
 CliArgs_error_source_null = \u041F\u043E\u0436\u0430\u043B\u0443\u0439\u0441\u0442\u0430, \u0443\u043A\u0430\u0436\u0438\u0442\u0435 SOURCE.
 
+CliArgs_error_structure_file_with_update = --structure-file \u043D\u0435\u043B\u044C\u0437\u044F \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0441 --update-project.
+
 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
@@ -117,6 +119,8 @@ CliArgs_src_lib_xml = \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C xml \u044
 
 CliArgs_stop_not_allowed = \u0432\u044B\u0445\u043E\u0434\u0438\u0442\u044C \u0441 \u043E\u0448\u0438\u0431\u043A\u043E\u0439, \u043A\u043E\u0433\u0434\u0430 --allowed-object \u0441\u043A\u0440\u044B\u0432\u0430\u0435\u0442 \u0437\u0430\u0432\u0438\u0441\u0438\u043C\u044B\u0439 \u043E\u0431\u044A\u0435\u043A\u0442 \u0438\u0437 \u0441\u043A\u0440\u0438\u043F\u0442\u0430
 
+CliArgs_structure_file = \u043F\u0443\u0442\u044C \u043A properties-\u0444\u0430\u0439\u043B\u0443 \u0441 \u0430\u043B\u044C\u0442\u0435\u0440\u043D\u0430\u0442\u0438\u0432\u043D\u043E\u0439 \u0441\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u043E\u0439 \u0434\u0438\u0440\u0435\u043A\u0442\u043E\u0440\u0438\u0439 \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432 \u0434\u043B\u044F \u0440\u0435\u0436\u0438\u043C\u0430 parse
+
 CliArgs_target = \u043F\u0440\u0438\u0435\u043C\u043D\u0438\u043A \u0434\u043B\u044F \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u0439 \u0441\u0445\u0435\u043C\u044B (\u0442\u043E\u043B\u044C\u043A\u043E \u0432 \u0440\u0435\u0436\u0438\u043C\u0435 \u0441\u0440\u0430\u0432\u043D\u0435\u043D\u0438\u044F)
 
 CliArgs_tgt_lib = \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0443 \u043A \u043F\u0440\u0438\u0435\u043C\u043D\u0438\u043A\u0443\n\u0443\u043A\u0430\u0436\u0438\u0442\u0435 \u043D\u0435\u0441\u043A\u043E\u043B\u044C\u043A\u043E \u0440\u0430\u0437, \u0447\u0442\u043E\u0431\u044B \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u043D\u0435\u0441\u043A\u043E\u043B\u044C\u043A\u043E \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A

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

@@ -135,6 +135,9 @@ Usage
  --stop-not-allowed                     : exit with an error when
                                           --allowed-object hides a dependency
                                           statement from the script
+ --structure-file <path>                : path to a properties file with
+                                          directory layout overrides for parse
+                                          mode
  --target (-t) <path or JDBC>           : destination for schema changes (diff
                                           mode only)
  --tgt-lib <path or JDBC>               : add library to destination