Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit34fa0dd

Browse files
committed
Fix CREATE DATABASE so we can pg_upgrade DBs with OIDs above 2^31.
Commitaa01051 repeated one of the oldest mistakes in our book:thinking that OID is the same as int32. It isn't of course, andunsurprisingly the first person who came along with a databaseOID 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
1 parent8c71467 commit34fa0dd

File tree

4 files changed

+37
-3
lines changed

4 files changed

+37
-3
lines changed

‎src/backend/commands/dbcommands.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@ createdb(ParseState *pstate, const CreatedbStmt *stmt)
816816
}
817817
elseif (strcmp(defel->defname,"oid")==0)
818818
{
819-
dboid=defGetInt32(defel);
819+
dboid=defGetObjectId(defel);
820820

821821
/*
822822
* We don't normally permit new databases to be created with

‎src/backend/commands/define.c

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,39 @@ defGetInt64(DefElem *def)
213213
return0;/* keep compiler quiet */
214214
}
215215

216+
/*
217+
* Extract an OID value from a DefElem.
218+
*/
219+
Oid
220+
defGetObjectId(DefElem*def)
221+
{
222+
if (def->arg==NULL)
223+
ereport(ERROR,
224+
(errcode(ERRCODE_SYNTAX_ERROR),
225+
errmsg("%s requires a numeric value",
226+
def->defname)));
227+
switch (nodeTag(def->arg))
228+
{
229+
caseT_Integer:
230+
return (Oid)intVal(def->arg);
231+
caseT_Float:
232+
233+
/*
234+
* Values too large for int4 will be represented as Float
235+
* constants by the lexer. Accept these if they are valid OID
236+
* strings.
237+
*/
238+
returnDatumGetObjectId(DirectFunctionCall1(oidin,
239+
CStringGetDatum(castNode(Float,def->arg)->fval)));
240+
default:
241+
ereport(ERROR,
242+
(errcode(ERRCODE_SYNTAX_ERROR),
243+
errmsg("%s requires a numeric value",
244+
def->defname)));
245+
}
246+
return0;/* keep compiler quiet */
247+
}
248+
216249
/*
217250
* Extract a possibly-qualified name (as a List of Strings) from a DefElem.
218251
*/

‎src/backend/parser/gram.y

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11105,9 +11105,9 @@ createdb_opt_items:
1110511105
;
1110611106

1110711107
createdb_opt_item:
11108-
createdb_opt_nameopt_equalSignedIconst
11108+
createdb_opt_nameopt_equalNumericOnly
1110911109
{
11110-
$$ = makeDefElem($1,(Node *) makeInteger($3),@1);
11110+
$$ = makeDefElem($1,$3,@1);
1111111111
}
1111211112
|createdb_opt_nameopt_equalopt_boolean_or_string
1111311113
{

‎src/include/commands/defrem.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ extern double defGetNumeric(DefElem *def);
150150
externbooldefGetBoolean(DefElem*def);
151151
externint32defGetInt32(DefElem*def);
152152
externint64defGetInt64(DefElem*def);
153+
externOiddefGetObjectId(DefElem*def);
153154
externList*defGetQualifiedName(DefElem*def);
154155
externTypeName*defGetTypeName(DefElem*def);
155156
externintdefGetTypeLength(DefElem*def);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp