git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Change catalog entries for record_out and record_send to show only one

2005年4月30日 20:31:39 +0000 (20:31 +0000)

argument, since that's all they are using now. Adjust type_sanity
regression test so that it will complain if anyone tries to define
multiple-argument output functions in future.

src/include/catalog/catversion.h patch | blob | blame | history

src/include/catalog/pg_proc.h patch | blob | blame | history

src/test/regress/expected/type_sanity.out patch | blob | blame | history

src/test/regress/sql/type_sanity.sql patch | blob | blame | history

diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h

index 43d538cba70313529d0a9b4eae1fe195c5c6a89b..5916608374fe2a2c463b6ab307d5afeac4593c8c 100644 (file)

--- a/src/include/catalog/catversion.h

+++ b/src/include/catalog/catversion.h

@@ -37,7 +37,7 @@

- * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.265 2005年04月14日 01:38:20 tgl Exp $

+ * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.266 2005年04月30日 20:31:37 tgl Exp $

*-------------------------------------------------------------------------

@@ -53,6 +53,6 @@

/* yyyymmddN */

-#define CATALOG_VERSION_NO 200504131

+#define CATALOG_VERSION_NO 200504301

#endif

diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h

index 27c6cb7ea8fd78dfaff2ffdf62e5020364a5eafb..c1912c099866090bbe2bc736d95e24e8f7cb908a 100644 (file)

--- a/src/include/catalog/pg_proc.h

+++ b/src/include/catalog/pg_proc.h

@@ -7,7 +7,7 @@

- * $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.359 2005年04月14日 01:38:20 tgl Exp $

+ * $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.360 2005年04月30日 20:31:38 tgl Exp $

* NOTES

* The script catalog/genbki.sh reads this file and generates .bki

@@ -3221,7 +3221,7 @@ DESCR("current user privilege on tablespace by tablespace oid");

DATA(insert OID = 2290 ( record_in PGNSP PGUID 12 f f t f v 2 2249 "2275 26" _null_ _null_ _null_ record_in - _null_ ));

DESCR("I/O");

-DATA(insert OID = 2291 ( record_out PGNSP PGUID 12 f f t f v 2 2275 "2249 26" _null_ _null_ _null_ record_out - _null_ ));

+DATA(insert OID = 2291 ( record_out PGNSP PGUID 12 f f t f v 1 2275 "2249" _null_ _null_ _null_ record_out - _null_ ));

DESCR("I/O");

DATA(insert OID = 2292 ( cstring_in PGNSP PGUID 12 f f t f i 1 2275 "2275" _null_ _null_ _null_ cstring_in - _null_ ));

DESCR("I/O");

@@ -3364,7 +3364,7 @@ DATA(insert OID = 2401 ( array_send PGNSP PGUID 12 f f t f s 1 17 "2277" _n

DESCR("I/O");

DATA(insert OID = 2402 ( record_recv PGNSP PGUID 12 f f t f v 2 2249 "2281 26" _null_ _null_ _null_ record_recv - _null_ ));

DESCR("I/O");

-DATA(insert OID = 2403 ( record_send PGNSP PGUID 12 f f t f v 2 17 "2249 26" _null_ _null_ _null_ record_send - _null_ ));

+DATA(insert OID = 2403 ( record_send PGNSP PGUID 12 f f t f v 1 17 "2249" _null_ _null_ _null_ record_send - _null_ ));

DESCR("I/O");

DATA(insert OID = 2404 ( int2recv PGNSP PGUID 12 f f t f i 1 21 "2281" _null_ _null_ _null_ int2recv - _null_ ));

DESCR("I/O");

diff --git a/src/test/regress/expected/type_sanity.out b/src/test/regress/expected/type_sanity.out

index 881220bf2893d3aaf9b35dc167098be09e53d044..0ff439125840f126851eb24b6651d12c6f76330d 100644 (file)

--- a/src/test/regress/expected/type_sanity.out

+++ b/src/test/regress/expected/type_sanity.out

@@ -125,11 +125,10 @@ ORDER BY 1;

SELECT p1.oid, p1.typname, p2.oid, p2.proname

FROM pg_type AS p1, pg_proc AS p2

WHERE p1.typoutput = p2.oid AND p1.typtype in ('b', 'p') AND NOT

- ((p2.pronargs = 1 AND p2.proargtypes[0] = p1.oid) OR

- (p2.pronargs = 2 AND p2.proargtypes[0] = p1.oid AND

- p2.proargtypes[1] = 'oid'::regtype) OR

- (p2.oid = 'array_out'::regproc AND

- p1.typelem != 0 AND p1.typlen = -1))

+ (p2.pronargs = 1 AND

+ (p2.proargtypes[0] = p1.oid OR

+ (p2.oid = 'array_out'::regproc AND

+ p1.typelem != 0 AND p1.typlen = -1)))

ORDER BY 1;

oid | typname | oid | proname

------+-----------+-----+---------

@@ -188,11 +187,10 @@ ORDER BY 1;

SELECT p1.oid, p1.typname, p2.oid, p2.proname

FROM pg_type AS p1, pg_proc AS p2

WHERE p1.typsend = p2.oid AND p1.typtype in ('b', 'p') AND NOT

- ((p2.pronargs = 1 AND p2.proargtypes[0] = p1.oid) OR

- (p2.pronargs = 2 AND p2.proargtypes[0] = p1.oid AND

- p2.proargtypes[1] = 'oid'::regtype) OR

- (p2.oid = 'array_send'::regproc AND

- p1.typelem != 0 AND p1.typlen = -1))

+ (p2.pronargs = 1 AND

+ (p2.proargtypes[0] = p1.oid OR

+ (p2.oid = 'array_send'::regproc AND

+ p1.typelem != 0 AND p1.typlen = -1)))

ORDER BY 1;

oid | typname | oid | proname

------+-----------+------+----------

diff --git a/src/test/regress/sql/type_sanity.sql b/src/test/regress/sql/type_sanity.sql

index 81f83525dddf2ecb6e1332c2b331ccc9814e7e70..2dc2c6267ce8e25153b51f9df195d79dec407cab 100644 (file)

--- a/src/test/regress/sql/type_sanity.sql

+++ b/src/test/regress/sql/type_sanity.sql

@@ -103,11 +103,10 @@ ORDER BY 1;

SELECT p1.oid, p1.typname, p2.oid, p2.proname

FROM pg_type AS p1, pg_proc AS p2

WHERE p1.typoutput = p2.oid AND p1.typtype in ('b', 'p') AND NOT

- ((p2.pronargs = 1 AND p2.proargtypes[0] = p1.oid) OR

- (p2.pronargs = 2 AND p2.proargtypes[0] = p1.oid AND

- p2.proargtypes[1] = 'oid'::regtype) OR

- (p2.oid = 'array_out'::regproc AND

- p1.typelem != 0 AND p1.typlen = -1))

+ (p2.pronargs = 1 AND

+ (p2.proargtypes[0] = p1.oid OR

+ (p2.oid = 'array_out'::regproc AND

+ p1.typelem != 0 AND p1.typlen = -1)))

ORDER BY 1;

SELECT p1.oid, p1.typname, p2.oid, p2.proname

@@ -149,11 +148,10 @@ ORDER BY 1;

SELECT p1.oid, p1.typname, p2.oid, p2.proname

FROM pg_type AS p1, pg_proc AS p2

WHERE p1.typsend = p2.oid AND p1.typtype in ('b', 'p') AND NOT

- ((p2.pronargs = 1 AND p2.proargtypes[0] = p1.oid) OR

- (p2.pronargs = 2 AND p2.proargtypes[0] = p1.oid AND

- p2.proargtypes[1] = 'oid'::regtype) OR

- (p2.oid = 'array_send'::regproc AND

- p1.typelem != 0 AND p1.typlen = -1))

+ (p2.pronargs = 1 AND

+ (p2.proargtypes[0] = p1.oid OR

+ (p2.oid = 'array_send'::regproc AND

+ p1.typelem != 0 AND p1.typlen = -1)))

ORDER BY 1;

SELECT p1.oid, p1.typname, p2.oid, p2.proname

This is the main PostgreSQL git repository.

RSS Atom