Skip to content

Commit 721329f

Browse files
asfernandesasfernandes
committed
Fix problem in gbak where a package name were being leaked to non-packaged routines.
1 parent 365bae7 commit 721329f

File tree

1 file changed

+40
-11
lines changed

1 file changed

+40
-11
lines changed

‎src/burp/backup.epp‎

Lines changed: 40 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2748,7 +2748,6 @@ void write_exceptions()
27482748
* each exception.
27492749
*
27502750
**************************************/
2751-
QualifiedMetaString name;
27522751
Firebird::IRequest* req_handle1 = nullptr;
27532752

27542753
BurpGlobals* tdgbl = BurpGlobals::getSpecific();
@@ -2759,6 +2758,8 @@ void write_exceptions()
27592758
X IN RDB$EXCEPTIONS
27602759
WITH X.RDB$SYSTEM_FLAG NE 1
27612760
{
2761+
QualifiedMetaString name;
2762+
27622763
put(tdgbl, rec_exception);
27632764

27642765
if (!X.RDB$SCHEMA_NAME.NULL)
@@ -2793,6 +2794,8 @@ void write_exceptions()
27932794
X IN RDB$EXCEPTIONS
27942795
WITH X.RDB$SYSTEM_FLAG MISSING OR X.RDB$SYSTEM_FLAG NE 1
27952796
{
2797+
QualifiedMetaString name;
2798+
27962799
put(tdgbl, rec_exception);
27972800

27982801
PUT_TEXT(att_exception_name, X.RDB$EXCEPTION_NAME);
@@ -2908,7 +2911,6 @@ void write_functions()
29082911
* each function.
29092912
*
29102913
**************************************/
2911-
QualifiedMetaString name;
29122914
Firebird::IRequest* req_handle1 = nullptr;
29132915

29142916
BurpGlobals* tdgbl = BurpGlobals::getSpecific();
@@ -2918,6 +2920,8 @@ void write_functions()
29182920
FOR (REQUEST_HANDLE req_handle1)
29192921
X IN RDB$FUNCTIONS WITH X.RDB$SYSTEM_FLAG NE 1
29202922
{
2923+
QualifiedMetaString name;
2924+
29212925
put(tdgbl, rec_function);
29222926

29232927
if (!X.RDB$SCHEMA_NAME.NULL)
@@ -2989,6 +2993,8 @@ void write_functions()
29892993
FOR (REQUEST_HANDLE req_handle1)
29902994
X IN RDB$FUNCTIONS WITH X.RDB$SYSTEM_FLAG MISSING OR X.RDB$SYSTEM_FLAG NE 1
29912995
{
2996+
QualifiedMetaString name;
2997+
29922998
put(tdgbl, rec_function);
29932999

29943000
PUT_TEXT(att_function_name, X.RDB$FUNCTION_NAME);
@@ -3189,7 +3195,6 @@ void write_generators()
31893195
*
31903196
**************************************/
31913197
Firebird::IRequest* req_handle1 = nullptr;
3192-
QualifiedMetaString name;
31933198

31943199
BurpGlobals* tdgbl = BurpGlobals::getSpecific();
31953200

@@ -3199,6 +3204,8 @@ void write_generators()
31993204
X IN RDB$GENERATORS
32003205
WITH X.RDB$SYSTEM_FLAG NE 1
32013206
{
3207+
QualifiedMetaString name;
3208+
32023209
put(tdgbl, rec_generator);
32033210

32043211
if (!X.RDB$SCHEMA_NAME.NULL)
@@ -3251,6 +3258,8 @@ void write_generators()
32513258
X IN RDB$GENERATORS
32523259
WITH X.RDB$SYSTEM_FLAG MISSING OR X.RDB$SYSTEM_FLAG NE 1
32533260
{
3261+
QualifiedMetaString name;
3262+
32543263
put(tdgbl, rec_generator);
32553264
PUT_TEXT(att_gen_generator, X.RDB$GENERATOR_NAME);
32563265
name.object = X.RDB$GENERATOR_NAME;
@@ -3280,6 +3289,8 @@ void write_generators()
32803289
X IN RDB$GENERATORS
32813290
WITH X.RDB$SYSTEM_FLAG MISSING OR X.RDB$SYSTEM_FLAG NE 1
32823291
{
3292+
QualifiedMetaString name;
3293+
32833294
put(tdgbl, rec_generator);
32843295
PUT_TEXT(att_gen_generator, X.RDB$GENERATOR_NAME);
32853296
name.object = X.RDB$GENERATOR_NAME;
@@ -3318,7 +3329,6 @@ void write_global_fields()
33183329
* each global field.
33193330
*
33203331
**************************************/
3321-
QualifiedMetaString name;
33223332
Firebird::IRequest* req_handle1 = nullptr;
33233333

33243334
BurpGlobals* tdgbl = BurpGlobals::getSpecific();
@@ -3335,6 +3345,8 @@ void write_global_fields()
33353345
X IN RDB$FIELDS WITH
33363346
X.RDB$SYSTEM_FLAG NE 1
33373347
{
3348+
QualifiedMetaString name;
3349+
33383350
put(tdgbl, rec_global_field);
33393351

33403352
if (!X.RDB$SCHEMA_NAME.NULL)
@@ -3415,6 +3427,8 @@ void write_global_fields()
34153427
X IN RDB$FIELDS WITH
34163428
X.RDB$SYSTEM_FLAG NE 1 OR
34173429
X.RDB$SYSTEM_FLAG MISSING
3430+
{
3431+
QualifiedMetaString name;
34183432

34193433
put(tdgbl, rec_global_field);
34203434

@@ -3474,7 +3488,7 @@ void write_global_fields()
34743488
put_int32 (att_field_precision, X.RDB$FIELD_PRECISION);
34753489

34763490
put(tdgbl, att_end);
3477-
3491+
}
34783492
END_FOR;
34793493
ON_ERROR
34803494
general_on_error();
@@ -3486,6 +3500,8 @@ void write_global_fields()
34863500
X IN RDB$FIELDS WITH
34873501
X.RDB$SYSTEM_FLAG NE 1 OR
34883502
X.RDB$SYSTEM_FLAG MISSING
3503+
{
3504+
QualifiedMetaString name;
34893505

34903506
put(tdgbl, rec_global_field);
34913507

@@ -3541,6 +3557,7 @@ void write_global_fields()
35413557
put_int32 (att_field_collation_id, X.RDB$COLLATION_ID);
35423558

35433559
put(tdgbl, att_end);
3560+
}
35443561
END_FOR;
35453562
ON_ERROR
35463563
general_on_error();
@@ -3564,7 +3581,6 @@ void write_packages()
35643581
* each package.
35653582
*
35663583
**************************************/
3567-
QualifiedMetaString name;
35683584
Firebird::IRequest* req_handle1 = nullptr;
35693585

35703586
BurpGlobals* tdgbl = BurpGlobals::getSpecific();
@@ -3574,6 +3590,8 @@ void write_packages()
35743590
X IN RDB$PACKAGES
35753591
WITH X.RDB$SYSTEM_FLAG NE 1
35763592
{
3593+
QualifiedMetaString name;
3594+
35773595
put(tdgbl, rec_package);
35783596

35793597
if (!X.RDB$SCHEMA_NAME.NULL)
@@ -3637,7 +3655,6 @@ void write_procedures()
36373655
* each stored procedure.
36383656
*
36393657
**************************************/
3640-
QualifiedMetaString name;
36413658
Firebird::IRequest* req_handle1 = nullptr;
36423659

36433660
BurpGlobals* tdgbl = BurpGlobals::getSpecific();
@@ -3648,6 +3665,8 @@ void write_procedures()
36483665
X IN RDB$PROCEDURES
36493666
WITH X.RDB$SYSTEM_FLAG MISSING OR X.RDB$SYSTEM_FLAG NE 1
36503667
{
3668+
QualifiedMetaString name;
3669+
36513670
put(tdgbl, rec_procedure);
36523671

36533672
if (!X.RDB$SCHEMA_NAME.NULL)
@@ -3715,6 +3734,8 @@ void write_procedures()
37153734
X IN RDB$PROCEDURES
37163735
WITH X.RDB$SYSTEM_FLAG MISSING OR X.RDB$SYSTEM_FLAG NE 1
37173736
{
3737+
QualifiedMetaString name;
3738+
37183739
put(tdgbl, rec_procedure);
37193740

37203741
PUT_TEXT(att_procedure_name, X.RDB$PROCEDURE_NAME);
@@ -3991,7 +4012,6 @@ void write_rel_constraints()
39914012
* each relation constraint.
39924013
*
39934014
**************************************/
3994-
QualifiedMetaString name;
39954015
Firebird::IRequest* req_handle1 = nullptr;
39964016

39974017
BurpGlobals* tdgbl = BurpGlobals::getSpecific();
@@ -4003,6 +4023,8 @@ void write_rel_constraints()
40034023
REL.RDB$RELATION_NAME EQ X.RDB$RELATION_NAME AND
40044024
(REL.RDB$SYSTEM_FLAG MISSING OR REL.RDB$SYSTEM_FLAG NE 1)
40054025
{
4026+
QualifiedMetaString name;
4027+
40064028
put(tdgbl, rec_rel_constraint);
40074029

40084030
if (!X.RDB$SCHEMA_NAME.NULL)
@@ -4046,7 +4068,6 @@ void write_relations()
40464068
* each relation.
40474069
*
40484070
**************************************/
4049-
QualifiedMetaString name;
40504071
Firebird::IRequest* req_handle1 = nullptr;
40514072

40524073
BurpGlobals* tdgbl = BurpGlobals::getSpecific();
@@ -4063,6 +4084,8 @@ void write_relations()
40634084
X IN RDB$RELATIONS WITH X.RDB$SYSTEM_FLAG NE 1 OR
40644085
X.RDB$SYSTEM_FLAG MISSING
40654086
{
4087+
QualifiedMetaString name;
4088+
40664089
SSHORT flags = 0;
40674090
put(tdgbl, rec_relation);
40684091

@@ -4141,6 +4164,8 @@ void write_relations()
41414164
X IN RDB$RELATIONS WITH X.RDB$SYSTEM_FLAG NE 1 OR
41424165
X.RDB$SYSTEM_FLAG MISSING
41434166
{
4167+
QualifiedMetaString name;
4168+
41444169
SSHORT flags = 0;
41454170
put(tdgbl, rec_relation);
41464171
PUT_TEXT(att_relation_name, X.RDB$RELATION_NAME);
@@ -4523,7 +4548,6 @@ void write_triggers()
45234548
* write the triggers in rdb$triggers
45244549
*
45254550
**************************************/
4526-
QualifiedMetaString name;
45274551
Firebird::IRequest* req_handle1 = nullptr;
45284552

45294553
BurpGlobals* tdgbl = BurpGlobals::getSpecific();
@@ -4541,6 +4565,8 @@ void write_triggers()
45414565
X.RDB$SYSTEM_FLAG NE 1 OR
45424566
X.RDB$SYSTEM_FLAG MISSING
45434567
{
4568+
QualifiedMetaString name;
4569+
45444570
put(tdgbl, rec_trigger);
45454571

45464572
if (!X.RDB$SCHEMA_NAME.NULL)
@@ -4602,6 +4628,8 @@ void write_triggers()
46024628
X.RDB$SYSTEM_FLAG NE 1 OR
46034629
X.RDB$SYSTEM_FLAG MISSING
46044630
{
4631+
QualifiedMetaString name;
4632+
46054633
put(tdgbl, rec_trigger);
46064634

46074635
PUT_TEXT(att_trig_name, X.RDB$TRIGGER_NAME);
@@ -4648,7 +4676,6 @@ void write_trigger_messages()
46484676
* each trigger message.
46494677
*
46504678
**************************************/
4651-
QualifiedMetaString name;
46524679
Firebird::IRequest* req_handle1 = nullptr;
46534680

46544681
BurpGlobals* tdgbl = BurpGlobals::getSpecific();
@@ -4660,6 +4687,8 @@ void write_trigger_messages()
46604687
X.RDB$TRIGGER_NAME EQ T.RDB$TRIGGER_NAME AND
46614688
T.RDB$SYSTEM_FLAG NE 1 OR T.RDB$SYSTEM_FLAG MISSING
46624689
{
4690+
QualifiedMetaString name;
4691+
46634692
put(tdgbl, rec_trigger_message);
46644693

46654694
if (!X.RDB$SCHEMA_NAME.NULL)

0 commit comments

Comments
 (0)