From 72b6ad6313387110cb36b69a3732cd0936c3eba4 Mon Sep 17 00:00:00 2001 From: Neil Conway Date: Sun, 30 May 2004 23:40:41 +0000 Subject: Use the new List API function names throughout the backend, and disable the list compatibility API by default. While doing this, I decided to keep the llast() macro around and introduce llast_int() and llast_oid() variants. --- src/backend/executor/spi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/backend/executor/spi.c') diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c index 4d8fade3d6..6ec4d810a8 100644 --- a/src/backend/executor/spi.c +++ b/src/backend/executor/spi.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.114 2004/05/26 04:41:16 neilc Exp $ + * $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.115 2004/05/30 23:40:26 neilc Exp $ * *------------------------------------------------------------------------- */ @@ -740,7 +740,7 @@ SPI_cursor_open(const char *name, void *plan, Datum *Values, const char *Nulls) int k; /* Ensure that the plan contains only one regular SELECT query */ - if (length(ptlist) != 1 || length(qtlist) != 1) + if (list_length(ptlist) != 1 || list_length(qtlist) != 1) ereport(ERROR, (errcode(ERRCODE_INVALID_CURSOR_DEFINITION), errmsg("cannot open multi-query plan as cursor"))); @@ -821,8 +821,8 @@ SPI_cursor_open(const char *name, void *plan, Datum *Values, const char *Nulls) PortalDefineQuery(portal, NULL, /* unfortunately don't have sourceText */ "SELECT", /* cursor's query is always a SELECT */ - makeList1(queryTree), - makeList1(planTree), + list_make1(queryTree), + list_make1(planTree), PortalGetHeapMemory(portal)); MemoryContextSwitchTo(oldcontext); @@ -951,7 +951,7 @@ SPI_is_cursor_plan(void *plan) } qtlist = spiplan->qtlist; - if (length(spiplan->ptlist) == 1 && length(qtlist) == 1) + if (list_length(spiplan->ptlist) == 1 && list_length(qtlist) == 1) { Query *queryTree = (Query *) linitial((List *) linitial(qtlist)); -- cgit v1.2.1