Skip to content

Commit 0a55df7

Browse files
committed
Merge branch 'DBTOOLS-1725_add_dependencies_in_param' into 'master'
DBTOOLS-1725:Added additional deps loading param See merge request codekeeper/pgcodekeeper-cli!38
2 parents 89229c8 + db44a4e commit 0a55df7

10 files changed

Lines changed: 55 additions & 25 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
99

1010
### Added
1111

12+
- Added the `--additional-dependencies` parameter, which allows you to specify the path to a file with additional dependencies.
13+
1214
### Changed
1315

1416
### Fixed

CHANGELOG.ru.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
### Добавлено
1111

12+
- Добавлен параметр `--additional-dependencies`, позволяющий указывать путь до файла с дополнительными зависимостями.
13+
1214
### Изменено
1315

1416
### Исправлено

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,9 @@ enum CliMode {
269269
@Option(name = "--disable-auto-load", usage = "disable-auto-load")
270270
private boolean disableAutoLoad;
271271

272+
@Option(name="--additional-dependencies", metaVar=CliArgsLocalizationsBundle.PATH, usage="additional-dependencies")
273+
private String additionalDependencies;
274+
272275
@Option(name = "--use-actual-syntax", usage = "use-actual-syntax")
273276
private boolean isUseActualVersionSyntax;
274277

@@ -529,6 +532,10 @@ public boolean isDisableAutoLoad() {
529532
return disableAutoLoad;
530533
}
531534

535+
public String getAdditionalDependencies() {
536+
return additionalDependencies;
537+
}
538+
532539
@Override
533540
public CliArgs copy() {
534541
var args = new CliArgs();
@@ -585,6 +592,7 @@ public CliArgs copy() {
585592
args.provider = provider;
586593
args.clusterName = clusterName;
587594
args.parallelLoad = parallelLoad;
595+
args.additionalDependencies = additionalDependencies;
588596
args.isUseActualVersionSyntax = isUseActualVersionSyntax;
589597
return args;
590598
}
@@ -703,6 +711,7 @@ private void checkModeParams() throws CmdLineException {
703711
badArgWithCorrectModes(!graphNames.isEmpty(), "--graph-name", CliMode.GRAPH); //$NON-NLS-1$
704712
badArgWithCorrectModes(DEFAULT_DEPTH != graphDepth, "--graph-depth", CliMode.GRAPH); //$NON-NLS-1$
705713
badArgWithCorrectModes(!graphFilterTypes.isEmpty(), "--graph-filter-object", CliMode.GRAPH); //$NON-NLS-1$
714+
badArgWithCorrectModes(additionalDependencies != null, "--additional-dependencies", CliMode.DIFF); //$NON-NLS-1$
706715
badArgWithCorrectModes(isUseActualVersionSyntax, "--use-actual-syntax", CliMode.DIFF); //$NON-NLS-1$
707716
}
708717

@@ -771,4 +780,4 @@ private <T> boolean containsInArray(T element, T[] elements) {
771780

772781
return false;
773782
}
774-
}
783+
}

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.pgcodekeeper.core.api.PgCodeKeeperApi;
2020
import org.pgcodekeeper.core.database.api.IDatabaseProvider;
2121
import org.pgcodekeeper.core.database.api.loader.ILoader;
22+
import org.pgcodekeeper.core.dependencieslist.DependenciesReader;
2223
import org.pgcodekeeper.core.settings.DiffSettings;
2324

2425
import java.io.IOException;
@@ -69,6 +70,10 @@ public String createDiff() throws InterruptedException, IOException {
6970
arguments.getSourceLibXmls(), arguments.getSourceLibs(), arguments.getSourceLibsWithoutPriv());
7071
var newDbLoader = getDatabaseLoader(arguments.getNewSrc(),
7172
arguments.getTargetLibXmls(), arguments.getTargetLibs(), arguments.getTargetLibsWithoutPriv());
73+
74+
if (arguments.getAdditionalDependencies() != null) {
75+
addAdditionalDependencies();
76+
}
7277
var script = PgCodeKeeperApi.diff(arguments.getProvider(), oldDbLoader, newDbLoader, diffSettings);
7378

7479
assertErrorsEmpty();
@@ -109,4 +114,9 @@ private void addIgnoreLists() throws IOException {
109114
diffSettings.addIgnoreSchemaList(Paths.get(arguments.getIgnoreSchemaList()));
110115
}
111116
}
117+
118+
private void addAdditionalDependencies() {
119+
var additionalDependencies = DependenciesReader.getDependencies(Paths.get(arguments.getAdditionalDependencies()));
120+
diffSettings.addAdditionalDependencies(additionalDependencies);
121+
}
112122
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ protected Object[][] getContents() {
102102
{"graph-invert-filter", Messages.CliArgs_graph_invert_filter}, //$NON-NLS-1$
103103
{"parallel-load", Messages.CliArgs_use_parallel_load}, //$NON-NLS-1$
104104
{"disable-auto-load", Messages.CliArgs_disable_auto_load}, //$NON-NLS-1$
105+
{"additional-dependencies", Messages.CliArgs_deps_file}, //$NON-NLS-1$
105106
{"use-actual-syntax", Messages.CliArgs_use_actual_syntax} //$NON-NLS-1$
106107
};
107108
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ public class Messages {
9090
public static String Main_cach_clear;
9191
public static String Main_danger_statements;
9292
public static String Main_log_apply_migration_script;
93+
public static String CliArgs_deps_file;
9394
public static String Main_log_build_graph_deps;
9495
public static String Main_log_contains_dangerous_statements;
9596
public static String Main_log_create_script;

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ CliArgs_cluster_name = the name of the cluster that will be applied to all table
88
CliArgs_comments_to_end = print comments at the end of the script
99
CliArgs_concurrently_mode = print CREATE INDEX with CONCURRENTLY option for PostgreSQL and WITH ONLINE = ON for MS SQL
1010
CliArgs_db_type = specify database type for work: PG, MS, CH
11+
CliArgs_deps_file = add a file with a list of additional dependencies
1112
CliArgs_disable_auto_load = disable automatic loading of project auxiliary files
1213
CliArgs_drop_before_create = print DROP before CREATE statement
1314
CliArgs_enable_function_bodies_dependencies = enable dependencies from bodies of functions and procedures to other functions or procedures
@@ -51,14 +52,14 @@ CliArgs_selected_only = build the script using 'selected' objects only, hide sta
5152
CliArgs_show_error = print exception stacktrace
5253
CliArgs_simplify_views = simple formatting for VIEWs when reading via JDBC (not recomended by PostgreSQL)
5354
CliArgs_source = source of schema changes
54-
CliArgs_src_lib = add library dependency to source\nspecify multiple times to use several libraries
55-
CliArgs_src_lib_no_priv = add library dependency to source without privileges\nspecify multiple times to use several libraries
56-
CliArgs_src_lib_xml = add xml with library dependencies to source\nspecify multiple times to use several library xml's
55+
CliArgs_src_lib = add library to source\nspecify multiple times to use several libraries
56+
CliArgs_src_lib_no_priv = add library to source without privileges\nspecify multiple times to use several libraries
57+
CliArgs_src_lib_xml = add xml with libraries to source\nspecify multiple times to use several libraries xml's
5758
CliArgs_stop_not_allowed = exit with an error when --allowed-object hides a dependency statement from the script
5859
CliArgs_target = destination for schema changes (diff mode only)
59-
CliArgs_tgt_lib = add library dependency to destination\nspecify multiple times to use several libraries
60-
CliArgs_tgt_lib_no_priv = add library dependency to destination without privileges\nspecify multiple times to use several libraries
61-
CliArgs_tgt_lib_xml = add xml with library dependencies to target\nspecify multiple times to use several library xml's
60+
CliArgs_tgt_lib = add library to destination\nspecify multiple times to use several libraries
61+
CliArgs_tgt_lib_no_priv = add library to destination without privileges\nspecify multiple times to use several libraries
62+
CliArgs_tgt_lib_xml = add xml with libraries to target\nspecify multiple times to use several libraries xml's
6263
CliArgs_time_zone = use this timezone when working with database, also add SET TIMEZONE statement to the script
6364
CliArgs_update_project = update an existing project in parse mode
6465
CliArgs_use_actual_syntax = use the current syntax to generate the migration script (currently not implemented)

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ CliArgs_cluster_name = \u0438\u043C\u044F \u043A\u043B\u0430\u0441\u0442\u0435\u
88
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
99
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
1010
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
11+
CliArgs_deps_file = \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0444\u0430\u0439\u043B \u0441\u043E \u0441\u043F\u0438\u0441\u043A\u043E\u043C \u0434\u043E\u043F\u043E\u043B\u043D\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0445 \u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0441\u0442\u0435\u0439
1112
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
1213
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
1314
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
@@ -51,14 +52,14 @@ CliArgs_selected_only = \u043F\u043E\u0441\u0442\u0440\u043E\u0438\u0442\u044C \
5152
CliArgs_show_error = \u0432\u044B\u0432\u0435\u0441\u0442\u0438 \u0441\u0442\u0435\u043A\u0442\u0440\u0435\u0439\u0441 \u043E\u0448\u0438\u0431\u043A\u0438
5253
CliArgs_simplify_views = \u0443\u043F\u0440\u043E\u0449\u0435\u043D\u043D\u043E\u0435 \u0444\u043E\u0440\u043C\u0430\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u043F\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043B\u0435\u043D\u0438\u0439 \u043F\u0440\u0438 \u0447\u0442\u0435\u043D\u0438\u0438 \u0447\u0435\u0440\u0435\u0437 JDBC (\u043D\u0435 \u0440\u0435\u043A\u043E\u043C\u0435\u043D\u0434\u0443\u0435\u0442\u0441\u044F PostgreSQL)
5354
CliArgs_source = \u0438\u0441\u0442\u043E\u0447\u043D\u0438\u043A \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u0439 \u0441\u0445\u0435\u043C\u044B
54-
CliArgs_src_lib = \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u0447\u043D\u0443\u044E \u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0441\u0442\u044C \u043A \u0438\u0441\u0442\u043E\u0447\u043D\u0438\u043A\u0443\n\u0443\u043A\u0430\u0437\u0430\u0442\u044C \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
55-
CliArgs_src_lib_no_priv = \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u0447\u043D\u0443\u044E \u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0441\u0442\u044C \u0431\u0435\u0437 \u043F\u0440\u0438\u0432\u0438\u043B\u0435\u0433\u0438\u0439 \u043A \u0438\u0441\u0442\u043E\u0447\u043D\u0438\u043A\u0443\n\u0443\u043A\u0430\u0437\u0430\u0442\u044C \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
56-
CliArgs_src_lib_xml = \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C xml \u0441 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u0447\u043D\u044B\u043C\u0438 \u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0441\u0442\u044F\u043C\u0438 \u043A \u0438\u0441\u0442\u043E\u0447\u043D\u0438\u043A\u0443\n\u0443\u043A\u0430\u0437\u0430\u0442\u044C \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 xml \u0441 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0430\u043C\u0438
55+
CliArgs_src_lib = \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0443 \u043A \u0438\u0441\u0442\u043E\u0447\u043D\u0438\u043A\u0443\n\u0443\u043A\u0430\u0437\u0430\u0442\u044C \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
56+
CliArgs_src_lib_no_priv = \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0443 \u0431\u0435\u0437 \u043F\u0440\u0438\u0432\u0438\u043B\u0435\u0433\u0438\u0439 \u043A \u0438\u0441\u0442\u043E\u0447\u043D\u0438\u043A\u0443\n\u0443\u043A\u0430\u0437\u0430\u0442\u044C \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
57+
CliArgs_src_lib_xml = \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C xml \u0441 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0430\u043C\u0438 \u043A \u0438\u0441\u0442\u043E\u0447\u043D\u0438\u043A\u0443\n\u0443\u043A\u0430\u0437\u0430\u0442\u044C \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 xml \u0441 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0430\u043C\u0438
5758
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
5859
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)
59-
CliArgs_tgt_lib = \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u0447\u043D\u0443\u044E \u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0441\u0442\u044C \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
60-
CliArgs_tgt_lib_no_priv = \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u0447\u043D\u0443\u044E \u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0441\u0442\u044C \u0431\u0435\u0437 \u043F\u0440\u0438\u0432\u0438\u043B\u0435\u0433\u0438\u0439 \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
61-
CliArgs_tgt_lib_xml = \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C xml \u0441 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u0447\u043D\u044B\u043C\u0438 \u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0441\u0442\u044F\u043C\u0438 \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 xml \u0441 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0430\u043C\u0438
60+
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
61+
CliArgs_tgt_lib_no_priv = \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0443 \u0431\u0435\u0437 \u043F\u0440\u0438\u0432\u0438\u043B\u0435\u0433\u0438\u0439 \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
62+
CliArgs_tgt_lib_xml = \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C xml \u0441 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0430\u043C\u0438 \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 xml \u0441 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0430\u043C\u0438
6263
CliArgs_time_zone = \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0443\u043A\u0430\u0437\u0430\u043D\u043D\u044B\u0439 \u0447\u0430\u0441\u043E\u0432\u043E\u0439 \u043F\u043E\u044F\u0441 \u043F\u0440\u0438 \u0440\u0430\u0431\u043E\u0442\u0435 \u0441 \u0431\u0430\u0437\u043E\u0439 \u0434\u0430\u043D\u043D\u044B\u0445, \u0430 \u0442\u0430\u043A\u0436\u0435 \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043E\u043F\u0435\u0440\u0430\u0442\u043E\u0440 SET TIMEZONE \u0432 \u0441\u043A\u0440\u0438\u043F\u0442
6364
CliArgs_update_project = \u043E\u0431\u043D\u043E\u0432\u0438\u0442\u044C \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044E\u0449\u0438\u0439 \u043F\u0440\u043E\u0435\u043A\u0442 \u0432 \u0440\u0435\u0436\u0438\u043C\u0435 parse
6465
CliArgs_use_actual_syntax = \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0430\u043A\u0442\u0443\u0430\u043B\u044C\u043D\u044B\u0439 \u0441\u0438\u043D\u0442\u0430\u043A\u0441\u0438\u0441 \u0434\u043B\u044F \u0444\u043E\u0440\u043C\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F \u0441\u043A\u0440\u0438\u043F\u0442\u0430 \u043C\u0438\u0433\u0440\u0430\u0446\u0438\u0438(\u0441\u0435\u0439\u0447\u0430\u0441 \u043D\u0435 \u0438\u043C\u0435\u0435\u0442 \u0440\u0435\u0430\u043B\u0438\u0437\u0430\u0446\u0438\u0438)

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ class CliArgsTest {
6060
"jdbc:postgresql:q jdbc:postgresql:q2 --cluster-name test;"
6161
+ "--cluster-name cannot be used with --db-type PG option",
6262

63+
"--mode PARSE --additional-dependencies .pgcodekeeperdeps;"
64+
+ "--additional-dependencies cannot be used with --mode PARSE option",
65+
6366
"--mode PARSE --use-actual-syntax;"
6467
+ "--use-actual-syntax cannot be used with --mode PARSE option"
6568
})

0 commit comments

Comments
 (0)