db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-01-18 04:58:51 +02:00
Code Issues Releases Activity

Remove command overrides for restore-only options.

Browse Source 
The overrides are not needed since these options are only valid for one command.
This commit is contained in:
David Steele 2021-10-12 08:53:12 -04:00
parent 576b047634
commit e8e346bc87
2 changed files with 80 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/build/config/config.yaml
View File

@ -356,65 +356,65 @@ option:
target:
type: string
command:
restore:
depend:
option: type
list:
- lsn
- name
- time
- xid
restore: {}
depend:
option: type
list:
- lsn
- name
- time
- xid
command-role:
main: {}
target-action:
type: string
default: pause
command:
restore:
allow-list:
- pause
- promote
- shutdown
default: pause
depend:
option: type
list:
- immediate
- lsn
- name
- time
- xid
restore: {}
allow-list:
- pause
- promote
- shutdown
depend:
option: type
list:
- immediate
- lsn
- name
- time
- xid
command-role:
main: {}
target-exclusive:
type: boolean
default: false
command:
restore:
default: false
depend:
option: type
list:
- lsn
- time
- xid
restore: {}
depend:
option: type
list:
- lsn
- time
- xid
command-role:
main: {}
target-timeline:
type: string
required: false
command:
restore:
required: false
depend:
option: type
list:
- default
- lsn
- name
- standby
- time
- xid
restore: {}
depend:
option: type
list:
- default
- lsn
- name
- standby
- time
- xid
command-role:
main: {}

100
src/config/parse.auto.c
View File

@ -6378,19 +6378,14 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
PARSE_RULE_OPTION_OPTIONAL_LIST
(
PARSE_RULE_OPTION_OPTIONAL_COMMAND_OVERRIDE
PARSE_RULE_OPTION_OPTIONAL_DEPEND_LIST
(
PARSE_RULE_OPTION_OPTIONAL_COMMAND(cfgCmdRestore),
PARSE_RULE_OPTION_OPTIONAL_DEPEND_LIST
(
cfgOptType,
"lsn",
"name",
"time",
"xid"
),
)
cfgOptType,
"lsn",
"name",
"time",
"xid"
),
),
),
@ -6409,29 +6404,24 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
PARSE_RULE_OPTION_OPTIONAL_LIST
(
PARSE_RULE_OPTION_OPTIONAL_COMMAND_OVERRIDE
PARSE_RULE_OPTION_OPTIONAL_ALLOW_LIST
(
PARSE_RULE_OPTION_OPTIONAL_COMMAND(cfgCmdRestore),
"pause",
"promote",
"shutdown"
),
PARSE_RULE_OPTION_OPTIONAL_ALLOW_LIST
(
"pause",
"promote",
"shutdown"
),
PARSE_RULE_OPTION_OPTIONAL_DEPEND_LIST
(
cfgOptType,
"immediate",
"lsn",
"name",
"time",
"xid"
),
PARSE_RULE_OPTION_OPTIONAL_DEPEND_LIST
(
cfgOptType,
"immediate",
"lsn",
"name",
"time",
"xid"
),
PARSE_RULE_OPTION_OPTIONAL_DEFAULT("pause"),
)
PARSE_RULE_OPTION_OPTIONAL_DEFAULT("pause"),
),
),
@ -6450,20 +6440,15 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
PARSE_RULE_OPTION_OPTIONAL_LIST
(
PARSE_RULE_OPTION_OPTIONAL_COMMAND_OVERRIDE
PARSE_RULE_OPTION_OPTIONAL_DEPEND_LIST
(
PARSE_RULE_OPTION_OPTIONAL_COMMAND(cfgCmdRestore),
cfgOptType,
"lsn",
"time",
"xid"
),
PARSE_RULE_OPTION_OPTIONAL_DEPEND_LIST
(
cfgOptType,
"lsn",
"time",
"xid"
),
PARSE_RULE_OPTION_OPTIONAL_DEFAULT("0"),
)
PARSE_RULE_OPTION_OPTIONAL_DEFAULT("0"),
),
),
@ -6472,7 +6457,7 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
(
PARSE_RULE_OPTION_NAME("target-timeline"),
PARSE_RULE_OPTION_TYPE(cfgOptTypeString),
PARSE_RULE_OPTION_REQUIRED(true),
PARSE_RULE_OPTION_REQUIRED(false),
PARSE_RULE_OPTION_SECTION(cfgSectionCommandLine),
PARSE_RULE_OPTION_COMMAND_ROLE_MAIN_VALID_LIST
@ -6482,23 +6467,16 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
PARSE_RULE_OPTION_OPTIONAL_LIST
(
PARSE_RULE_OPTION_OPTIONAL_COMMAND_OVERRIDE
PARSE_RULE_OPTION_OPTIONAL_DEPEND_LIST
(
PARSE_RULE_OPTION_OPTIONAL_COMMAND(cfgCmdRestore),
PARSE_RULE_OPTION_OPTIONAL_DEPEND_LIST
(
cfgOptType,
"default",
"lsn",
"name",
"standby",
"time",
"xid"
),
PARSE_RULE_OPTION_OPTIONAL_REQUIRED(false),
)
cfgOptType,
"default",
"lsn",
"name",
"standby",
"time",
"xid"
),
),
),