Merge branch 'DBTOOLS-1739_remove_deprecated_params' into 'master'

AxelCat · AxelCat · commit b71f74af62e9 · 2025-10-08T15:16:00.000+05:00
DBTOOLS-1739 removed deprecated params

See merge request codekeeper/pgcodekeeper-cli!15
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
+### Removed
+
+- Removed deprecated `--parse`, `--graph`, `--insert` parameters.
+
 ## [11.2.0] - 2025-09-23
 
 ### Added
diff --git a/CHANGELOG.ru.md b/CHANGELOG.ru.md
@@ -13,6 +13,10 @@
 
 ### Исправлено
 
+### Удалено
+
+- Удалены устаревшие параметры `--parse`, `--graph`, `--insert`.
+
 ## [11.2.0] - 2025-09-23
 
 ### Добавлено
diff --git a/src/main/java/org/pgcodekeeper/cli/CliArgs.java b/src/main/java/org/pgcodekeeper/cli/CliArgs.java
@@ -100,27 +100,6 @@ enum CliMode {
     @Option(name="--clear-lib-cache", help=true, usage="ClearLibCache")
     private boolean clearLibCache;
 
-    /**
-     * @deprecated replaced by --mode PARSE
-     */
-    @Deprecated(forRemoval=true)
-    @Option(name="--parse", depends="-o", forbids="--mode", usage="parse")
-    private boolean modeParse;
-
-    /**
-     * @deprecated replaced by --mode GRAPH
-     */
-    @Deprecated(forRemoval=true)
-    @Option(name="--graph", forbids="--mode", usage="graph")
-    private boolean modeGraph;
-
-    /**
-     * @deprecated replaced by --mode INSERT
-     */
-    @Deprecated(forRemoval=true)
-    @Option(name="--insert", forbids="--mode", usage="insert")
-    private boolean isInsertMode;
-
     @Option(name="--mode", usage="mode")
     private CliMode mode;
 
@@ -129,8 +108,7 @@ enum CliMode {
     @Argument(index=0, metaVar=CliArgsLocalizationsBundle.SOURCE, usage="source")
     private String newSrc;
 
-    @Option(name="-t", depends="-s", aliases="--target", metaVar=CliArgsLocalizationsBundle.PATH_OR_JDBC,
-            forbids={"--graph", "--parse", "--insert"}, usage="target")
+    @Option(name="-t", depends="-s", aliases="--target", metaVar=CliArgsLocalizationsBundle.PATH_OR_JDBC, usage="target")
     @Argument(index=1, metaVar=CliArgsLocalizationsBundle.DEST, usage="target")
     private String oldSrc;
 
@@ -635,9 +613,6 @@ public boolean parse(String[] args) throws CmdLineException {
             return false;
         }
 
-        // backwards compatibility
-        convertDeprecatedArguments();
-
         if (clearLibCache && CliMode.DIFF == mode && (oldSrc == null || newSrc == null)) {
             return true;
         }
@@ -657,16 +632,6 @@ public boolean parse(String[] args) throws CmdLineException {
         return true;
     }
 
-    private void convertDeprecatedArguments() {
-        if (modeParse) {
-            mode = CliMode.PARSE;
-        } else if (modeGraph) {
-            mode = CliMode.GRAPH;
-        } else if (isInsertMode) {
-            mode = CliMode.INSERT;
-        }
-    }
-
     private void checkParams() throws CmdLineException {
         if (CliMode.VERIFY == mode) {
             if (verifyRuleSetPath == null) {
diff --git a/src/main/java/org/pgcodekeeper/cli/localizations/CliArgsLocalizationsBundle.java b/src/main/java/org/pgcodekeeper/cli/localizations/CliArgsLocalizationsBundle.java
@@ -47,9 +47,6 @@ 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$
-            {"parse", Messages.CliArgs_parse}, //$NON-NLS-1$
-            {"graph", Messages.CliArgs_graph}, //$NON-NLS-1$
-            {"insert", Messages.CliArgs_insert}, //$NON-NLS-1$
             {"mode", Messages.CliArgs_mode}, //$NON-NLS-1$
             {"source", Messages.CliArgs_source}, //$NON-NLS-1$
             {"target", Messages.CliArgs_target}, //$NON-NLS-1$
diff --git a/src/main/java/org/pgcodekeeper/cli/localizations/Messages.java b/src/main/java/org/pgcodekeeper/cli/localizations/Messages.java
@@ -44,7 +44,6 @@ public class Messages {
     public static String CliArgs_generate_constraint_not_valid;
     public static String CliArgs_generate_exist;
     public static String CliArgs_generate_exist_do_block;
-    public static String CliArgs_graph;
     public static String CliArgs_graph_depth;
     public static String CliArgs_graph_filter_object;
     public static String CliArgs_graph_invert_filter;
@@ -57,7 +56,6 @@ public class Messages {
     public static String CliArgs_ignore_list;
     public static String CliArgs_ignore_schema;
     public static String CliArgs_in_charset;
-    public static String CliArgs_insert;
     public static String CliArgs_insert_filter;
     public static String CliArgs_insert_name;
     public static String CliArgs_keep_newlines;
@@ -69,7 +67,6 @@ public class Messages {
     public static String CliArgs_no_privileges;
     public static String CliArgs_out_charset;
     public static String CliArgs_output;
-    public static String CliArgs_parse;
     public static String CliArgs_post_script;
     public static String CliArgs_pre_script;
     public static String CliArgs_run_on;
diff --git a/src/main/resources/org/pgcodekeeper/cli/localizations/messages.properties b/src/main/resources/org/pgcodekeeper/cli/localizations/messages.properties
@@ -21,7 +21,6 @@ CliArgs_error_wrong_mode = %s cannot be used with --mode %s option
 CliArgs_generate_constraint_not_valid = print CONSTRAINT NOT VALID for no partitioned tables
 CliArgs_generate_exist = print CREATE IF NOT EXISTS / DROP IF EXISTS
 CliArgs_generate_exist_do_block = print creation of CONSTRAINT and IDENTITY in DO block (PG only)
-CliArgs_graph = deprecated option. Use --mode GRAPH. Run in graph mode to show objects dependencies
 CliArgs_graph_depth = depth of displayed dependencies in graph mode
 CliArgs_graph_filter_object = show these object types, hide other objects types
 CliArgs_graph_invert_filter = invert graph filter object types: hide objects specified by the filter
@@ -34,7 +33,6 @@ CliArgs_ignore_errors = do not stop on parse errors
 CliArgs_ignore_list = use an ignore list to include/exclude objects from diff\nspecify multiple times to use several lists
 CliArgs_ignore_schema = use an ignore schema list to include/exclude schemas at loading stage
 CliArgs_in_charset = input charset
-CliArgs_insert = deprecated option. Use --mode INSERT. Run in insert mode to collect data
 CliArgs_insert_filter = value of WHERE expression for initial select in insert mode
 CliArgs_insert_name = name of start object in data insert mode
 CliArgs_keep_newlines = keep newline characters as is (don't convert to Unix newlines)
@@ -46,7 +44,6 @@ CliArgs_no_check_function_bodies = set check_function_bodies to false at the beg
 CliArgs_no_privileges = ignore privileges and owners of database objects
 CliArgs_out_charset = output charset
 CliArgs_output = script output file or parser output directory
-CliArgs_parse = deprecated option. Use --mode PARSE. Run in parser mode to save database schema as a directory hierarchy
 CliArgs_post_script = POST script file path or directory with POST scripts\nnested directories are loaded recursively\nspecify multiple times to use several paths
 CliArgs_pre_script = PRE script file path or directory with PRE scripts\nnested directories are loaded recursively\nspecify multiple times to use several paths
 CliArgs_run_on = run generated script on the specified database
diff --git a/src/main/resources/org/pgcodekeeper/cli/localizations/messages_ru_RU.properties b/src/main/resources/org/pgcodekeeper/cli/localizations/messages_ru_RU.properties
@@ -21,7 +21,6 @@ CliArgs_error_wrong_mode = %s \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0438
 CliArgs_generate_constraint_not_valid = \u043F\u0435\u0447\u0430\u0442\u0430\u0442\u044C CONSTRAINT NOT VALID \u0434\u043B\u044F \u043D\u0435 \u043F\u0430\u0440\u0442\u0438\u0446\u0438\u043E\u043D\u043D\u044B\u0445 \u0442\u0430\u0431\u043B\u0438\u0446
 CliArgs_generate_exist = \u043F\u0435\u0447\u0430\u0442\u0430\u0442\u044C CREATE IF NOT EXISTS / DROP IF EXISTS
 CliArgs_generate_exist_do_block = \u043F\u0435\u0447\u0430\u0442\u0430\u0442\u044C CONSTRAINT \u0438 IDENTITY \u0432 \u0431\u043B\u043E\u043A\u0435 DO (\u0442\u043E\u043B\u044C\u043A\u043E PG)
-CliArgs_graph = \u0443\u0441\u0442\u0430\u0440\u0435\u0432\u0448\u0438\u0439 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440. \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439\u0442\u0435 --mode GRAPH. \u0417\u0430\u043F\u0443\u0441\u043A \u0432 \u0440\u0435\u0436\u0438\u043C\u0435 graph \u0434\u043B\u044F \u043E\u0442\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u044F \u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0441\u0442\u0435\u0439 \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432.
 CliArgs_graph_depth = \u0433\u043B\u0443\u0431\u0438\u043D\u0430 \u043E\u0442\u043E\u0431\u0440\u0430\u0436\u0430\u0435\u043C\u044B\u0445 \u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0441\u0442\u0435\u0439 \u0432 \u0440\u0435\u0436\u0438\u043C\u0435 graph
 CliArgs_graph_filter_object = \u043F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u044D\u0442\u0438 \u0442\u0438\u043F\u044B \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432, \u0441\u043A\u0440\u044B\u0442\u044C \u0434\u0440\u0443\u0433\u0438\u0435 \u0442\u0438\u043F\u044B \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432
 CliArgs_graph_invert_filter = \u0438\u043D\u0432\u0435\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0442\u0438\u043F\u044B \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432 \u0444\u0438\u043B\u044C\u0442\u0440\u0430 \u0433\u0440\u0430\u0444\u0430: \u0441\u043A\u0440\u044B\u0442\u044C \u043E\u0431\u044A\u0435\u043A\u0442\u044B, \u0443\u043A\u0430\u0437\u0430\u043D\u043D\u044B\u0435 \u0432 \u0444\u0438\u043B\u044C\u0442\u0440\u0435
@@ -34,7 +33,6 @@ CliArgs_ignore_errors = \u043D\u0435 \u043E\u0441\u0442\u0430\u043D\u0430\u0432\
 CliArgs_ignore_list = \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439\u0442\u0435 \u0441\u043F\u0438\u0441\u043E\u043A \u0438\u0433\u043D\u043E\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F \u0434\u043B\u044F \u0432\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u044F/\u0438\u0441\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u044F \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432 \u0438\u0437 \u0441\u043F\u0438\u0441\u043A\u0430 \u0440\u0430\u0437\u043B\u0438\u0447\u0438\u0439\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 \u0441\u043F\u0438\u0441\u043A\u043E\u0432
 CliArgs_ignore_schema = \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439\u0442\u0435 \u0441\u043F\u0438\u0441\u043E\u043A \u0438\u0433\u043D\u043E\u0440\u0438\u0440\u0443\u0435\u043C\u044B\u0445 \u0441\u0445\u0435\u043C \u0434\u043B\u044F \u0432\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u044F/\u0438\u0441\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u044F \u0441\u0445\u0435\u043C \u043D\u0430 \u044D\u0442\u0430\u043F\u0435 \u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0438
 CliArgs_in_charset = \u043A\u043E\u0434\u0438\u0440\u043E\u0432\u043A\u0430 \u0432\u0432\u043E\u0434\u0430
-CliArgs_insert = \u0443\u0441\u0442\u0430\u0440\u0435\u0432\u0448\u0438\u0439 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440. \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439\u0442\u0435 --mode INSERT. \u0417\u0430\u043F\u0443\u0441\u043A \u0432 \u0440\u0435\u0436\u0438\u043C\u0435 \u0432\u0441\u0442\u0430\u0432\u043A\u0438 \u0434\u043B\u044F \u0441\u0431\u043E\u0440\u0430 \u0434\u0430\u043D\u043D\u044B\u0445
 CliArgs_insert_filter = \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u0432\u044B\u0440\u0430\u0436\u0435\u043D\u0438\u044F WHERE \u0434\u043B\u044F \u043F\u0435\u0440\u0432\u043E\u043D\u0430\u0447\u0430\u043B\u044C\u043D\u043E\u0439 \u0432\u044B\u0431\u043E\u0440\u043A\u0438 \u0432 \u0440\u0435\u0436\u0438\u043C\u0435 insert
 CliArgs_insert_name = \u0438\u043C\u044F \u043D\u0430\u0447\u0430\u043B\u044C\u043D\u043E\u0433\u043E \u043E\u0431\u044A\u0435\u043A\u0442\u0430 \u0432 \u0440\u0435\u0436\u0438\u043C\u0435 insert
 CliArgs_keep_newlines = \u0441\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u0441\u0438\u043C\u0432\u043E\u043B\u044B \u043F\u0435\u0440\u0435\u043D\u043E\u0441\u0430 \u0441\u0442\u0440\u043E\u043A\u0438 \u043A\u0430\u043A \u0435\u0441\u0442\u044C (\u043D\u0435 \u043A\u043E\u043D\u0432\u0435\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0432 \u043F\u0435\u0440\u0435\u043D\u043E\u0441\u044B \u0441\u0442\u0440\u043E\u043A Unix)
@@ -46,7 +44,6 @@ CliArgs_no_check_function_bodies = \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u0
 CliArgs_no_privileges = \u0438\u0433\u043D\u043E\u0440\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043F\u0440\u0438\u0432\u0438\u043B\u0435\u0433\u0438\u0438 \u0438 \u0432\u043B\u0430\u0434\u0435\u043B\u044C\u0446\u0435\u0432 \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432 \u0431\u0430\u0437\u044B \u0434\u0430\u043D\u043D\u044B\u0445
 CliArgs_out_charset = \u043A\u043E\u0434\u0438\u0440\u043E\u0432\u043A\u0430 \u0432\u044B\u0432\u043E\u0434\u0430
 CliArgs_output = \u0444\u0430\u0439\u043B \u0432\u044B\u0432\u043E\u0434\u0430 \u0441\u043A\u0440\u0438\u043F\u0442\u0430 \u0438\u043B\u0438 \u043A\u0430\u0442\u0430\u043B\u043E\u0433 \u0432\u044B\u0432\u043E\u0434\u0430 \u043F\u0430\u0440\u0441\u0435\u0440\u0430
-CliArgs_parse = \u0443\u0441\u0442\u0430\u0440\u0435\u0432\u0448\u0438\u0439 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440. \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439\u0442\u0435 --mode PARSE. \u0417\u0430\u043F\u0443\u0441\u043A \u0432 \u0440\u0435\u0436\u0438\u043C\u0435 \u043F\u0430\u0440\u0441\u0435\u0440\u0430 \u0434\u043B\u044F \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u0438\u044F \u0441\u0445\u0435\u043C\u044B \u0431\u0430\u0437\u044B \u0434\u0430\u043D\u043D\u044B\u0445 \u0432 \u0432\u0438\u0434\u0435 \u0438\u0435\u0440\u0430\u0440\u0445\u0438\u0438 \u043A\u0430\u0442\u0430\u043B\u043E\u0433\u043E\u0432
 CliArgs_post_script = \u043F\u0443\u0442\u044C \u043A \u0444\u0430\u0439\u043B\u0443 POST \u0441\u043A\u0440\u0438\u043F\u0442\u0430 \u0438\u043B\u0438 \u043A\u0430\u0442\u0430\u043B\u043E\u0433\u0443 \u0441 POST \u0441\u043A\u0440\u0438\u043F\u0442\u0430\u043C\u0438\n\u0432\u043B\u043E\u0436\u0435\u043D\u043D\u044B\u0435 \u043A\u0430\u0442\u0430\u043B\u043E\u0433\u0438 \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u044E\u0442\u0441\u044F \u0440\u0435\u043A\u0443\u0440\u0441\u0438\u0432\u043D\u043E\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 \u043F\u0443\u0442\u0435\u0439
 CliArgs_pre_script = \u043F\u0443\u0442\u044C \u043A \u0444\u0430\u0439\u043B\u0443 PRE \u0441\u043A\u0440\u0438\u043F\u0442\u0430 \u0438\u043B\u0438 \u043A\u0430\u0442\u0430\u043B\u043E\u0433\u0443 \u0441 PRE \u0441\u043A\u0440\u0438\u043F\u0442\u0430\u043C\u0438\n\u0432\u043B\u043E\u0436\u0435\u043D\u043D\u044B\u0435 \u043A\u0430\u0442\u0430\u043B\u043E\u0433\u0438 \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u044E\u0442\u0441\u044F \u0440\u0435\u043A\u0443\u0440\u0441\u0438\u0432\u043D\u043E\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 \u043F\u0443\u0442\u0435\u0439
 CliArgs_run_on = \u0437\u0430\u043F\u0443\u0441\u0442\u0438\u0442\u044C \u0441\u0433\u0435\u043D\u0435\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0439 \u0441\u043A\u0440\u0438\u043F\u0442 \u0432 \u0443\u043A\u0430\u0437\u0430\u043D\u043D\u043E\u0439 \u0431\u0430\u0437\u0435 \u0434\u0430\u043D\u043D\u044B\u0445
diff --git a/src/test/java/org/pgcodekeeper/cli/CliArgsTest.java b/src/test/java/org/pgcodekeeper/cli/CliArgsTest.java
@@ -24,25 +24,25 @@ class CliArgsTest {
 
     @ParameterizedTest(name = "{0}")
     @CsvSource(delimiter = ';', value = {
-            "--parse;" +
-                    "option \"--parse\" requires the option(s) [-o];",
+            "--mode PARSE;" +
+                    "Please specify SOURCE.",
 
-            "--parse -o;" +
+            "--mode PARSE -o;" +
                     "Option \"-o (--output)\" takes an operand",
 
-            "--parse -s filename -t filename -o filename;" +
-                    "option \"-t (--target)\" cannot be used with the option(s) [--graph, --parse, --insert]",
+            "--mode PARSE -s filename -t filename -o filename;" +
+                    "-t (--target) cannot be used with --mode PARSE option",
 
-            "--graph --graph-name public.test --db-type MS jdbc:postgresql:q;" +
+            "--mode graph --graph-name public.test --db-type MS jdbc:postgresql:q;" +
                     "Cannot work with PG database as MS project.",
 
-            "--graph --graph-name dbo.test jdbc:sqlserver:f;"
+            "--mode graph --graph-name dbo.test jdbc:sqlserver:f;"
                     + "Cannot work with MS database as PG project.",
 
-            "--graph --graph-name public.test jdbc:postgresql:q jdbc:postgresql:q2;"
+            "--mode graph --graph-name public.test jdbc:postgresql:q jdbc:postgresql:q2;"
                     + "-t (--target) cannot be used with --mode GRAPH option",
 
-            "--graph --graph-name test;"
+            "--mode graph --graph-name test;"
                     + "Please specify SOURCE.",
 
             "--mode PARSE --graph-filter-object COLUMN jdbc:postgresql:q;"
@@ -152,9 +152,6 @@ class CliArgsTest {
 
             "--mode INSERT filename;"
                     + "Source must be a database.",
-
-            "--parse --mode INSERT -o filename;"
-                    + "option \"--parse\" cannot be used with the option(s) [--mode]",
     })
     void badArgsTest(String arguments, String message) {
         String[] args = arguments.split(" ");
diff --git a/src/test/java/org/pgcodekeeper/cli/OutputTest.java b/src/test/java/org/pgcodekeeper/cli/OutputTest.java
diff --git a/src/test/java/org/pgcodekeeper/cli/ParseTest.java b/src/test/java/org/pgcodekeeper/cli/ParseTest.java
diff --git a/src/test/resources/org/pgcodekeeper/cli/usage_check.txt b/src/test/resources/org/pgcodekeeper/cli/usage_check.txt
