Skip to content
Snippets Groups Projects
Commit 4e911c84 authored by Tom Lane's avatar Tom Lane
Browse files

Fix SPI example to reflect new-style calling convention for textout().

parent b1065f8f
No related branches found
No related tags found
No related merge requests found
...@@ -2691,7 +2691,7 @@ are invisible to the query scan. For example, in query ...@@ -2691,7 +2691,7 @@ are invisible to the query scan. For example, in query
INSERT INTO a SELECT * FROM a INSERT INTO a SELECT * FROM a
tuples inserted are invisible for SELECT' scan. In effect, this tuples inserted are invisible for SELECT's scan. In effect, this
duplicates the database table within itself (subject to unique index duplicates the database table within itself (subject to unique index
rules, of course) without recursing. rules, of course) without recursing.
</Para> </Para>
...@@ -2708,7 +2708,7 @@ of Q) or after Q is done. ...@@ -2708,7 +2708,7 @@ of Q) or after Q is done.
<Para> <Para>
This example of SPI usage demonstrates the visibility rule. This example of SPI usage demonstrates the visibility rule.
There are more complex examples in in src/test/regress/regress.c and There are more complex examples in src/test/regress/regress.c and
in contrib/spi. in contrib/spi.
</Para> </Para>
...@@ -2726,12 +2726,17 @@ int execq(text *sql, int cnt); ...@@ -2726,12 +2726,17 @@ int execq(text *sql, int cnt);
int int
execq(text *sql, int cnt) execq(text *sql, int cnt)
{ {
char *query;
int ret; int ret;
int proc = 0; int proc;
/* Convert given TEXT object to a C string */
query = DatumGetCString(DirectFunctionCall1(textout,
PointerGetDatum(sql)));
SPI_connect(); SPI_connect();
ret = SPI_exec(textout(sql), cnt); ret = SPI_exec(query, cnt);
proc = SPI_processed; proc = SPI_processed;
/* /*
...@@ -2743,11 +2748,11 @@ execq(text *sql, int cnt) ...@@ -2743,11 +2748,11 @@ execq(text *sql, int cnt)
TupleDesc tupdesc = SPI_tuptable->tupdesc; TupleDesc tupdesc = SPI_tuptable->tupdesc;
SPITupleTable *tuptable = SPI_tuptable; SPITupleTable *tuptable = SPI_tuptable;
char buf[8192]; char buf[8192];
int i; int i,j;
for (ret = 0; ret < proc; ret++) for (j = 0; j < proc; j++)
{ {
HeapTuple tuple = tuptable->vals[ret]; HeapTuple tuple = tuptable->vals[j];
for (i = 1, buf[0] = 0; i <= tupdesc->natts; i++) for (i = 1, buf[0] = 0; i <= tupdesc->natts; i++)
sprintf(buf + strlen (buf), " %s%s", sprintf(buf + strlen (buf), " %s%s",
...@@ -2759,6 +2764,8 @@ execq(text *sql, int cnt) ...@@ -2759,6 +2764,8 @@ execq(text *sql, int cnt)
SPI_finish(); SPI_finish();
pfree(query);
return (proc); return (proc);
} }
</ProgramListing> </ProgramListing>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment