Commit7f60be7

committed

Fix crash in ALTER OPERATOR CLASS/FAMILY .. SET SCHEMA.

In the previous coding, the parser emitted a List containing a C string,which is no good, because copyObject() can't handle it.Dimitri Fontaine

1 parentdc8a143 commit7f60be7Copy full SHA for 7f60be7

File tree

-13

lines changed

-13

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -198,11 +198,11 @@ ExecAlterObjectSchemaStmt(AlterObjectSchemaStmt *stmt)`
`198`	`198`	`break;`
`199`	`199`
`200`	`200`	`caseOBJECT_OPCLASS:`
`201`		`-AlterOpClassNamespace(stmt->object,stmt->objarg,stmt->newschema);`
	`201`	`+AlterOpClassNamespace(stmt->object,stmt->addname,stmt->newschema);`
`202`	`202`	`break;`
`203`	`203`
`204`	`204`	`caseOBJECT_OPFAMILY:`
`205`		`-AlterOpFamilyNamespace(stmt->object,stmt->objarg,stmt->newschema);`
	`205`	`+AlterOpFamilyNamespace(stmt->object,stmt->addname,stmt->newschema);`
`206`	`206`	`break;`
`207`	`207`
`208`	`208`	`caseOBJECT_SEQUENCE:`

Lines changed: 2 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1993,16 +1993,13 @@ AlterOpClassOwner_internal(Relation rel, HeapTuple tup, Oid newOwnerId)`
`1993`	`1993`	`* ALTER OPERATOR CLASS any_name USING access_method SET SCHEMA name`
`1994`	`1994`	`*/`
`1995`	`1995`	`void`
`1996`		`-AlterOpClassNamespace(Listname,Listargam,constchar*newschema)`
	`1996`	`+AlterOpClassNamespace(Listname,characcess_method,constchar*newschema)`
`1997`	`1997`	`{`
`1998`	`1998`	`OidamOid;`
`1999`		`-char*access_method=linitial(argam);`
`2000`	`1999`	`Relationrel;`
`2001`	`2000`	`Oidoid;`
`2002`	`2001`	`OidnspOid;`
`2003`	`2002`
`2004`		`-Assert(list_length(argam)==1);`
`2005`		`-`
`2006`	`2003`	`amOid=get_am_oid(access_method, false);`
`2007`	`2004`
`2008`	`2005`	`rel=heap_open(OperatorClassRelationId,RowExclusiveLock);`
`@@ -2185,15 +2182,13 @@ get_am_oid(const char *amname, bool missing_ok)`
`2185`	`2182`	`* ALTER OPERATOR FAMILY any_name USING access_method SET SCHEMA name`
`2186`	`2183`	`*/`
`2187`	`2184`	`void`
`2188`		`-AlterOpFamilyNamespace(Listname,Listargam,constchar*newschema)`
	`2185`	`+AlterOpFamilyNamespace(Listname,characcess_method,constchar*newschema)`
`2189`	`2186`	`{`
`2190`	`2187`	`OidamOid;`
`2191`		`-char*access_method=linitial(argam);`
`2192`	`2188`	`Relationrel;`
`2193`	`2189`	`OidnspOid;`
`2194`	`2190`	`Oidoid;`
`2195`	`2191`
`2196`		`-Assert(list_length(argam)==1);`
`2197`	`2192`	`amOid=get_am_oid(access_method, false);`
`2198`	`2193`
`2199`	`2194`	`rel=heap_open(OperatorFamilyRelationId,RowExclusiveLock);`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6225,7 +6225,7 @@ AlterObjectSchemaStmt:`
`6225`	`6225`	`AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);`
`6226`	`6226`	`n->objectType = OBJECT_OPCLASS;`
`6227`	`6227`	`n->object =$4;`
`6228`		`-n->objarg =list_make1($6);`
	`6228`	`+n->addname =$6;`
`6229`	`6229`	`n->newschema =$9;`
`6230`	`6230`	`$$ = (Node *)n;`
`6231`	`6231`	`}`
`@@ -6234,7 +6234,7 @@ AlterObjectSchemaStmt:`
`6234`	`6234`	`AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);`
`6235`	`6235`	`n->objectType = OBJECT_OPFAMILY;`
`6236`	`6236`	`n->object =$4;`
`6237`		`-n->objarg =list_make1($6);`
	`6237`	`+n->addname =$6;`
`6238`	`6238`	`n->newschema =$9;`
`6239`	`6239`	`$$ = (Node *)n;`
`6240`	`6240`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -101,11 +101,11 @@ extern void RenameOpClass(List name, const char access_method, const char *new`
`101`	`101`	`externvoidRenameOpFamily(Listname,constcharaccess_method,constchar*newname);`
`102`	`102`	`externvoidAlterOpClassOwner(Listname,constcharaccess_method,OidnewOwnerId);`
`103`	`103`	`externvoidAlterOpClassOwner_oid(OidopclassOid,OidnewOwnerId);`
`104`		`-externvoidAlterOpClassNamespace(Listname,Listargam,constchar*newschema);`
	`104`	`+externvoidAlterOpClassNamespace(Listname,characcess_method,constchar*newschema);`
`105`	`105`	`externvoidAlterOpFamilyOwner(Listname,constcharaccess_method,OidnewOwnerId);`
`106`	`106`	`externvoidAlterOpFamilyOwner_oid(OidopfamilyOid,OidnewOwnerId);`
`107`	`107`	`externOidget_am_oid(constchar*amname,boolmissing_ok);`
`108`		`-externvoidAlterOpFamilyNamespace(Listname,Listargam,constchar*newschema);`
	`108`	`+externvoidAlterOpFamilyNamespace(Listname,characcess_method,constchar*newschema);`
`109`	`109`
`110`	`110`	`/* commands/tsearchcmds.c */`
`111`	`111`	`externvoidDefineTSParser(Listnames,Listparameters);`

Comments

(0)