Commit8217fb1

committed

Add OID output argument to DefineTSConfiguration

... which is set to the OID of a copied text search config, whenever theCOPY clause is used.This is in the spirit of commita2e35b5.

1 parentb3196e6 commit8217fb1Copy full SHA for 8217fb1

File tree

+13

-3

lines changed

+13

-3

lines changed

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -964,7 +964,7 @@ makeConfigurationDependencies(HeapTuple tuple, bool removeOld,`
`964`	`964`	`* CREATE TEXT SEARCH CONFIGURATION`
`965`	`965`	`*/`
`966`	`966`	`ObjectAddress`
`967`		`-DefineTSConfiguration(Listnames,Listparameters)`
	`967`	`+DefineTSConfiguration(Listnames,Listparameters,ObjectAddress*copied)`
`968`	`968`	`{`
`969`	`969`	`RelationcfgRel;`
`970`	`970`	`RelationmapRel=NULL;`
`@@ -1013,6 +1013,14 @@ DefineTSConfiguration(List names, List parameters)`
`1013`	`1013`	`(errcode(ERRCODE_SYNTAX_ERROR),`
`1014`	`1014`	`errmsg("cannot specify both PARSER and COPY options")));`
`1015`	`1015`
	`1016`	`+/* make copied tsconfig available to callers */`
	`1017`	`+if (copied&&OidIsValid(sourceOid))`
	`1018`	`+{`
	`1019`	`+ObjectAddressSet(*copied,`
	`1020`	`+TSConfigRelationId,`
	`1021`	`+sourceOid);`
	`1022`	`+}`
	`1023`	`+`
`1016`	`1024`	`/*`
`1017`	`1025`	`* Look up source config if given.`
`1018`	`1026`	`*/`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1129,7 +1129,8 @@ ProcessUtilitySlow(Node *parsetree,`
`1129`	`1129`	`caseOBJECT_TSCONFIGURATION:`
`1130`	`1130`	`Assert(stmt->args==NIL);`
`1131`	`1131`	`DefineTSConfiguration(stmt->defnames,`
`1132`		`-stmt->definition);`
	`1132`	`+stmt->definition,`
	`1133`	`+NULL);`
`1133`	`1134`	`break;`
`1134`	`1135`	`caseOBJECT_COLLATION:`
`1135`	`1136`	`Assert(stmt->args==NIL);`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,8 @@ extern ObjectAddress AlterTSDictionary(AlterTSDictionaryStmt *stmt);`
`101`	`101`	`externObjectAddressDefineTSTemplate(Listnames,Listparameters);`
`102`	`102`	`externvoidRemoveTSTemplateById(OidtmplId);`
`103`	`103`
`104`		`-externObjectAddressDefineTSConfiguration(Listnames,Listparameters);`
	`104`	`+externObjectAddressDefineTSConfiguration(Listnames,Listparameters,`
	`105`	`+ObjectAddress*copied);`
`105`	`106`	`externvoidRemoveTSConfigurationById(OidcfgId);`
`106`	`107`	`externObjectAddressAlterTSConfiguration(AlterTSConfigurationStmt*stmt);`
`107`	`108`

Comments

(0)