Skip to content

Добавил ключ --restrict-key для команды pgsql #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
unhandled-exception merged 1 commit into from
Oct 16, 2025
Merged

Добавил ключ --restrict-key для команды pgsql #127

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions lib/console/commands/pgsql.p
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ pfConsoleCommandWithSubcommands
$self._settings[^self._parseConnectString[$self.CSQL.connectString]]
^self.assert($self._settings){"$self.CSQL.connectString" is an invalid connect string.}

^self.assignSubcommand[dump file_name.sql [--gzip|--bzip2] [--tables=t1,tp*] [--ignore=t1,tp*] [--only-data] [--no-owner] [--clean] [--no-acl] [--format=plain] [--jobs=n] [--lock-wait-timeout=n] [--column-inserts];$dump][
^self.assignSubcommand[dump file_name.sql [--gzip|--bzip2] [--tables=t1,tp*] [--ignore=t1,tp*] [--only-data] [--no-owner] [--clean] [--no-acl] [--format=plain] [--jobs=n] [--lock-wait-timeout=n] [--column-inserts] [--restrict-key=restrict_key];$dump][
$.help[Dump data to file.]
]
^self.assignSubcommand[schema [file_name] [--no-owner] [--clean] [--no-acl];$schema;
^self.assignSubcommand[schema [file_name] [--no-owner] [--clean] [--no-acl] [--restrict-key=restrict_key];$schema;
$.help[Dump a database schema.]
]
^self.assignSubcommand[table_schema table_name;$table_schema;
Expand Down Expand Up @@ -79,6 +79,7 @@ pfConsoleCommandWithSubcommands
## aSwitches.lock-timeout — таймаут ожидания лока базы в милисекундах
## aSwitches.column-inserts — Выгружать данные таблиц в виде команд INSERT с явным указанием столбцов
## aSwitches.compress[уровень|метод[:строка_информации]] — Указывает метод и/или уровень сжатия. В качестве метода сжатия можно выбрать gzip, lz4, zstd или none (без сжатия). В качестве дополнительной информации можно передать параметры сжатия.
## aSwitches.restrict-key — использовать предоставленную строку в качестве ключа \restrict psql в выводе выгрузки

$lFile[^aArgs.1.trim[]]
^if(def $lFile){
Expand All @@ -100,6 +101,10 @@ pfConsoleCommandWithSubcommands
}
}

^if(^aSwitches.contains[restrict-key]){
^lOptions.append{--restrict-key=$aSwitches.[restrict-key]}
}

^if(^aSwitches.contains[column-inserts]){
^lOptions.append{--column-inserts}
}
Expand Down Expand Up @@ -170,6 +175,7 @@ pfConsoleCommandWithSubcommands
## aSwitches.no-owner — убрать владльца из схемы
## aSwitches.clean — выдать команды на очистку базы
## aSwitches.no-acl — не выдавать grant/revoke-команды.
## aSwitches.restrict-key — использовать предоставленную строку в качестве ключа \restrict psql в выводе выгрузки
$lOptions[^self._defaultPsqlOptions[]]
^lOptions.append{--schema-only}

Expand All @@ -185,6 +191,10 @@ pfConsoleCommandWithSubcommands
^lOptions.append{--no-acl}
}

^if(^aSwitches.contains[restrict-key]){
^lOptions.append{--restrict-key=$aSwitches.[restrict-key]}
}

$lFile[^aArgs.1.trim[]]
$lPgdump[^file::exec[$self._pgdumpBin;$lEnv;$lOptions]]
$response:status[$lPgdump.status]
Expand Down