diff options
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/regress/expected/alter_generic.out | 2 | ||||
-rw-r--r-- | src/test/regress/expected/json.out | 18 | ||||
-rw-r--r-- | src/test/regress/expected/json_1.out | 18 | ||||
-rw-r--r-- | src/test/regress/expected/plpgsql.out | 4 | ||||
-rw-r--r-- | src/test/regress/expected/select_views.out | 2 | ||||
-rw-r--r-- | src/test/regress/expected/select_views_1.out | 2 | ||||
-rw-r--r-- | src/test/regress/expected/uuid.out | 4 | ||||
-rw-r--r-- | src/test/regress/sql/alter_generic.sql | 2 | ||||
-rw-r--r-- | src/test/regress/sql/json.sql | 18 | ||||
-rw-r--r-- | src/test/regress/sql/plpgsql.sql | 5 | ||||
-rw-r--r-- | src/test/regress/sql/select_views.sql | 2 | ||||
-rw-r--r-- | src/test/regress/sql/uuid.sql | 4 |
12 files changed, 40 insertions, 41 deletions
diff --git a/src/test/regress/expected/alter_generic.out b/src/test/regress/expected/alter_generic.out index 4e4df0cc940..7845b8af591 100644 --- a/src/test/regress/expected/alter_generic.out +++ b/src/test/regress/expected/alter_generic.out @@ -442,7 +442,7 @@ ERROR: hash procedures must have one argument DROP OPERATOR FAMILY alt_opf15 USING hash; ERROR: current transaction is aborted, commands ignored until end of transaction block ROLLBACK; --- Should fail. In gist throw an error when giving different data types for function argument +-- Should fail. In gist throw an error when giving different data types for function argument -- without defining left / right type in ALTER OPERATOR FAMILY ... ADD FUNCTION CREATE OPERATOR FAMILY alt_opf16 USING gist; ALTER OPERATOR FAMILY alt_opf16 USING gist ADD FUNCTION 1 btint42cmp(int4, int2); diff --git a/src/test/regress/expected/json.out b/src/test/regress/expected/json.out index d7e96941322..a8c45b3d2fa 100644 --- a/src/test/regress/expected/json.out +++ b/src/test/regress/expected/json.out @@ -964,16 +964,16 @@ select json '{ "a": "null \u0000 escape" }' ->> 'a' as not_unescaped; --json_typeof() function select value, json_typeof(value) - from (values (json '123.4'), - (json '-1'), - (json '"foo"'), - (json 'true'), - (json 'false'), + from (values (json '123.4'), + (json '-1'), + (json '"foo"'), + (json 'true'), + (json 'false'), (json 'null'), - (json '[1, 2, 3]'), - (json '[]'), - (json '{"x":"foo", "y":123}'), - (json '{}'), + (json '[1, 2, 3]'), + (json '[]'), + (json '{"x":"foo", "y":123}'), + (json '{}'), (NULL::json)) as data(value); value | json_typeof diff --git a/src/test/regress/expected/json_1.out b/src/test/regress/expected/json_1.out index c9710d22e4c..753e5b33081 100644 --- a/src/test/regress/expected/json_1.out +++ b/src/test/regress/expected/json_1.out @@ -960,16 +960,16 @@ select json '{ "a": "null \u0000 escape" }' ->> 'a' as not_unescaped; --json_typeof() function select value, json_typeof(value) - from (values (json '123.4'), - (json '-1'), - (json '"foo"'), - (json 'true'), - (json 'false'), + from (values (json '123.4'), + (json '-1'), + (json '"foo"'), + (json 'true'), + (json 'false'), (json 'null'), - (json '[1, 2, 3]'), - (json '[]'), - (json '{"x":"foo", "y":123}'), - (json '{}'), + (json '[1, 2, 3]'), + (json '[]'), + (json '{"x":"foo", "y":123}'), + (json '{}'), (NULL::json)) as data(value); value | json_typeof diff --git a/src/test/regress/expected/plpgsql.out b/src/test/regress/expected/plpgsql.out index 2890c2d027f..22c16c4b3e0 100644 --- a/src/test/regress/expected/plpgsql.out +++ b/src/test/regress/expected/plpgsql.out @@ -2604,7 +2604,7 @@ create function excpt_test2() returns void as $$ begin begin begin - raise notice '% %', sqlstate, sqlerrm; + raise notice '% %', sqlstate, sqlerrm; end; end; end; $$ language plpgsql; @@ -2618,7 +2618,7 @@ CONTEXT: PL/pgSQL function excpt_test2() line 5 at RAISE create function excpt_test3() returns void as $$ begin begin - raise exception 'user exception'; + raise exception 'user exception'; exception when others then raise notice 'caught exception % %', sqlstate, sqlerrm; begin diff --git a/src/test/regress/expected/select_views.out b/src/test/regress/expected/select_views.out index 24bbff9d2e4..82d510de806 100644 --- a/src/test/regress/expected/select_views.out +++ b/src/test/regress/expected/select_views.out @@ -1280,7 +1280,7 @@ INSERT INTO credit_card (103, '9801-2345-6789-0123', 2000); INSERT INTO credit_usage VALUES (101, '2011-09-15', 120), - (101, '2011-10-05', 90), + (101, '2011-10-05', 90), (101, '2011-10-18', 110), (101, '2011-10-21', 200), (101, '2011-11-10', 80), diff --git a/src/test/regress/expected/select_views_1.out b/src/test/regress/expected/select_views_1.out index ec6e938cb1d..ce22bfabeca 100644 --- a/src/test/regress/expected/select_views_1.out +++ b/src/test/regress/expected/select_views_1.out @@ -1280,7 +1280,7 @@ INSERT INTO credit_card (103, '9801-2345-6789-0123', 2000); INSERT INTO credit_usage VALUES (101, '2011-09-15', 120), - (101, '2011-10-05', 90), + (101, '2011-10-05', 90), (101, '2011-10-18', 110), (101, '2011-10-21', 200), (101, '2011-11-10', 80), diff --git a/src/test/regress/expected/uuid.out b/src/test/regress/expected/uuid.out index da230fe2347..d9075199180 100644 --- a/src/test/regress/expected/uuid.out +++ b/src/test/regress/expected/uuid.out @@ -2,12 +2,12 @@ -- creating test tables CREATE TABLE guid1 ( - guid_field UUID, + guid_field UUID, text_field TEXT DEFAULT(now()) ); CREATE TABLE guid2 ( - guid_field UUID, + guid_field UUID, text_field TEXT DEFAULT(now()) ); -- inserting invalid data tests diff --git a/src/test/regress/sql/alter_generic.sql b/src/test/regress/sql/alter_generic.sql index d62f64fb4be..f46cbc828a6 100644 --- a/src/test/regress/sql/alter_generic.sql +++ b/src/test/regress/sql/alter_generic.sql @@ -382,7 +382,7 @@ ALTER OPERATOR FAMILY alt_opf15 USING hash ADD FUNCTION 1 fn_opf15(int4, int2); DROP OPERATOR FAMILY alt_opf15 USING hash; ROLLBACK; --- Should fail. In gist throw an error when giving different data types for function argument +-- Should fail. In gist throw an error when giving different data types for function argument -- without defining left / right type in ALTER OPERATOR FAMILY ... ADD FUNCTION CREATE OPERATOR FAMILY alt_opf16 USING gist; ALTER OPERATOR FAMILY alt_opf16 USING gist ADD FUNCTION 1 btint42cmp(int4, int2); diff --git a/src/test/regress/sql/json.sql b/src/test/regress/sql/json.sql index ff7675fad0d..cd7782c3b03 100644 --- a/src/test/regress/sql/json.sql +++ b/src/test/regress/sql/json.sql @@ -313,15 +313,15 @@ select json '{ "a": "null \u0000 escape" }' ->> 'a' as not_unescaped; --json_typeof() function select value, json_typeof(value) - from (values (json '123.4'), - (json '-1'), - (json '"foo"'), - (json 'true'), - (json 'false'), + from (values (json '123.4'), + (json '-1'), + (json '"foo"'), + (json 'true'), + (json 'false'), (json 'null'), - (json '[1, 2, 3]'), - (json '[]'), - (json '{"x":"foo", "y":123}'), - (json '{}'), + (json '[1, 2, 3]'), + (json '[]'), + (json '{"x":"foo", "y":123}'), + (json '{}'), (NULL::json)) as data(value); diff --git a/src/test/regress/sql/plpgsql.sql b/src/test/regress/sql/plpgsql.sql index 068b072c901..a685fa246e3 100644 --- a/src/test/regress/sql/plpgsql.sql +++ b/src/test/regress/sql/plpgsql.sql @@ -2215,7 +2215,7 @@ create function excpt_test2() returns void as $$ begin begin begin - raise notice '% %', sqlstate, sqlerrm; + raise notice '% %', sqlstate, sqlerrm; end; end; end; $$ language plpgsql; @@ -2225,7 +2225,7 @@ select excpt_test2(); create function excpt_test3() returns void as $$ begin begin - raise exception 'user exception'; + raise exception 'user exception'; exception when others then raise notice 'caught exception % %', sqlstate, sqlerrm; begin @@ -4084,4 +4084,3 @@ select outer_outer_func(20); drop function outer_outer_func(int); drop function outer_func(int); drop function inner_func(int); - diff --git a/src/test/regress/sql/select_views.sql b/src/test/regress/sql/select_views.sql index e37fb7b3880..da356237eba 100644 --- a/src/test/regress/sql/select_views.sql +++ b/src/test/regress/sql/select_views.sql @@ -47,7 +47,7 @@ INSERT INTO credit_card (103, '9801-2345-6789-0123', 2000); INSERT INTO credit_usage VALUES (101, '2011-09-15', 120), - (101, '2011-10-05', 90), + (101, '2011-10-05', 90), (101, '2011-10-18', 110), (101, '2011-10-21', 200), (101, '2011-11-10', 80), diff --git a/src/test/regress/sql/uuid.sql b/src/test/regress/sql/uuid.sql index 48fe7e71108..518d2b75c00 100644 --- a/src/test/regress/sql/uuid.sql +++ b/src/test/regress/sql/uuid.sql @@ -2,12 +2,12 @@ -- creating test tables CREATE TABLE guid1 ( - guid_field UUID, + guid_field UUID, text_field TEXT DEFAULT(now()) ); CREATE TABLE guid2 ( - guid_field UUID, + guid_field UUID, text_field TEXT DEFAULT(now()) ); |