From abeaabef2ec1259ed9ec50dd18d2ef25bf1b46a7 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Tue, 14 Jan 1997 01:42:38 +0000 Subject: [PATCH] Restored original pg_type/pg_attribute defaults. Regression fixes. --- src/include/catalog/pg_attribute.h | 144 +++++++++++----------- src/include/catalog/pg_type.h | 186 ++++++++++++++--------------- src/test/regress/expected.input | 8 +- src/test/regress/queries.source | 6 +- 4 files changed, 171 insertions(+), 173 deletions(-) diff --git a/src/include/catalog/pg_attribute.h b/src/include/catalog/pg_attribute.h index 77722ba36e..4af152572c 100644 --- a/src/include/catalog/pg_attribute.h +++ b/src/include/catalog/pg_attribute.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_attribute.h,v 1.6 1997/01/10 20:44:39 momjian Exp $ + * $Id: pg_attribute.h,v 1.7 1997/01/14 01:41:46 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -158,22 +158,22 @@ typedef FormData_pg_attribute *AttributeTupleForm; * ---------------- */ #define Schema_pg_type \ -{ 1247l, {"typname"}, 19l, 0l, 0l, 0l, NAMEDATALEN, 1, 0, 0, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1247l, {"typowner"}, 26l, 0l, 0l, 0l, 4, 2, 0, 1, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1247l, {"typlen"}, 21l, 0l, 0l, 0l, 2, 3, 0, 1, 1, 0l, 0l, -1l, 0, 's' }, \ -{ 1247l, {"typprtlen"}, 21l, 0l, 0l, 0l, 2, 4, 0, 1, 1, 0l, 0l, -1l, 0, 's' }, \ -{ 1247l, {"typbyval"}, 16l, 0l, 0l, 0l, 1, 5, 0, 1, 1, 0l, 0l, -1l, 0, 'c' }, \ -{ 1247l, {"typtype"}, 18l, 0l, 0l, 0l, 1, 6, 0, 1, 1, 0l, 0l, -1l, 0, 'c' }, \ -{ 1247l, {"typisdefined"}, 16l, 0l, 0l, 0l, 1, 7, 0, 1, 1, 0l, 0l, -1l, 0, 'c' }, \ -{ 1247l, {"typdelim"}, 18l, 0l, 0l, 0l, 1, 8, 0, 1, 1, 0l, 0l, -1l, 0, 'c' }, \ -{ 1247l, {"typrelid"}, 26l, 0l, 0l, 0l, 4, 9, 0, 1, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1247l, {"typelem"}, 26l, 0l, 0l, 0l, 4, 10, 0, 1, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1247l, {"typinput"}, 24l, 0l, 0l, 0l, 4, 11, 0, 1, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1247l, {"typoutput"}, 24l, 0l, 0l, 0l, 4, 12, 0, 1, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1247l, {"typreceive"}, 24l, 0l, 0l, 0l, 4, 13, 0, 1, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1247l, {"typsend"}, 24l, 0l, 0l, 0l, 4, 14, 0, 1, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1247l, {"typalign"}, 18l, 0l, 0l, 0l, 1, 15, 0, 1, 1, 0l, 0l, -1l, 0, 'c' }, \ -{ 1247l, {"typdefault"}, 25l, 0l, 0l, 0l, -1, 16, 0, 0, 1, 0l, 0l, -1l, 0, 'i' } +{ 1247l, {"typname"}, 19l, 0l, 0l, 0l, NAMEDATALEN, 1, 0, '\0', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1247l, {"typowner"}, 26l, 0l, 0l, 0l, 4, 2, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1247l, {"typlen"}, 21l, 0l, 0l, 0l, 2, 3, 0, '\001', '\001', 0l, 0l, -1l, '\0', 's' }, \ +{ 1247l, {"typprtlen"}, 21l, 0l, 0l, 0l, 2, 4, 0, '\001', '\001', 0l, 0l, -1l, '\0', 's' }, \ +{ 1247l, {"typbyval"}, 16l, 0l, 0l, 0l, 1, 5, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'c' }, \ +{ 1247l, {"typtype"}, 18l, 0l, 0l, 0l, 1, 6, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'c' }, \ +{ 1247l, {"typisdefined"}, 16l, 0l, 0l, 0l, 1, 7, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'c' }, \ +{ 1247l, {"typdelim"}, 18l, 0l, 0l, 0l, 1, 8, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'c' }, \ +{ 1247l, {"typrelid"}, 26l, 0l, 0l, 0l, 4, 9, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1247l, {"typelem"}, 26l, 0l, 0l, 0l, 4, 10, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1247l, {"typinput"}, 24l, 0l, 0l, 0l, 4, 11, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1247l, {"typoutput"}, 24l, 0l, 0l, 0l, 4, 12, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1247l, {"typreceive"}, 24l, 0l, 0l, 0l, 4, 13, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1247l, {"typsend"}, 24l, 0l, 0l, 0l, 4, 14, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1247l, {"typalign"}, 18l, 0l, 0l, 0l, 1, 15, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'c' }, \ +{ 1247l, {"typdefault"}, 25l, 0l, 0l, 0l, -1, 16, 0, '\0', '\001', 0l, 0l, -1l, '\0', 'i' } DATA(insert OID = 0 ( 1247 typname 19 0 0 0 NAMEDATALEN 1 0 f t 0 0 -1 f i)); DATA(insert OID = 0 ( 1247 typowner 26 0 0 0 4 2 0 t t 0 0 -1 f i)); @@ -248,24 +248,24 @@ DATA(insert OID = 0 ( 1251 vtype 18 0 0 0 1 -11 0 t t 0 0 -1 f c)); * ---------------- */ #define Schema_pg_proc \ -{ 1255l, {"proname"}, 19l, 0l, 0l, 0l, NAMEDATALEN, 1, 0, 0, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1255l, {"proowner"}, 26l, 0l, 0l, 0l, 4, 2, 0, 1, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1255l, {"prolang"}, 26l, 0l, 0l, 0l, 4, 3, 0, 1, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1255l, {"proisinh"}, 16l, 0l, 0l, 0l, 1, 4, 0, 1, 1, 0l, 0l, -1l, 0, 'c' }, \ -{ 1255l, {"proistrusted"}, 16l, 0l, 0l, 0l, 1, 5, 0, 1, 1, 0l, 0l, -1l, 0, 'c' }, \ -{ 1255l, {"proiscachable"}, 16l, 0l, 0l, 0l, 1, 6, 0, 1, 1, 0l, 0l, -1l, 0, 'c' }, \ -{ 1255l, {"pronargs"}, 21l, 0l, 0l, 0l, 2, 7, 0, 1, 1, 0l, 0l, -1l, 0, 's' }, \ -{ 1255l, {"proretset"}, 16l, 0l, 0l, 0l, 1, 8, 0, 1, 1, 0l, 0l, -1l, 0, 'c' }, \ -{ 1255l, {"prorettype"}, 26l, 0l, 0l, 0l, 4, 9, 0, 1, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1255l, {"proargtypes"}, 30l, 0l, 0l, 0l, 32, 10, 0, 0, 1, 0l, 0l, \ - -1l, 0, 'i' }, \ -{ 1255l, {"probyte_pct"}, 23l, 0l, 0l, 0l, 4, 11, 0, 1, 1, 0l, 0l, \ - -1l, 0, 'i' }, \ -{ 1255l, {"properbyte_cpu"}, 23l, 0l, 0l, 0l, 4, 12, 0, 1, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1255l, {"propercall_cpu"}, 23l, 0l, 0l, 0l, 4, 13, 0, 1, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1255l, {"prooutin_ratio"}, 23l, 0l, 0l, 0l, 4, 14, 0, 1, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1255l, {"prosrc"}, 25l, 0l, 0l, 0l, -1, 15, 0, 0, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1255l, {"probin"}, 17l, 0l, 0l, 0l, -1, 16, 0, 0, 1, 0l, 0l, -1l, 0, 'i' } +{ 1255l, {"proname"}, 19l, 0l, 0l, 0l, NAMEDATALEN, 1, 0, '\0', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1255l, {"proowner"}, 26l, 0l, 0l, 0l, 4, 2, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1255l, {"prolang"}, 26l, 0l, 0l, 0l, 4, 3, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1255l, {"proisinh"}, 16l, 0l, 0l, 0l, 1, 4, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'c' }, \ +{ 1255l, {"proistrusted"}, 16l, 0l, 0l, 0l, 1, 5, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'c' }, \ +{ 1255l, {"proiscachable"}, 16l, 0l, 0l, 0l, 1, 6, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'c' }, \ +{ 1255l, {"pronargs"}, 21l, 0l, 0l, 0l, 2, 7, 0, '\001', '\001', 0l, 0l, -1l, '\0', 's' }, \ +{ 1255l, {"proretset"}, 16l, 0l, 0l, 0l, 1, 8, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'c' }, \ +{ 1255l, {"prorettype"}, 26l, 0l, 0l, 0l, 4, 9, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1255l, {"proargtypes"}, 30l, 0l, 0l, 0l, 32, 10, 0, '\0', '\001', 0l, 0l, \ + -1l, '\0', 'i' }, \ +{ 1255l, {"probyte_pct"}, 23l, 0l, 0l, 0l, 4, 11, 0, '\001', '\001', 0l, 0l, \ + -1l, '\0', 'i' }, \ +{ 1255l, {"properbyte_cpu"}, 23l, 0l, 0l, 0l, 4, 12, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1255l, {"propercall_cpu"}, 23l, 0l, 0l, 0l, 4, 13, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1255l, {"prooutin_ratio"}, 23l, 0l, 0l, 0l, 4, 14, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1255l, {"prosrc"}, 25l, 0l, 0l, 0l, -1, 15, 0, '\0', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1255l, {"probin"}, 17l, 0l, 0l, 0l, -1, 16, 0, '\0', '\001', 0l, 0l, -1l, '\0', 'i' } DATA(insert OID = 0 ( 1255 proname 19 0 0 0 NAMEDATALEN 1 0 f t 0 0 -1 f i)); DATA(insert OID = 0 ( 1255 proowner 26 0 0 0 4 2 0 t t 0 0 -1 f i)); @@ -360,22 +360,22 @@ DATA(insert OID = 0 ( 1261 vtype 18 0 0 0 1 -11 0 t t 0 0 -1 f c)); * ---------------- */ #define Schema_pg_attribute \ -{ 1249l, {"attrelid"}, 26l, 0l, 0l, 0l, 4, 1, 0, 1, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1249l, {"attname"}, 19l, 0l, 0l, 0l, NAMEDATALEN, 2, 0, 0, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1249l, {"atttypid"}, 26l, 0l, 0l, 0l, 4, 3, 0, 1, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1249l, {"attdefrel"}, 26l, 0l, 0l, 0l, 4, 4, 0, 1, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1249l, {"attnvals"}, 23l, 0l, 0l, 0l, 4, 5, 0, 1, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1249l, {"atttyparg"}, 26l, 0l, 0l, 0l, 4, 6, 0, 1, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1249l, {"attlen"}, 21l, 0l, 0l, 0l, 2, 7, 0, 1, 1, 0l, 0l, -1l, 0, 's' }, \ -{ 1249l, {"attnum"}, 21l, 0l, 0l, 0l, 2, 8, 0, 1, 1, 0l, 0l, -1l, 0, 's' }, \ -{ 1249l, {"attbound"}, 21l, 0l, 0l, 0l, 2, 9, 0, 1, 1, 0l, 0l, -1l, 0, 's' }, \ -{ 1249l, {"attbyval"}, 16l, 0l, 0l, 0l, 1, 10, 0, 1, 1, 0l, 0l, -1l, 0, 'c' }, \ -{ 1249l, {"attcanindex"}, 16l, 0l, 0l, 0l, 1, 11, 0, 1, 1, 0l, 0l, -1l, 0, 'c' }, \ -{ 1249l, {"attproc"}, 26l, 0l, 0l, 0l, 4, 12, 0, 1, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1249l, {"attnelems"}, 23l, 0l, 0l, 0l, 4, 13, 0, 1, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1249l, {"attcacheoff"}, 23l, 0l, 0l, 0l, 4, 14, 0, 1, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1249l, {"attisset"}, 16l, 0l, 0l, 0l, 1, 15, 0, 1, 1, 0l, 0l, -1l, 0, 'c' }, \ -{ 1249l, {"attalign"}, 18l, 0l, 0l, 0l, 1, 16, 0, 1, 1, 0l, 0l, -1l, 0, 'c' } +{ 1249l, {"attrelid"}, 26l, 0l, 0l, 0l, 4, 1, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1249l, {"attname"}, 19l, 0l, 0l, 0l, NAMEDATALEN, 2, 0, '\0', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1249l, {"atttypid"}, 26l, 0l, 0l, 0l, 4, 3, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1249l, {"attdefrel"}, 26l, 0l, 0l, 0l, 4, 4, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1249l, {"attnvals"}, 23l, 0l, 0l, 0l, 4, 5, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1249l, {"atttyparg"}, 26l, 0l, 0l, 0l, 4, 6, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1249l, {"attlen"}, 21l, 0l, 0l, 0l, 2, 7, 0, '\001', '\001', 0l, 0l, -1l, '\0', 's' }, \ +{ 1249l, {"attnum"}, 21l, 0l, 0l, 0l, 2, 8, 0, '\001', '\001', 0l, 0l, -1l, '\0', 's' }, \ +{ 1249l, {"attbound"}, 21l, 0l, 0l, 0l, 2, 9, 0, '\001', '\001', 0l, 0l, -1l, '\0', 's' }, \ +{ 1249l, {"attbyval"}, 16l, 0l, 0l, 0l, 1, 10, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'c' }, \ +{ 1249l, {"attcanindex"}, 16l, 0l, 0l, 0l, 1, 11, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'c' }, \ +{ 1249l, {"attproc"}, 26l, 0l, 0l, 0l, 4, 12, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1249l, {"attnelems"}, 23l, 0l, 0l, 0l, 4, 13, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1249l, {"attcacheoff"}, 23l, 0l, 0l, 0l, 4, 14, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1249l, {"attisset"}, 16l, 0l, 0l, 0l, 1, 15, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'c' }, \ +{ 1249l, {"attalign"}, 18l, 0l, 0l, 0l, 1, 16, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'c' } DATA(insert OID = 0 ( 1249 attrelid 26 0 0 0 4 1 0 t t 0 0 -1 f i)); DATA(insert OID = 0 ( 1249 attname 19 0 0 0 NAMEDATALEN 2 0 f t 0 0 -1 f i)); @@ -410,24 +410,24 @@ DATA(insert OID = 0 ( 1249 vtype 18 0 0 0 1 -11 0 t t 0 0 -1 f c)); * ---------------- */ #define Schema_pg_class \ -{ 1259l, {"relname"}, 19l, 0l, 0l, 0l, NAMEDATALEN, 1, 0, 0, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1259l, {"reltype"}, 26l, 0l, 0l, 0l, 4, 2, 0, 1, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1259l, {"relowner"}, 26l, 0l, 0l, 0l, 4, 2, 0, 1, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1259l, {"relam"}, 26l, 0l, 0l, 0l, 4, 3, 0, 1, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1259l, {"relpages"}, 23, 0l, 0l, 0l, 4, 4, 0, 1, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1259l, {"reltuples"}, 23, 0l, 0l, 0l, 4, 5, 0, 1, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1259l, {"relexpires"}, 702, 0l, 0l, 0l, 4, 6, 0, 1, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1259l, {"relpreserved"}, 703, 0l, 0l, 0l, 4, 7, 0, 1, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1259l, {"relhasindex"}, 16, 0l, 0l, 0l, 1, 8, 0, 1, 1, 0l, 0l, -1l, 0, 'c' }, \ -{ 1259l, {"relisshared"}, 16, 0l, 0l, 0l, 1, 9, 0, 1, 1, 0l, 0l, -1l, 0, 'c' }, \ -{ 1259l, {"relkind"}, 18, 0l, 0l, 0l, 1, 10, 0, 1, 1, 0l, 0l, -1l, 0, 'c' }, \ -{ 1259l, {"relarch"}, 18, 0l, 0l, 0l, 1, 11, 0, 1, 1, 0l, 0l, -1l, 0, 'c' }, \ -{ 1259l, {"relnatts"}, 21, 0l, 0l, 0l, 2, 12, 0, 1, 1, 0l, 0l, -1l, 0, 's' }, \ -{ 1259l, {"relsmgr"}, 210l, 0l, 0l, 0l, 2, 13, 0, 1, 1, 0l, 0l, -1l, 0, 's' }, \ -{ 1259l, {"relkey"}, 22, 0l, 0l, 0l, 16, 14, 0, 0, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1259l, {"relkeyop"}, 30, 0l, 0l, 0l, 32, 15, 0, 0, 1, 0l, 0l, -1l, 0, 'i' }, \ -{ 1259l, {"relhasrules"}, 16, 0l, 0l, 0l, 1, 16, 0, 1, 1, 0l, 0l, -1l, 0, 'c' }, \ -{ 1259l, {"relacl"}, 1034l, 0l, 0l, 0l, -1, 17, 0, 0, 1, 0l, 0l, -1l, 0, 'i' } +{ 1259l, {"relname"}, 19l, 0l, 0l, 0l, NAMEDATALEN, 1, 0, '\0', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1259l, {"reltype"}, 26l, 0l, 0l, 0l, 4, 2, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1259l, {"relowner"}, 26l, 0l, 0l, 0l, 4, 2, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1259l, {"relam"}, 26l, 0l, 0l, 0l, 4, 3, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1259l, {"relpages"}, 23, 0l, 0l, 0l, 4, 4, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1259l, {"reltuples"}, 23, 0l, 0l, 0l, 4, 5, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1259l, {"relexpires"}, 702, 0l, 0l, 0l, 4, 6, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1259l, {"relpreserved"}, 703, 0l, 0l, 0l, 4, 7, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1259l, {"relhasindex"}, 16, 0l, 0l, 0l, 1, 8, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'c' }, \ +{ 1259l, {"relisshared"}, 16, 0l, 0l, 0l, 1, 9, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'c' }, \ +{ 1259l, {"relkind"}, 18, 0l, 0l, 0l, 1, 10, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'c' }, \ +{ 1259l, {"relarch"}, 18, 0l, 0l, 0l, 1, 11, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'c' }, \ +{ 1259l, {"relnatts"}, 21, 0l, 0l, 0l, 2, 12, 0, '\001', '\001', 0l, 0l, -1l, '\0', 's' }, \ +{ 1259l, {"relsmgr"}, 210l, 0l, 0l, 0l, 2, 13, 0, '\001', '\001', 0l, 0l, -1l, '\0', 's' }, \ +{ 1259l, {"relkey"}, 22, 0l, 0l, 0l, 16, 14, 0, '\0', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1259l, {"relkeyop"}, 30, 0l, 0l, 0l, 32, 15, 0, '\0', '\001', 0l, 0l, -1l, '\0', 'i' }, \ +{ 1259l, {"relhasrules"}, 16, 0l, 0l, 0l, 1, 16, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'c' }, \ +{ 1259l, {"relacl"}, 1034l, 0l, 0l, 0l, -1, 17, 0, '\0', '\001', 0l, 0l, -1l, '\0', 'i' } DATA(insert OID = 0 ( 1259 relname 19 0 0 0 NAMEDATALEN 1 0 f t 0 0 -1 f i)); DATA(insert OID = 0 ( 1259 reltype 26 0 0 0 4 2 0 t t 0 0 -1 f i)); @@ -513,7 +513,7 @@ DATA(insert OID = 0 ( 1273 mask 25 0 0 0 -1 3 0 f t 0 0 -1 f i)); * ---------------- */ #define Schema_pg_variable \ -{ 1264l, {"varfoo"}, 26l, 0l, 0l, 0l, 4, 1, 0, 1, 1, 0l, 0l, -1l, 0, 'i' } +{ 1264l, {"varfoo"}, 26l, 0l, 0l, 0l, 4, 1, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' } DATA(insert OID = 0 ( 1264 varfoo 26 0 0 0 4 1 0 t t 0 0 -1 f i)); @@ -524,7 +524,7 @@ DATA(insert OID = 0 ( 1264 varfoo 26 0 0 0 4 1 0 t t 0 0 -1 f i)); * ---------------- */ #define Schema_pg_log \ -{ 1269l, {"logfoo"}, 26l, 0l, 0l, 0l, 4, 1, 0, 1, 1, 0l, 0l, -1l, 0, 'i' } +{ 1269l, {"logfoo"}, 26l, 0l, 0l, 0l, 4, 1, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' } DATA(insert OID = 0 ( 1269 logfoo 26 0 0 0 4 1 0 t t 0 0 -1 f i)); @@ -535,7 +535,7 @@ DATA(insert OID = 0 ( 1269 logfoo 26 0 0 0 4 1 0 t t 0 0 -1 f i)); * ---------------- */ #define Schema_pg_time \ -{ 1271l, {"timefoo"}, 26l, 0l, 0l, 0l, 4, 1, 0, 1, 1, 0l, 0l, -1l, 0, 'i' } +{ 1271l, {"timefoo"}, 26l, 0l, 0l, 0l, 4, 1, 0, '\001', '\001', 0l, 0l, -1l, '\0', 'i' } DATA(insert OID = 0 ( 1271 timefoo 26 0 0 0 4 1 0 t t 0 0 -1 f i)); diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h index d780d379df..350b4ecc27 100644 --- a/src/include/catalog/pg_type.h +++ b/src/include/catalog/pg_type.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_type.h,v 1.6 1997/01/10 20:44:41 momjian Exp $ + * $Id: pg_type.h,v 1.7 1997/01/14 01:41:57 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -133,24 +133,24 @@ typedef TypeTupleFormData *TypeTupleForm; */ /* OIDS 1 - 99 */ -DATA(insert OID = 16 ( bool PGUID 1 1 t b t 44 0 0 boolin boolout boolin boolout c _null_ )); +DATA(insert OID = 16 ( bool PGUID 1 1 t b t \054 0 0 boolin boolout boolin boolout c _null_ )); #define BOOLOID 16 -DATA(insert OID = 17 ( bytea PGUID -1 -1 f b t 44 0 18 byteain byteaout byteain byteaout i _null_ )); -DATA(insert OID = 18 ( char PGUID 1 1 t b t 44 0 0 charin charout charin charout c _null_ )); +DATA(insert OID = 17 ( bytea PGUID -1 -1 f b t \054 0 18 byteain byteaout byteain byteaout i _null_ )); +DATA(insert OID = 18 ( char PGUID 1 1 t b t \054 0 0 charin charout charin charout c _null_ )); #define CHAROID 18 -DATA(insert OID = 19 ( name PGUID NAMEDATALEN NAMEDATALEN f b t 44 0 18 namein nameout namein nameout d _null_ )); +DATA(insert OID = 19 ( name PGUID NAMEDATALEN NAMEDATALEN f b t \054 0 18 namein nameout namein nameout d _null_ )); #define NAMEOID 19 -DATA(insert OID = 20 ( char16 PGUID 16 16 f b t 44 0 18 char16in char16out char16in char16out i _null_ )); -/*DATA(insert OID = 20 ( dt PGUID 4 10 t b t 44 0 0 dtin dtout dtin dtout i _null_ )); */ -DATA(insert OID = 21 ( int2 PGUID 2 5 t b t 44 0 0 int2in int2out int2in int2out s _null_ )); +DATA(insert OID = 20 ( char16 PGUID 16 16 f b t \054 0 18 char16in char16out char16in char16out i _null_ )); +/*DATA(insert OID = 20 ( dt PGUID 4 10 t b t \054 0 0 dtin dtout dtin dtout i _null_ )); */ +DATA(insert OID = 21 ( int2 PGUID 2 5 t b t \054 0 0 int2in int2out int2in int2out s _null_ )); #define INT2OID 21 -DATA(insert OID = 22 ( int28 PGUID 16 50 f b t 44 0 21 int28in int28out int28in int28out i _null_ )); +DATA(insert OID = 22 ( int28 PGUID 16 50 f b t \054 0 21 int28in int28out int28in int28out i _null_ )); /* * XXX -- the implementation of int28's in postgres is a hack, and will @@ -163,135 +163,135 @@ DATA(insert OID = 22 ( int28 PGUID 16 50 f b t 44 0 21 int28in int28out #define INT28OID 22 -DATA(insert OID = 23 ( int4 PGUID 4 10 t b t 44 0 0 int4in int4out int4in int4out i _null_ )); +DATA(insert OID = 23 ( int4 PGUID 4 10 t b t \054 0 0 int4in int4out int4in int4out i _null_ )); #define INT4OID 23 -DATA(insert OID = 24 ( regproc PGUID 4 16 t b t 44 0 0 regprocin regprocout regprocin regprocout i _null_ )); -DATA(insert OID = 25 ( text PGUID -1 -1 f b t 44 0 18 textin textout textin textout i _null_ )); +DATA(insert OID = 24 ( regproc PGUID 4 16 t b t \054 0 0 regprocin regprocout regprocin regprocout i _null_ )); +DATA(insert OID = 25 ( text PGUID -1 -1 f b t \054 0 18 textin textout textin textout i _null_ )); #define TEXTOID 25 -DATA(insert OID = 26 ( oid PGUID 4 10 t b t 44 0 0 int4in int4out int4in int4out i _null_ )); +DATA(insert OID = 26 ( oid PGUID 4 10 t b t \054 0 0 int4in int4out int4in int4out i _null_ )); #define OIDOID 26 -DATA(insert OID = 27 ( tid PGUID 6 19 f b t 44 0 0 tidin tidout tidin tidout i _null_ )); -DATA(insert OID = 28 ( xid PGUID 4 12 t b t 44 0 0 xidin xidout xidin xidout i _null_ )); -DATA(insert OID = 29 ( cid PGUID 2 3 t b t 44 0 0 cidin cidout cidin cidout s _null_ )); -DATA(insert OID = 30 ( oid8 PGUID 32 89 f b t 44 0 26 oid8in oid8out oid8in oid8out i _null_ )); -DATA(insert OID = 32 ( SET PGUID -1 -1 f r t 44 0 -1 textin textout textin textout i _null_ )); - -DATA(insert OID = 71 ( pg_type PGUID 1 1 t b t 44 1247 0 foo bar foo bar c _null_)); -DATA(insert OID = 75 ( pg_attribute PGUID 1 1 t b t 44 1249 0 foo bar foo bar c _null_)); -DATA(insert OID = 76 ( pg_demon PGUID 1 1 t b t 44 1251 0 foo bar foo bar c _null_)); -DATA(insert OID = 80 ( pg_magic PGUID 1 1 t b t 44 1253 0 foo bar foo bar c _null_)); -DATA(insert OID = 81 ( pg_proc PGUID 1 1 t b t 44 1255 0 foo bar foo bar c _null_)); -DATA(insert OID = 82 ( pg_server PGUID 1 1 t b t 44 1257 0 foo bar foo bar c _null_)); -DATA(insert OID = 83 ( pg_class PGUID 1 1 t b t 44 1259 0 foo bar foo bar c _null_)); -DATA(insert OID = 86 ( pg_user PGUID 1 1 t b t 44 1260 0 foo bar foo bar c _null_)); -DATA(insert OID = 87 ( pg_group PGUID 1 1 t b t 44 1261 0 foo bar foo bar c _null_)); -DATA(insert OID = 88 ( pg_database PGUID 1 1 t b t 44 1262 0 foo bar foo bar c _null_)); -DATA(insert OID = 89 ( pg_defaults PGUID 1 1 t b t 44 1263 0 foo bar foo bar c _null_)); -DATA(insert OID = 90 ( pg_variable PGUID 1 1 t b t 44 1264 0 foo bar foo bar c _null_)); -DATA(insert OID = 99 ( pg_log PGUID 1 1 t b t 44 1269 0 foo bar foo bar c _null_)); +DATA(insert OID = 27 ( tid PGUID 6 19 f b t \054 0 0 tidin tidout tidin tidout i _null_ )); +DATA(insert OID = 28 ( xid PGUID 4 12 t b t \054 0 0 xidin xidout xidin xidout i _null_ )); +DATA(insert OID = 29 ( cid PGUID 2 3 t b t \054 0 0 cidin cidout cidin cidout s _null_ )); +DATA(insert OID = 30 ( oid8 PGUID 32 89 f b t \054 0 26 oid8in oid8out oid8in oid8out i _null_ )); +DATA(insert OID = 32 ( SET PGUID -1 -1 f r t \054 0 -1 textin textout textin textout i _null_ )); + +DATA(insert OID = 71 ( pg_type PGUID 1 1 t b t \054 1247 0 foo bar foo bar c _null_)); +DATA(insert OID = 75 ( pg_attribute PGUID 1 1 t b t \054 1249 0 foo bar foo bar c _null_)); +DATA(insert OID = 76 ( pg_demon PGUID 1 1 t b t \054 1251 0 foo bar foo bar c _null_)); +DATA(insert OID = 80 ( pg_magic PGUID 1 1 t b t \054 1253 0 foo bar foo bar c _null_)); +DATA(insert OID = 81 ( pg_proc PGUID 1 1 t b t \054 1255 0 foo bar foo bar c _null_)); +DATA(insert OID = 82 ( pg_server PGUID 1 1 t b t \054 1257 0 foo bar foo bar c _null_)); +DATA(insert OID = 83 ( pg_class PGUID 1 1 t b t \054 1259 0 foo bar foo bar c _null_)); +DATA(insert OID = 86 ( pg_user PGUID 1 1 t b t \054 1260 0 foo bar foo bar c _null_)); +DATA(insert OID = 87 ( pg_group PGUID 1 1 t b t \054 1261 0 foo bar foo bar c _null_)); +DATA(insert OID = 88 ( pg_database PGUID 1 1 t b t \054 1262 0 foo bar foo bar c _null_)); +DATA(insert OID = 89 ( pg_defaults PGUID 1 1 t b t \054 1263 0 foo bar foo bar c _null_)); +DATA(insert OID = 90 ( pg_variable PGUID 1 1 t b t \054 1264 0 foo bar foo bar c _null_)); +DATA(insert OID = 99 ( pg_log PGUID 1 1 t b t \054 1269 0 foo bar foo bar c _null_)); /* OIDS 100 - 199 */ -DATA(insert OID = 100 ( pg_time PGUID 1 1 t b t 44 1271 0 foo bar foo bar c _null_)); -DATA(insert OID = 101 ( pg_hosts PGUID 1 1 t b t 44 1273 0 foo bar foo bar c _null_)); +DATA(insert OID = 100 ( pg_time PGUID 1 1 t b t \054 1271 0 foo bar foo bar c _null_)); +DATA(insert OID = 101 ( pg_hosts PGUID 1 1 t b t \054 1273 0 foo bar foo bar c _null_)); /* OIDS 200 - 299 */ -DATA(insert OID = 210 ( smgr PGUID 2 12 t b t 44 0 -1 smgrin smgrout smgrin smgrout s _null_ )); +DATA(insert OID = 210 ( smgr PGUID 2 12 t b t \054 0 -1 smgrin smgrout smgrin smgrout s _null_ )); /* OIDS 300 - 399 */ /* OIDS 400 - 499 */ -DATA(insert OID = 409 ( char2 PGUID 2 2 t b t 44 0 18 char2in char2out char2in char2out s _null_ )); -DATA(insert OID = 410 ( char4 PGUID 4 4 t b t 44 0 18 char4in char4out char4in char4out i _null_ )); -DATA(insert OID = 411 ( char8 PGUID 8 8 f b t 44 0 18 char8in char8out char8in char8out i _null_ )); +DATA(insert OID = 409 ( char2 PGUID 2 2 t b t \054 0 18 char2in char2out char2in char2out s _null_ )); +DATA(insert OID = 410 ( char4 PGUID 4 4 t b t \054 0 18 char4in char4out char4in char4out i _null_ )); +DATA(insert OID = 411 ( char8 PGUID 8 8 f b t \054 0 18 char8in char8out char8in char8out i _null_ )); /* OIDS 500 - 599 */ /* OIDS 600 - 699 */ -DATA(insert OID = 600 ( point PGUID 16 24 f b t 44 0 701 point_in point_out point_in point_out d _null_ )); -DATA(insert OID = 601 ( lseg PGUID 32 48 f b t 44 0 600 lseg_in lseg_out lseg_in lseg_out d _null_ )); -DATA(insert OID = 602 ( path PGUID -1 -1 f b t 44 0 600 path_in path_out path_in path_out d _null_ )); -DATA(insert OID = 603 ( box PGUID 32 100 f b t 59 0 600 box_in box_out box_in box_out d _null_ )); -DATA(insert OID = 604 ( polygon PGUID -1 -1 f b t 44 0 -1 poly_in poly_out poly_in poly_out d _null_ )); -DATA(insert OID = 605 ( filename PGUID 256 -1 f b t 44 0 18 filename_in filename_out filename_in filename_out i _null_ )); +DATA(insert OID = 600 ( point PGUID 16 24 f b t \054 0 701 point_in point_out point_in point_out d _null_ )); +DATA(insert OID = 601 ( lseg PGUID 32 48 f b t \054 0 600 lseg_in lseg_out lseg_in lseg_out d _null_ )); +DATA(insert OID = 602 ( path PGUID -1 -1 f b t \054 0 600 path_in path_out path_in path_out d _null_ )); +DATA(insert OID = 603 ( box PGUID 32 100 f b t \073 0 600 box_in box_out box_in box_out d _null_ )); +DATA(insert OID = 604 ( polygon PGUID -1 -1 f b t \054 0 -1 poly_in poly_out poly_in poly_out d _null_ )); +DATA(insert OID = 605 ( filename PGUID 256 -1 f b t \054 0 18 filename_in filename_out filename_in filename_out i _null_ )); /* OIDS 700 - 799 */ #define FLOAT4OID 700 -DATA(insert OID = 700 ( float4 PGUID 4 12 f b t 44 0 0 float4in float4out float4in float4out i _null_ )); +DATA(insert OID = 700 ( float4 PGUID 4 12 f b t \054 0 0 float4in float4out float4in float4out i _null_ )); #define FLOAT8OID 701 -DATA(insert OID = 701 ( float8 PGUID 8 24 f b t 44 0 0 float8in float8out float8in float8out d _null_ )); -DATA(insert OID = 702 ( abstime PGUID 4 20 t b t 44 0 0 nabstimein nabstimeout nabstimein nabstimeout i _null_ )); -DATA(insert OID = 703 ( reltime PGUID 4 20 t b t 44 0 0 reltimein reltimeout reltimein reltimeout i _null_ )); -DATA(insert OID = 704 ( tinterval PGUID 12 47 f b t 44 0 0 tintervalin tintervalout tintervalin tintervalout i _null_ )); -DATA(insert OID = 705 ( unknown PGUID -1 -1 f b t 44 0 18 textin textout textin textout i _null_ )); +DATA(insert OID = 701 ( float8 PGUID 8 24 f b t \054 0 0 float8in float8out float8in float8out d _null_ )); +DATA(insert OID = 702 ( abstime PGUID 4 20 t b t \054 0 0 nabstimein nabstimeout nabstimein nabstimeout i _null_ )); +DATA(insert OID = 703 ( reltime PGUID 4 20 t b t \054 0 0 reltimein reltimeout reltimein reltimeout i _null_ )); +DATA(insert OID = 704 ( tinterval PGUID 12 47 f b t \054 0 0 tintervalin tintervalout tintervalin tintervalout i _null_ )); +DATA(insert OID = 705 ( unknown PGUID -1 -1 f b t \054 0 18 textin textout textin textout i _null_ )); #define UNKNOWNOID 705 /* OIDS 800 - 899 */ -DATA(insert OID = 810 ( oidint2 PGUID 6 20 f b t 44 0 0 oidint2in oidint2out oidint2in oidint2out i _null_ )); +DATA(insert OID = 810 ( oidint2 PGUID 6 20 f b t \054 0 0 oidint2in oidint2out oidint2in oidint2out i _null_ )); /* OIDS 900 - 999 */ -DATA(insert OID = 910 ( oidint4 PGUID 8 20 f b t 44 0 0 oidint4in oidint4out oidint4in oidint4out i _null_ )); -DATA(insert OID = 911 ( oidname PGUID OIDNAMELEN OIDNAMELEN f b t 44 0 0 oidnamein oidnameout oidnamein oidnameout i _null_ )); +DATA(insert OID = 910 ( oidint4 PGUID 8 20 f b t \054 0 0 oidint4in oidint4out oidint4in oidint4out i _null_ )); +DATA(insert OID = 911 ( oidname PGUID OIDNAMELEN OIDNAMELEN f b t \054 0 0 oidnamein oidnameout oidnamein oidnameout i _null_ )); /* OIDS 1000 - 1099 */ -DATA(insert OID = 1000 ( _bool PGUID -1 -1 f b t 44 0 16 array_in array_out array_in array_out i _null_ )); -DATA(insert OID = 1001 ( _bytea PGUID -1 -1 f b t 44 0 17 array_in array_out array_in array_out i _null_ )); -DATA(insert OID = 1002 ( _char PGUID -1 -1 f b t 44 0 18 array_in array_out array_in array_out i _null_ )); -DATA(insert OID = 1003 ( _name PGUID -1 -1 f b t 44 0 19 array_in array_out array_in array_out i _null_ )); -DATA(insert OID = 1004 ( _char16 PGUID -1 -1 f b t 44 0 20 array_in array_out array_in array_out i _null_ )); -DATA(insert OID = 1005 ( _int2 PGUID -1 -1 f b t 44 0 21 array_in array_out array_in array_out i _null_ )); -DATA(insert OID = 1006 ( _int28 PGUID -1 -1 f b t 44 0 22 array_in array_out array_in array_out i _null_ )); -DATA(insert OID = 1007 ( _int4 PGUID -1 -1 f b t 44 0 23 array_in array_out array_in array_out i _null_ )); -DATA(insert OID = 1008 ( _regproc PGUID -1 -1 f b t 44 0 24 array_in array_out array_in array_out i _null_ )); -DATA(insert OID = 1009 ( _text PGUID -1 -1 f b t 44 0 25 array_in array_out array_in array_out i _null_ )); -DATA(insert OID = 1028 ( _oid PGUID -1 -1 f b t 44 0 26 array_in array_out array_in array_out i _null_ )); -DATA(insert OID = 1010 ( _tid PGUID -1 -1 f b t 44 0 27 array_in array_out array_in array_out i _null_ )); -DATA(insert OID = 1011 ( _xid PGUID -1 -1 f b t 44 0 28 array_in array_out array_in array_out i _null_ )); -DATA(insert OID = 1012 ( _cid PGUID -1 -1 f b t 44 0 29 array_in array_out array_in array_out i _null_ )); -DATA(insert OID = 1013 ( _oid8 PGUID -1 -1 f b t 44 0 30 array_in array_out array_in array_out i _null_ )); -/*DATA(insert OID = 1014 ( _lock PGUID -1 -1 f b t 44 0 31 array_in array_out array_in array_out i _null_ ));*/ -DATA(insert OID = 1015 ( _stub PGUID -1 -1 f b t 44 0 33 array_in array_out array_in array_out i _null_ )); -DATA(insert OID = 1016 ( _ref PGUID -1 -1 f b t 44 0 591 array_in array_out array_in array_out i _null_ )); -DATA(insert OID = 1017 ( _point PGUID -1 -1 f b t 44 0 600 array_in array_out array_in array_out d _null_ )); -DATA(insert OID = 1018 ( _lseg PGUID -1 -1 f b t 44 0 601 array_in array_out array_in array_out d _null_ )); -DATA(insert OID = 1019 ( _path PGUID -1 -1 f b t 44 0 602 array_in array_out array_in array_out d _null_ )); -DATA(insert OID = 1020 ( _box PGUID -1 -1 f b t 59 0 603 array_in array_out array_in array_out d _null_ )); -DATA(insert OID = 1021 ( _float4 PGUID -1 -1 f b t 44 0 700 array_in array_out array_in array_out i _null_ )); -DATA(insert OID = 1022 ( _float8 PGUID -1 -1 f b t 44 0 701 array_in array_out array_in array_out d _null_ )); -DATA(insert OID = 1023 ( _abstime PGUID -1 -1 f b t 44 0 702 array_in array_out array_in array_out i _null_ )); -DATA(insert OID = 1024 ( _reltime PGUID -1 -1 f b t 44 0 703 array_in array_out array_in array_out i _null_ )); -DATA(insert OID = 1025 ( _tinterval PGUID -1 -1 f b t 44 0 704 array_in array_out array_in array_out i _null_ )); -DATA(insert OID = 1026 ( _filename PGUID -1 -1 f b t 44 0 605 array_in array_out array_in array_out i _null_ )); -DATA(insert OID = 1027 ( _polygon PGUID -1 -1 f b t 44 0 604 array_in array_out array_in array_out d _null_ )); +DATA(insert OID = 1000 ( _bool PGUID -1 -1 f b t \054 0 16 array_in array_out array_in array_out i _null_ )); +DATA(insert OID = 1001 ( _bytea PGUID -1 -1 f b t \054 0 17 array_in array_out array_in array_out i _null_ )); +DATA(insert OID = 1002 ( _char PGUID -1 -1 f b t \054 0 18 array_in array_out array_in array_out i _null_ )); +DATA(insert OID = 1003 ( _name PGUID -1 -1 f b t \054 0 19 array_in array_out array_in array_out i _null_ )); +DATA(insert OID = 1004 ( _char16 PGUID -1 -1 f b t \054 0 20 array_in array_out array_in array_out i _null_ )); +DATA(insert OID = 1005 ( _int2 PGUID -1 -1 f b t \054 0 21 array_in array_out array_in array_out i _null_ )); +DATA(insert OID = 1006 ( _int28 PGUID -1 -1 f b t \054 0 22 array_in array_out array_in array_out i _null_ )); +DATA(insert OID = 1007 ( _int4 PGUID -1 -1 f b t \054 0 23 array_in array_out array_in array_out i _null_ )); +DATA(insert OID = 1008 ( _regproc PGUID -1 -1 f b t \054 0 24 array_in array_out array_in array_out i _null_ )); +DATA(insert OID = 1009 ( _text PGUID -1 -1 f b t \054 0 25 array_in array_out array_in array_out i _null_ )); +DATA(insert OID = 1028 ( _oid PGUID -1 -1 f b t \054 0 26 array_in array_out array_in array_out i _null_ )); +DATA(insert OID = 1010 ( _tid PGUID -1 -1 f b t \054 0 27 array_in array_out array_in array_out i _null_ )); +DATA(insert OID = 1011 ( _xid PGUID -1 -1 f b t \054 0 28 array_in array_out array_in array_out i _null_ )); +DATA(insert OID = 1012 ( _cid PGUID -1 -1 f b t \054 0 29 array_in array_out array_in array_out i _null_ )); +DATA(insert OID = 1013 ( _oid8 PGUID -1 -1 f b t \054 0 30 array_in array_out array_in array_out i _null_ )); +/*DATA(insert OID = 1014 ( _lock PGUID -1 -1 f b t \054 0 31 array_in array_out array_in array_out i _null_ ));*/ +DATA(insert OID = 1015 ( _stub PGUID -1 -1 f b t \054 0 33 array_in array_out array_in array_out i _null_ )); +DATA(insert OID = 1016 ( _ref PGUID -1 -1 f b t \054 0 591 array_in array_out array_in array_out i _null_ )); +DATA(insert OID = 1017 ( _point PGUID -1 -1 f b t \054 0 600 array_in array_out array_in array_out d _null_ )); +DATA(insert OID = 1018 ( _lseg PGUID -1 -1 f b t \054 0 601 array_in array_out array_in array_out d _null_ )); +DATA(insert OID = 1019 ( _path PGUID -1 -1 f b t \054 0 602 array_in array_out array_in array_out d _null_ )); +DATA(insert OID = 1020 ( _box PGUID -1 -1 f b t \073 0 603 array_in array_out array_in array_out d _null_ )); +DATA(insert OID = 1021 ( _float4 PGUID -1 -1 f b t \054 0 700 array_in array_out array_in array_out i _null_ )); +DATA(insert OID = 1022 ( _float8 PGUID -1 -1 f b t \054 0 701 array_in array_out array_in array_out d _null_ )); +DATA(insert OID = 1023 ( _abstime PGUID -1 -1 f b t \054 0 702 array_in array_out array_in array_out i _null_ )); +DATA(insert OID = 1024 ( _reltime PGUID -1 -1 f b t \054 0 703 array_in array_out array_in array_out i _null_ )); +DATA(insert OID = 1025 ( _tinterval PGUID -1 -1 f b t \054 0 704 array_in array_out array_in array_out i _null_ )); +DATA(insert OID = 1026 ( _filename PGUID -1 -1 f b t \054 0 605 array_in array_out array_in array_out i _null_ )); +DATA(insert OID = 1027 ( _polygon PGUID -1 -1 f b t \054 0 604 array_in array_out array_in array_out d _null_ )); /* Note: the size of an aclitem needs to match sizeof(AclItem) in acl.h */ -DATA(insert OID = 1033 ( aclitem PGUID 8 -1 f b t 44 0 0 aclitemin aclitemout aclitemin aclitemout i _null_ )); -DATA(insert OID = 1034 ( _aclitem PGUID -1 -1 f b t 44 0 1033 array_in array_out array_in array_out i _null_ )); +DATA(insert OID = 1033 ( aclitem PGUID 8 -1 f b t \054 0 0 aclitemin aclitemout aclitemin aclitemout i _null_ )); +DATA(insert OID = 1034 ( _aclitem PGUID -1 -1 f b t \054 0 1033 array_in array_out array_in array_out i _null_ )); -DATA(insert OID = 1039 ( _char2 PGUID -1 -1 f b t 44 0 409 array_in array_out array_in array_out i _null_ )); -DATA(insert OID = 1040 ( _char4 PGUID -1 -1 f b t 44 0 410 array_in array_out array_in array_out i _null_ )); -DATA(insert OID = 1041 ( _char8 PGUID -1 -1 f b t 44 0 411 array_in array_out array_in array_out i _null_ )); +DATA(insert OID = 1039 ( _char2 PGUID -1 -1 f b t \054 0 409 array_in array_out array_in array_out i _null_ )); +DATA(insert OID = 1040 ( _char4 PGUID -1 -1 f b t \054 0 410 array_in array_out array_in array_out i _null_ )); +DATA(insert OID = 1041 ( _char8 PGUID -1 -1 f b t \054 0 411 array_in array_out array_in array_out i _null_ )); #define BPCHAROID 1042 -DATA(insert OID = 1042 ( bpchar PGUID -1 -1 f b t 44 0 18 bpcharin bpcharout bpcharin bpcharout i _null_ )); +DATA(insert OID = 1042 ( bpchar PGUID -1 -1 f b t \054 0 18 bpcharin bpcharout bpcharin bpcharout i _null_ )); #define VARCHAROID 1043 -DATA(insert OID = 1043 ( varchar PGUID -1 -1 f b t 44 0 18 varcharin varcharout varcharin varcharout i _null_ )); +DATA(insert OID = 1043 ( varchar PGUID -1 -1 f b t \054 0 18 varcharin varcharout varcharin varcharout i _null_ )); -DATA(insert OID = 1082 ( date PGUID 4 10 t b t 44 0 0 date_in date_out date_in date_out i _null_ )); -DATA(insert OID = 1083 ( time PGUID 8 16 f b t 44 0 0 time_in time_out time_in time_out i _null_ )); -DATA(insert OID = 1182 ( _date PGUID -1 -1 f b t 44 0 1082 array_in array_out array_in array_out i _null_ )); -DATA(insert OID = 1183 ( _time PGUID -1 -1 f b t 44 0 1083 array_in array_out array_in array_out d _null_ )); +DATA(insert OID = 1082 ( date PGUID 4 10 t b t \054 0 0 date_in date_out date_in date_out i _null_ )); +DATA(insert OID = 1083 ( time PGUID 8 16 f b t \054 0 0 time_in time_out time_in time_out i _null_ )); +DATA(insert OID = 1182 ( _date PGUID -1 -1 f b t \054 0 1082 array_in array_out array_in array_out i _null_ )); +DATA(insert OID = 1183 ( _time PGUID -1 -1 f b t \054 0 1083 array_in array_out array_in array_out d _null_ )); /* * prototypes for functions in pg_type.c */ diff --git a/src/test/regress/expected.input b/src/test/regress/expected.input index eac0e28fc3..5e3e57c080 100644 --- a/src/test/regress/expected.input +++ b/src/test/regress/expected.input @@ -2106,11 +2106,11 @@ QUERY: SELECT '' AS bad, f.f1 * '1e200' from FLOAT8_TBL f; WARN: Bad float8 input format -- overflow QUERY: SELECT '' AS bad, f.f1 ^ '1e200' from FLOAT8_TBL f; -WARN:pow() returned a floating point out of the range +WARN: Bad float8 input format -- overflow -QUERY: SELECT '' AS bad, ; (f.f1) from FLOAT8_TBL f where f.f1 = '0.0' ; +QUERY: SELECT '' AS bad, (; (f.f1)) from FLOAT8_TBL f where f.f1 = '0.0' ; WARN:can't take log of 0! -QUERY: SELECT '' AS bad, ; (f.f1) from FLOAT8_TBL f where f.f1 < '0.0' ; +QUERY: SELECT '' AS bad, (; (f.f1)) from FLOAT8_TBL f where f.f1 < '0.0' ; WARN:can't take log of a negative number QUERY: SELECT '' AS bad, : (f.f1) from FLOAT8_TBL f; WARN:exp() returned a floating point out of range @@ -6521,7 +6521,6 @@ f |27 QUERY: ALTER TABLE f_star ADD COLUMN f int4; QUERY: UPDATE f_star SET f = 10; QUERY: ALTER TABLE e_star* ADD COLUMN e int4; - QUERY: SELECT * FROM e_star*; class|aa|cc | ee|e -----+--+-----------+---+- @@ -6551,7 +6550,6 @@ f | | | | (23 rows) QUERY: ALTER TABLE a_star* ADD COLUMN a text; - QUERY: SELECT class, aa, a FROM a_star*; class|aa|a -----+--+- diff --git a/src/test/regress/queries.source b/src/test/regress/queries.source index 07d1181c2e..49e5bdc78a 100644 --- a/src/test/regress/queries.source +++ b/src/test/regress/queries.source @@ -1,7 +1,7 @@ -- -- queries.source -- --- $Header: /cvsroot/pgsql/src/test/regress/Attic/queries.source,v 1.6 1996/12/02 14:17:59 momjian Exp $ +-- $Header: /cvsroot/pgsql/src/test/regress/Attic/queries.source,v 1.7 1997/01/14 01:42:38 momjian Exp $ -- -- The comments that contain sequences of UNIX commands generate the -- desired output for the POSTQUEL statement(s). @@ -837,9 +837,9 @@ SELECT '' AS bad, f.f1 * '1e200' from FLOAT8_TBL f; SELECT '' AS bad, f.f1 ^ '1e200' from FLOAT8_TBL f; -SELECT '' AS bad, : (f.f1) from FLOAT8_TBL f where f.f1 = '0.0' ; +SELECT '' AS bad, (; (f.f1)) from FLOAT8_TBL f where f.f1 = '0.0' ; -SELECT '' AS bad, : (f.f1) from FLOAT8_TBL f where f.f1 < '0.0' ; +SELECT '' AS bad, (; (f.f1)) from FLOAT8_TBL f where f.f1 < '0.0' ; SELECT '' AS bad, : (f.f1) from FLOAT8_TBL f; -- 2.40.0