NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitfd3ad7d

committed

Allow to call utility funcs without SPI_connect.

1 parent7f97e05 commitfd3ad7dCopy full SHA for fd3ad7d

File tree

1 file changed

-47

lines changed

src/backend/executor
- spi.c

1 file changed

-47

lines changed

`‎src/backend/executor/spi.c‎`

Lines changed: 5 additions & 47 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ static void _SPI_fetch(FetchStmt * stmt);`
`48`	`48`	`#endif`
`49`	`49`	`staticint`
`50`	`50`	`_SPI_execute_plan(_SPI_plan*plan,`
`51`		`-char*Values,charNulls,inttcount);`
	`51`	`+DatumValues,charNulls,inttcount);`
`52`	`52`
`53`	`53`	`#define_SPI_CPLAN_CURCXT0`
`54`	`54`	`#define_SPI_CPLAN_PROCXT1`
`@@ -199,7 +199,7 @@ SPI_exec(char *src, int tcount)`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`int`
`202`		`-SPI_execp(voidplan,charValues,charNulls,inttcount)`
	`202`	`+SPI_execp(voidplan,DatumValues,char*Nulls,inttcount)`
`203`	`203`	`{`
`204`	`204`	`intres;`
`205`	`205`
`@@ -282,10 +282,7 @@ int`
`282`	`282`	`SPI_fnumber(TupleDesctupdesc,char*fname)`
`283`	`283`	`{`
`284`	`284`	`intres;`
`285`		`-`
`286`		`-if (_SPI_curid+1!=_SPI_connected)`
`287`		`-return (SPI_ERROR_UNCONNECTED);`
`288`		`-`
	`285`	`+`
`289`	`286`	`for (res=0;res<tupdesc->natts;res++)`
`290`	`287`	`{`
`291`	`288`	`if (strcasecmp(tupdesc->attrs[res]->attname.data,fname)==0)`
`@@ -300,20 +297,13 @@ SPI_fname(TupleDesc tupdesc, int fnumber)`
`300`	`297`	`{`
`301`	`298`
`302`	`299`	`SPI_result=0;`
`303`		`-if (_SPI_curid+1!=_SPI_connected)`
`304`		`-{`
`305`		`-SPI_result=SPI_ERROR_UNCONNECTED;`
`306`		`-return (NULL);`
`307`		`-}`
`308`		`-`
`309`	`300`	`if (tupdesc->natts<fnumber\|\|fnumber <=0)`
`310`	`301`	`{`
`311`	`302`	`SPI_result=SPI_ERROR_NOATTRIBUTE;`
`312`	`303`	`return (NULL);`
`313`	`304`	`}`
`314`	`305`
`315`	`306`	`return (nameout(&(tupdesc->attrs[fnumber-1]->attname)));`
`316`		`-`
`317`	`307`	`}`
`318`	`308`
`319`	`309`	`char*`
`@@ -324,12 +314,6 @@ SPI_getvalue(HeapTuple tuple, TupleDesc tupdesc, int fnumber)`
`324`	`314`	`Oidfoutoid;`
`325`	`315`
`326`	`316`	`SPI_result=0;`
`327`		`-if (_SPI_curid+1!=_SPI_connected)`
`328`		`-{`
`329`		`-SPI_result=SPI_ERROR_UNCONNECTED;`
`330`		`-return (NULL);`
`331`		`-}`
`332`		`-`
`333`	`317`	`if (tuple->t_natts<fnumber\|\|fnumber <=0)`
`334`	`318`	`return (NULL);`
`335`	`319`
`@@ -353,12 +337,6 @@ SPI_getbinval(HeapTuple tuple, TupleDesc tupdesc, int fnumber, bool * isnull)`
`353`	`337`
`354`	`338`	`*isnull= true;`
`355`	`339`	`SPI_result=0;`
`356`		`-if (_SPI_curid+1!=_SPI_connected)`
`357`		`-{`
`358`		`-SPI_result=SPI_ERROR_UNCONNECTED;`
`359`		`-return (NULL);`
`360`		`-}`
`361`		`-`
`362`	`340`	`if (tuple->t_natts<fnumber\|\|fnumber <=0)`
`363`	`341`	`return (NULL);`
`364`	`342`
`@@ -373,12 +351,6 @@ SPI_gettype(TupleDesc tupdesc, int fnumber)`
`373`	`351`	`HeapTupletypeTuple;`
`374`	`352`
`375`	`353`	`SPI_result=0;`
`376`		`-if (_SPI_curid+1!=_SPI_connected)`
`377`		`-{`
`378`		`-SPI_result=SPI_ERROR_UNCONNECTED;`
`379`		`-return (NULL);`
`380`		`-}`
`381`		`-`
`382`	`354`	`if (tupdesc->natts<fnumber\|\|fnumber <=0)`
`383`	`355`	`{`
`384`	`356`	`SPI_result=SPI_ERROR_NOATTRIBUTE;`
`@@ -403,12 +375,6 @@ SPI_gettypeid(TupleDesc tupdesc, int fnumber)`
`403`	`375`	`{`
`404`	`376`
`405`	`377`	`SPI_result=0;`
`406`		`-if (_SPI_curid+1!=_SPI_connected)`
`407`		`-{`
`408`		`-SPI_result=SPI_ERROR_UNCONNECTED;`
`409`		`-return (InvalidOid);`
`410`		`-}`
`411`		`-`
`412`	`378`	`if (tupdesc->natts<fnumber\|\|fnumber <=0)`
`413`	`379`	`{`
`414`	`380`	`SPI_result=SPI_ERROR_NOATTRIBUTE;`
`@@ -421,14 +387,6 @@ SPI_gettypeid(TupleDesc tupdesc, int fnumber)`
`421`	`387`	`char*`
`422`	`388`	`SPI_getrelname(Relationrel)`
`423`	`389`	`{`
`424`		`-`
`425`		`-SPI_result=0;`
`426`		`-if (_SPI_curid+1!=_SPI_connected)`
`427`		`-{`
`428`		`-SPI_result=SPI_ERROR_UNCONNECTED;`
`429`		`-return (NULL);`
`430`		`-}`
`431`		`-`
`432`	`390`	`return (pstrdup(rel->rd_rel->relname.data));`
`433`	`391`	`}`
`434`	`392`
`@@ -581,7 +539,7 @@ _SPI_execute(char src, int tcount, _SPI_plan plan)`
`581`	`539`	`}`
`582`	`540`
`583`	`541`	`staticint`
`584`		`-_SPI_execute_plan(_SPI_planplan,charValues,charNulls,inttcount)`
	`542`	`+_SPI_execute_plan(_SPI_planplan,DatumValues,char*Nulls,inttcount)`
`585`	`543`	`{`
`586`	`544`	`QueryTreeList*queryTree_list=plan->qtlist;`
`587`	`545`	`List*planTree_list=plan->ptlist;`
`@@ -634,7 +592,7 @@ _SPI_execute_plan(_SPI_plan * plan, char *Values, char Nulls, int tcount)`
`634`	`592`	`paramLI->kind=PARAM_NUM;`
`635`	`593`	`paramLI->id=k+1;`
`636`	`594`	`paramLI->isnull= (Nulls!=NULL&&Nulls[k]!='n');`
`637`		`-paramLI->value=(Datum)Values[k];`
	`595`	`+paramLI->value=Values[k];`
`638`	`596`	`}`
`639`	`597`	`paramLI->kind=PARAM_INVALID;`
`640`	`598`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitfd3ad7d

File tree

1 file changed

1 file changed

`‎src/backend/executor/spi.c‎`

0 commit comments