Don't try to assign smart names to constraints

This part of my previous commit seems to have broken pg_upgrade on
crake, at least from 9.2.  I'll see if there's a better fix, but in the
meantime this should suffice to keep the buildfarm green.
This commit is contained in:
Alvaro Herrera 2024-04-18 16:10:53 +02:00
parent 2e2d4604d9
commit d72d32f52d
No known key found for this signature in database
GPG Key ID: 1C20ACB9D5C564AE
1 changed files with 3 additions and 13 deletions

View File

@ -9097,20 +9097,10 @@ getTableAttrs(Archive *fout, TableInfo *tblinfo, int numTables)
else if (use_throwaway_notnull)
{
/*
* Decide on a name for this constraint. If it is not an
* inherited constraint, give it a throwaway name to avoid any
* possible conflicts, since we're going to drop it soon
* anyway. If it is inherited then try harder, because it may
* (but not necessarily) persist after the restore.
* Give this constraint a throwaway name.
*/
if (tbinfo->notnull_inh[j])
/* XXX maybe try harder if the name is overlength */
tbinfo->notnull_constrs[j] =
psprintf("%s_%s_not_null",
tbinfo->dobj.name, tbinfo->attnames[j]);
else
tbinfo->notnull_constrs[j] =
psprintf("pgdump_throwaway_notnull_%d", notnullcount++);
tbinfo->notnull_constrs[j] =
psprintf("pgdump_throwaway_notnull_%d", notnullcount++);
tbinfo->notnull_throwaway[j] = true;
tbinfo->notnull_inh[j] = false;
}