firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 02:03:04 +01:00
Code Issues

Fixed CORE-1232 - wrong behaviour of services manager during backup/restore operations

Browse Source
This commit is contained in:
alexpeshkoff 2007-04-26 14:59:46 +00:00
parent 4ff7adfec2
commit 3a772eaf58
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/jrd/svc.cpp
View File

@ -2779,10 +2779,6 @@ static bool process_switches(Firebird::ClumpletReader& spb,
* Loop through the appropriate switch table
* looking for the text for the given command switch.
*
* Calling this function with switches = NULL returns
* the number of bytes to allocate for the switches and
* parameters.
*
**************************************/
if (spb.getBufferLength() == 0)
return false;
@ -2791,6 +2787,8 @@ static bool process_switches(Firebird::ClumpletReader& spb,
const UCHAR svc_action = spb.getClumpTag();
spb.moveNext();
Firebird::string burp_database, burp_backup;
int burp_options = 0;
bool found = false;
do
@ -2915,19 +2913,23 @@ static bool process_switches(Firebird::ClumpletReader& spb,
case isc_action_svc_restore:
switch (spb.getClumpTag()) {
case isc_spb_bkp_file:
get_action_svc_string(spb, burp_backup);
break;
case isc_spb_dbname:
case isc_spb_sql_role_name:
get_action_svc_string(spb, switches);
get_action_svc_string(spb, burp_database);
break;
case isc_spb_options:
burp_options |= spb.getInt();
if (!get_action_svc_bitmask(spb, burp_in_sw_table, switches))
{
return false;
}
break;
case isc_spb_bkp_length:
get_action_svc_data(spb, burp_backup);
break;
case isc_spb_res_length:
get_action_svc_data(spb, switches);
get_action_svc_data(spb, burp_database);
break;
case isc_spb_bkp_factor:
case isc_spb_res_buffers:
@ -3004,6 +3006,23 @@ static bool process_switches(Firebird::ClumpletReader& spb,
spb.moveNext();
} while (! spb.isEof());
// postfixes for burp
switch (svc_action)
{
case isc_action_svc_backup:
switches += (burp_database + burp_backup);
break;
case isc_action_svc_restore:
if (! (burp_options & (isc_spb_res_create | isc_spb_res_replace)))
{
// user not specified create or replace database
// default to create for restore
switches += "-CREATE_DATABASE ";
}
switches += (burp_backup + burp_database);
break;
}
switches.rtrim();
return switches.length() > 0;
}