diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2022-11-04 10:39:52 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2022-11-04 10:39:52 -0400 |
| commit | 34fa0ddae5cf27dd93a5855b30083185d4bb5a5b (patch) | |
| tree | 22e4d83db0eafb8d6be51865e2952a43f6d03e61 /src/backend/commands/define.c | |
| parent | 8c7146790811ac4eee23fab2226db14b636e1ac5 (diff) | |
Fix CREATE DATABASE so we can pg_upgrade DBs with OIDs above 2^31.
Commit aa0105141 repeated one of the oldest mistakes in our book:
thinking that OID is the same as int32. It isn't of course, and
unsurprisingly the first person who came along with a database
OID above 2 billion broke it. Repair.
Per bug #17677 from Sergey Pankov. Back-patch to v15.
Discussion: https://postgr.es/m/17677-a99fa067d7ed71c9@postgresql.org
Diffstat (limited to 'src/backend/commands/define.c')
| -rw-r--r-- | src/backend/commands/define.c | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/src/backend/commands/define.c b/src/backend/commands/define.c index 86b89071eed..090e5d38d24 100644 --- a/src/backend/commands/define.c +++ b/src/backend/commands/define.c @@ -214,6 +214,39 @@ defGetInt64(DefElem *def) } /* + * Extract an OID value from a DefElem. + */ +Oid +defGetObjectId(DefElem *def) +{ + if (def->arg == NULL) + ereport(ERROR, + (errcode(ERRCODE_SYNTAX_ERROR), + errmsg("%s requires a numeric value", + def->defname))); + switch (nodeTag(def->arg)) + { + case T_Integer: + return (Oid) intVal(def->arg); + case T_Float: + + /* + * Values too large for int4 will be represented as Float + * constants by the lexer. Accept these if they are valid OID + * strings. + */ + return DatumGetObjectId(DirectFunctionCall1(oidin, + CStringGetDatum(castNode(Float, def->arg)->fval))); + default: + ereport(ERROR, + (errcode(ERRCODE_SYNTAX_ERROR), + errmsg("%s requires a numeric value", + def->defname))); + } + return 0; /* keep compiler quiet */ +} + +/* * Extract a possibly-qualified name (as a List of Strings) from a DefElem. */ List * |