dblink bug fix - please apply prior to wrapping up beta tarball

Поиск
Список
Период
Сортировка
This fixes dblink for breakage related to the last minute
CreateTemplateTupleDesc changes (elimination of WITHOUTOID in favor of
true/false).

Please apply.

Thanks,

Joe
Index: contrib/dblink/dblink.c
===================================================================
RCS file: /opt/src/cvs/pgsql-server/contrib/dblink/dblink.c,v
retrieving revision 1.10
diff -c -r1.10 dblink.c
*** contrib/dblink/dblink.c    2 Sep 2002 06:13:31 -0000    1.10
--- contrib/dblink/dblink.c    3 Sep 2002 03:05:12 -0000
***************
*** 463,469 ****
                  is_sql_cmd = true;

                  /* need a tuple descriptor representing one TEXT column */
!                 tupdesc = CreateTemplateTupleDesc(1, WITHOUTOID);
                  TupleDescInitEntry(tupdesc, (AttrNumber) 1, "status",
                                     TEXTOID, -1, 0, false);

--- 463,469 ----
                  is_sql_cmd = true;

                  /* need a tuple descriptor representing one TEXT column */
!                 tupdesc = CreateTemplateTupleDesc(1, false);
                  TupleDescInitEntry(tupdesc, (AttrNumber) 1, "status",
                                     TEXTOID, -1, 0, false);

***************
*** 628,634 ****
          if (PQresultStatus(res) == PGRES_COMMAND_OK)
          {
              /* need a tuple descriptor representing one TEXT column */
!             tupdesc = CreateTemplateTupleDesc(1, WITHOUTOID);
              TupleDescInitEntry(tupdesc, (AttrNumber) 1, "status",
                                 TEXTOID, -1, 0, false);

--- 628,634 ----
          if (PQresultStatus(res) == PGRES_COMMAND_OK)
          {
              /* need a tuple descriptor representing one TEXT column */
!             tupdesc = CreateTemplateTupleDesc(1, false);
              TupleDescInitEntry(tupdesc, (AttrNumber) 1, "status",
                                 TEXTOID, -1, 0, false);

***************
*** 883,889 ****
              elog(ERROR, "dblink_get_pkey: relation does not exist");

          /* need a tuple descriptor representing one INT and one TEXT column */
!         tupdesc = CreateTemplateTupleDesc(2, WITHOUTOID);
          TupleDescInitEntry(tupdesc, (AttrNumber) 1, "position",
                             INT4OID, -1, 0, false);
          TupleDescInitEntry(tupdesc, (AttrNumber) 2, "colname",
--- 883,889 ----
              elog(ERROR, "dblink_get_pkey: relation does not exist");

          /* need a tuple descriptor representing one INT and one TEXT column */
!         tupdesc = CreateTemplateTupleDesc(2, false);
          TupleDescInitEntry(tupdesc, (AttrNumber) 1, "position",
                             INT4OID, -1, 0, false);
          TupleDescInitEntry(tupdesc, (AttrNumber) 2, "colname",
***************
*** 1936,1942 ****
      if (natts < 1)
          elog(ERROR, "cannot create a description for empty results");

!     desc = CreateTemplateTupleDesc(natts, WITHOUTOID);

      attnum = 0;

--- 1936,1942 ----
      if (natts < 1)
          elog(ERROR, "cannot create a description for empty results");

!     desc = CreateTemplateTupleDesc(natts, false);

      attnum = 0;


В списке pgsql-patches по дате отправления:

Предыдущее
От: Tom Lane
Дата:
Сообщение: Re: indisclustered and clusterdb
Следующее
От: Bruce Momjian
Дата:
Сообщение: Re: dblink bug fix - please apply prior to wrapping up beta