Commit 7ce0f9c3 authored by Bruce Momjian's avatar Bruce Momjian

Adjust elog() tags so source and regression tests match.

parent 7d1b8fe7
...@@ -216,7 +216,7 @@ INSERT INTO tmp VALUES (null, 'Y', null); ...@@ -216,7 +216,7 @@ INSERT INTO tmp VALUES (null, 'Y', null);
INSERT INTO tmp VALUES (5, '!check failed', null); INSERT INTO tmp VALUES (5, '!check failed', null);
INSERT INTO tmp VALUES (null, 'try again', null); INSERT INTO tmp VALUES (null, 'try again', null);
INSERT INTO INSERT_TBL(y) select yd from tmp; INSERT INTO INSERT_TBL(y) select yd from tmp;
NOTICE: insert_seq.nextval: sequence was re-created WARNING: insert_seq.nextval: sequence was re-created
SELECT '' AS three, * FROM INSERT_TBL; SELECT '' AS three, * FROM INSERT_TBL;
three | x | y | z three | x | y | z
-------+---+---------------+---- -------+---+---------------+----
...@@ -286,7 +286,7 @@ SELECT * FROM COPY_TBL; ...@@ -286,7 +286,7 @@ SELECT * FROM COPY_TBL;
-- Primary keys -- Primary keys
-- --
CREATE TABLE PRIMARY_TBL (i int PRIMARY KEY, t text); CREATE TABLE PRIMARY_TBL (i int PRIMARY KEY, t text);
INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'primary_tbl_pkey' for table 'primary_tbl' NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'primary_tbl_pkey' for table 'primary_tbl'
INSERT INTO PRIMARY_TBL VALUES (1, 'one'); INSERT INTO PRIMARY_TBL VALUES (1, 'one');
INSERT INTO PRIMARY_TBL VALUES (2, 'two'); INSERT INTO PRIMARY_TBL VALUES (2, 'two');
INSERT INTO PRIMARY_TBL VALUES (1, 'three'); INSERT INTO PRIMARY_TBL VALUES (1, 'three');
...@@ -307,7 +307,7 @@ SELECT '' AS four, * FROM PRIMARY_TBL; ...@@ -307,7 +307,7 @@ SELECT '' AS four, * FROM PRIMARY_TBL;
DROP TABLE PRIMARY_TBL; DROP TABLE PRIMARY_TBL;
CREATE TABLE PRIMARY_TBL (i int, t text, CREATE TABLE PRIMARY_TBL (i int, t text,
PRIMARY KEY(i,t)); PRIMARY KEY(i,t));
INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'primary_tbl_pkey' for table 'primary_tbl' NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'primary_tbl_pkey' for table 'primary_tbl'
INSERT INTO PRIMARY_TBL VALUES (1, 'one'); INSERT INTO PRIMARY_TBL VALUES (1, 'one');
INSERT INTO PRIMARY_TBL VALUES (2, 'two'); INSERT INTO PRIMARY_TBL VALUES (2, 'two');
INSERT INTO PRIMARY_TBL VALUES (1, 'three'); INSERT INTO PRIMARY_TBL VALUES (1, 'three');
...@@ -330,7 +330,7 @@ DROP TABLE PRIMARY_TBL; ...@@ -330,7 +330,7 @@ DROP TABLE PRIMARY_TBL;
-- Unique keys -- Unique keys
-- --
CREATE TABLE UNIQUE_TBL (i int UNIQUE, t text); CREATE TABLE UNIQUE_TBL (i int UNIQUE, t text);
INFO: CREATE TABLE / UNIQUE will create implicit index 'unique_tbl_i_key' for table 'unique_tbl' NOTICE: CREATE TABLE / UNIQUE will create implicit index 'unique_tbl_i_key' for table 'unique_tbl'
INSERT INTO UNIQUE_TBL VALUES (1, 'one'); INSERT INTO UNIQUE_TBL VALUES (1, 'one');
INSERT INTO UNIQUE_TBL VALUES (2, 'two'); INSERT INTO UNIQUE_TBL VALUES (2, 'two');
INSERT INTO UNIQUE_TBL VALUES (1, 'three'); INSERT INTO UNIQUE_TBL VALUES (1, 'three');
...@@ -353,7 +353,7 @@ SELECT '' AS five, * FROM UNIQUE_TBL; ...@@ -353,7 +353,7 @@ SELECT '' AS five, * FROM UNIQUE_TBL;
DROP TABLE UNIQUE_TBL; DROP TABLE UNIQUE_TBL;
CREATE TABLE UNIQUE_TBL (i int, t text, CREATE TABLE UNIQUE_TBL (i int, t text,
UNIQUE(i,t)); UNIQUE(i,t));
INFO: CREATE TABLE / UNIQUE will create implicit index 'unique_tbl_i_key' for table 'unique_tbl' NOTICE: CREATE TABLE / UNIQUE will create implicit index 'unique_tbl_i_key' for table 'unique_tbl'
INSERT INTO UNIQUE_TBL VALUES (1, 'one'); INSERT INTO UNIQUE_TBL VALUES (1, 'one');
INSERT INTO UNIQUE_TBL VALUES (2, 'two'); INSERT INTO UNIQUE_TBL VALUES (2, 'two');
INSERT INTO UNIQUE_TBL VALUES (1, 'three'); INSERT INTO UNIQUE_TBL VALUES (1, 'three');
......
...@@ -5,7 +5,7 @@ CREATE FUNCTION widget_in(opaque) ...@@ -5,7 +5,7 @@ CREATE FUNCTION widget_in(opaque)
RETURNS widget RETURNS widget
AS '@abs_builddir@/regress@DLSUFFIX@' AS '@abs_builddir@/regress@DLSUFFIX@'
LANGUAGE 'c'; LANGUAGE 'c';
NOTICE: ProcedureCreate: type widget is not yet defined WARNING: ProcedureCreate: type widget is not yet defined
CREATE FUNCTION widget_out(opaque) CREATE FUNCTION widget_out(opaque)
RETURNS opaque RETURNS opaque
AS '@abs_builddir@/regress@DLSUFFIX@' AS '@abs_builddir@/regress@DLSUFFIX@'
......
...@@ -13,8 +13,8 @@ CREATE FUNCTION hobbies_by_name(hobbies_r.name%TYPE) ...@@ -13,8 +13,8 @@ CREATE FUNCTION hobbies_by_name(hobbies_r.name%TYPE)
RETURNS hobbies_r.person%TYPE RETURNS hobbies_r.person%TYPE
AS 'select person from hobbies_r where name = $1' AS 'select person from hobbies_r where name = $1'
LANGUAGE 'sql'; LANGUAGE 'sql';
INFO: hobbies_r.name%TYPE converted to text NOTICE: hobbies_r.name%TYPE converted to text
INFO: hobbies_r.person%TYPE converted to text NOTICE: hobbies_r.person%TYPE converted to text
CREATE FUNCTION equipment(hobbies_r) CREATE FUNCTION equipment(hobbies_r)
RETURNS setof equipment_r RETURNS setof equipment_r
AS 'select * from equipment_r where hobby = $1.name' AS 'select * from equipment_r where hobby = $1.name'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment