@@ -3080,6 +3080,7 @@ dumpPolicy(Archive *fout, PolicyInfo *polinfo)
3080
3080
PQExpBuffer query ;
3081
3081
PQExpBuffer delqry ;
3082
3082
const char * cmd ;
3083
+ char * tag ;
3083
3084
3084
3085
if (dopt -> dataOnly )
3085
3086
return ;
@@ -3147,8 +3148,10 @@ dumpPolicy(Archive *fout, PolicyInfo *polinfo)
3147
3148
appendPQExpBuffer (delqry , "DROP POLICY %s" , fmtId (polinfo -> polname ));
3148
3149
appendPQExpBuffer (delqry , " ON %s;\n" , fmtId (tbinfo -> dobj .name ));
3149
3150
3151
+ tag = psprintf ("%s %s" , tbinfo -> dobj .name , polinfo -> dobj .name );
3152
+
3150
3153
ArchiveEntry (fout , polinfo -> dobj .catId , polinfo -> dobj .dumpId ,
3151
- polinfo -> dobj . name ,
3154
+ tag ,
3152
3155
polinfo -> dobj .namespace -> dobj .name ,
3153
3156
NULL ,
3154
3157
tbinfo -> rolname , false,
@@ -3157,6 +3160,7 @@ dumpPolicy(Archive *fout, PolicyInfo *polinfo)
3157
3160
NULL , 0 ,
3158
3161
NULL , NULL );
3159
3162
3163
+ free (tag );
3160
3164
destroyPQExpBuffer (query );
3161
3165
destroyPQExpBuffer (delqry );
3162
3166
}
@@ -14832,6 +14836,7 @@ dumpAttrDef(Archive *fout, AttrDefInfo *adinfo)
14832
14836
int adnum = adinfo -> adnum ;
14833
14837
PQExpBuffer q ;
14834
14838
PQExpBuffer delq ;
14839
+ char * tag ;
14835
14840
14836
14841
/* Skip if table definition not to be dumped */
14837
14842
if (!tbinfo -> dobj .dump || dopt -> dataOnly )
@@ -14860,8 +14865,10 @@ dumpAttrDef(Archive *fout, AttrDefInfo *adinfo)
14860
14865
appendPQExpBuffer (delq , "ALTER COLUMN %s DROP DEFAULT;\n" ,
14861
14866
fmtId (tbinfo -> attnames [adnum - 1 ]));
14862
14867
14868
+ tag = psprintf ("%s %s" , tbinfo -> dobj .name , tbinfo -> attnames [adnum - 1 ]);
14869
+
14863
14870
ArchiveEntry (fout , adinfo -> dobj .catId , adinfo -> dobj .dumpId ,
14864
- tbinfo -> attnames [ adnum - 1 ] ,
14871
+ tag ,
14865
14872
tbinfo -> dobj .namespace -> dobj .name ,
14866
14873
NULL ,
14867
14874
tbinfo -> rolname ,
@@ -14870,6 +14877,7 @@ dumpAttrDef(Archive *fout, AttrDefInfo *adinfo)
14870
14877
NULL , 0 ,
14871
14878
NULL , NULL );
14872
14879
14880
+ free (tag );
14873
14881
destroyPQExpBuffer (q );
14874
14882
destroyPQExpBuffer (delq );
14875
14883
}
@@ -15010,6 +15018,7 @@ dumpConstraint(Archive *fout, ConstraintInfo *coninfo)
15010
15018
TableInfo * tbinfo = coninfo -> contable ;
15011
15019
PQExpBuffer q ;
15012
15020
PQExpBuffer delq ;
15021
+ char * tag = NULL ;
15013
15022
15014
15023
/* Skip if not to be dumped */
15015
15024
if (!coninfo -> dobj .dump || dopt -> dataOnly )
@@ -15103,8 +15112,10 @@ dumpConstraint(Archive *fout, ConstraintInfo *coninfo)
15103
15112
appendPQExpBuffer (delq , "DROP CONSTRAINT %s;\n" ,
15104
15113
fmtId (coninfo -> dobj .name ));
15105
15114
15115
+ tag = psprintf ("%s %s" , tbinfo -> dobj .name , coninfo -> dobj .name );
15116
+
15106
15117
ArchiveEntry (fout , coninfo -> dobj .catId , coninfo -> dobj .dumpId ,
15107
- coninfo -> dobj . name ,
15118
+ tag ,
15108
15119
tbinfo -> dobj .namespace -> dobj .name ,
15109
15120
indxinfo -> tablespace ,
15110
15121
tbinfo -> rolname , false,
@@ -15136,8 +15147,10 @@ dumpConstraint(Archive *fout, ConstraintInfo *coninfo)
15136
15147
appendPQExpBuffer (delq , "DROP CONSTRAINT %s;\n" ,
15137
15148
fmtId (coninfo -> dobj .name ));
15138
15149
15150
+ tag = psprintf ("%s %s" , tbinfo -> dobj .name , coninfo -> dobj .name );
15151
+
15139
15152
ArchiveEntry (fout , coninfo -> dobj .catId , coninfo -> dobj .dumpId ,
15140
- coninfo -> dobj . name ,
15153
+ tag ,
15141
15154
tbinfo -> dobj .namespace -> dobj .name ,
15142
15155
NULL ,
15143
15156
tbinfo -> rolname , false,
@@ -15171,8 +15184,10 @@ dumpConstraint(Archive *fout, ConstraintInfo *coninfo)
15171
15184
appendPQExpBuffer (delq , "DROP CONSTRAINT %s;\n" ,
15172
15185
fmtId (coninfo -> dobj .name ));
15173
15186
15187
+ tag = psprintf ("%s %s" , tbinfo -> dobj .name , coninfo -> dobj .name );
15188
+
15174
15189
ArchiveEntry (fout , coninfo -> dobj .catId , coninfo -> dobj .dumpId ,
15175
- coninfo -> dobj . name ,
15190
+ tag ,
15176
15191
tbinfo -> dobj .namespace -> dobj .name ,
15177
15192
NULL ,
15178
15193
tbinfo -> rolname , false,
@@ -15207,8 +15222,10 @@ dumpConstraint(Archive *fout, ConstraintInfo *coninfo)
15207
15222
appendPQExpBuffer (delq , "DROP CONSTRAINT %s;\n" ,
15208
15223
fmtId (coninfo -> dobj .name ));
15209
15224
15225
+ tag = psprintf ("%s %s" , tyinfo -> dobj .name , coninfo -> dobj .name );
15226
+
15210
15227
ArchiveEntry (fout , coninfo -> dobj .catId , coninfo -> dobj .dumpId ,
15211
- coninfo -> dobj . name ,
15228
+ tag ,
15212
15229
tyinfo -> dobj .namespace -> dobj .name ,
15213
15230
NULL ,
15214
15231
tyinfo -> rolname , false,
@@ -15228,6 +15245,7 @@ dumpConstraint(Archive *fout, ConstraintInfo *coninfo)
15228
15245
if (tbinfo && coninfo -> separate )
15229
15246
dumpTableConstraintComment (fout , coninfo );
15230
15247
15248
+ free (tag );
15231
15249
destroyPQExpBuffer (q );
15232
15250
destroyPQExpBuffer (delq );
15233
15251
}
@@ -15581,6 +15599,7 @@ dumpTrigger(Archive *fout, TriggerInfo *tginfo)
15581
15599
size_t lentgargs ;
15582
15600
const char * p ;
15583
15601
int findx ;
15602
+ char * tag ;
15584
15603
15585
15604
/*
15586
15605
* we needn't check dobj.dump because TriggerInfo wouldn't have been
@@ -15757,8 +15776,10 @@ dumpTrigger(Archive *fout, TriggerInfo *tginfo)
15757
15776
appendPQExpBuffer (labelq , "ON %s" ,
15758
15777
fmtId (tbinfo -> dobj .name ));
15759
15778
15779
+ tag = psprintf ("%s %s" , tbinfo -> dobj .name , tginfo -> dobj .name );
15780
+
15760
15781
ArchiveEntry (fout , tginfo -> dobj .catId , tginfo -> dobj .dumpId ,
15761
- tginfo -> dobj . name ,
15782
+ tag ,
15762
15783
tbinfo -> dobj .namespace -> dobj .name ,
15763
15784
NULL ,
15764
15785
tbinfo -> rolname , false,
@@ -15771,6 +15792,7 @@ dumpTrigger(Archive *fout, TriggerInfo *tginfo)
15771
15792
tbinfo -> dobj .namespace -> dobj .name , tbinfo -> rolname ,
15772
15793
tginfo -> dobj .catId , 0 , tginfo -> dobj .dumpId );
15773
15794
15795
+ free (tag );
15774
15796
destroyPQExpBuffer (query );
15775
15797
destroyPQExpBuffer (delqry );
15776
15798
destroyPQExpBuffer (labelq );
@@ -15861,6 +15883,7 @@ dumpRule(Archive *fout, RuleInfo *rinfo)
15861
15883
PQExpBuffer delcmd ;
15862
15884
PQExpBuffer labelq ;
15863
15885
PGresult * res ;
15886
+ char * tag ;
15864
15887
15865
15888
/* Skip if not to be dumped */
15866
15889
if (!rinfo -> dobj .dump || dopt -> dataOnly )
@@ -15958,8 +15981,10 @@ dumpRule(Archive *fout, RuleInfo *rinfo)
15958
15981
appendPQExpBuffer (labelq , " ON %s" ,
15959
15982
fmtId (tbinfo -> dobj .name ));
15960
15983
15984
+ tag = psprintf ("%s %s" , tbinfo -> dobj .name , rinfo -> dobj .name );
15985
+
15961
15986
ArchiveEntry (fout , rinfo -> dobj .catId , rinfo -> dobj .dumpId ,
15962
- rinfo -> dobj . name ,
15987
+ tag ,
15963
15988
tbinfo -> dobj .namespace -> dobj .name ,
15964
15989
NULL ,
15965
15990
tbinfo -> rolname , false,
@@ -15976,6 +16001,7 @@ dumpRule(Archive *fout, RuleInfo *rinfo)
15976
16001
15977
16002
PQclear (res );
15978
16003
16004
+ free (tag );
15979
16005
destroyPQExpBuffer (query );
15980
16006
destroyPQExpBuffer (cmd );
15981
16007
destroyPQExpBuffer (delcmd );
0 commit comments