Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit2c7cea5

Browse files
committed
Fix object name clash in recently introduced test
c0fc075 wasn't careful about naming the DOMAIN used in some newtests in sqljson_queryfunc.sql so as not to clash with the name of aDOMAIN used in the nearby sqljson_jsontable.sql. Fix by using adifferent name for the newly added DOMAIN in sqljson_queryfuncs.sql.Per buildfarm members canebrake and urutu.Discussion:https://postgr.es/m/CA+HiwqEjkbDxqqD3VJamc6R9+B102H7=SFYYOM7gKrxzJO35TQ@mail.gmail.com
1 parentef744eb commit2c7cea5

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

‎src/test/regress/expected/sqljson_queryfuncs.out

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1222,22 +1222,22 @@ LINE 1: SELECT JSON_QUERY(js, '$' RETURNING int DEFAULT (SELECT 1) ...
12221222
^
12231223
DROP TABLE test_jsonb_mutability;
12241224
DROP FUNCTION ret_setint;
1225-
CREATE DOMAINjsonb_test_domain AS text CHECK (value <> 'foo');
1226-
SELECT JSON_VALUE(jsonb '{"d1": "H"}', '$.a2' RETURNINGjsonb_test_domain DEFAULT 'foo'::jsonb_test_domain ON ERROR);
1227-
ERROR: value for domainjsonb_test_domain violates check constraint "jsonb_test_domain_check"
1228-
SELECT JSON_VALUE(jsonb '{"d1": "H"}', '$.a2' RETURNINGjsonb_test_domain DEFAULT 'foo1'::jsonb_test_domain ON ERROR);
1225+
CREATE DOMAINqueryfuncs_test_domain AS text CHECK (value <> 'foo');
1226+
SELECT JSON_VALUE(jsonb '{"d1": "H"}', '$.a2' RETURNINGqueryfuncs_test_domain DEFAULT 'foo'::queryfuncs_test_domain ON ERROR);
1227+
ERROR: value for domainqueryfuncs_test_domain violates check constraint "queryfuncs_test_domain_check"
1228+
SELECT JSON_VALUE(jsonb '{"d1": "H"}', '$.a2' RETURNINGqueryfuncs_test_domain DEFAULT 'foo1'::queryfuncs_test_domain ON ERROR);
12291229
json_value
12301230
------------
12311231
foo1
12321232
(1 row)
12331233

1234-
SELECT JSON_VALUE(jsonb '{"d1": "H"}', '$.a2' RETURNINGjsonb_test_domain DEFAULT '"foo1"'::jsonb::text ON ERROR);
1234+
SELECT JSON_VALUE(jsonb '{"d1": "H"}', '$.a2' RETURNINGqueryfuncs_test_domain DEFAULT '"foo1"'::jsonb::text ON ERROR);
12351235
json_value
12361236
------------
12371237
"foo1"
12381238
(1 row)
12391239

1240-
SELECT JSON_VALUE(jsonb '{"d1": "foo"}', '$.a2' RETURNINGjsonb_test_domain DEFAULT 'foo1'::jsonb_test_domain ON ERROR);
1240+
SELECT JSON_VALUE(jsonb '{"d1": "foo"}', '$.a2' RETURNINGqueryfuncs_test_domain DEFAULT 'foo1'::queryfuncs_test_domain ON ERROR);
12411241
json_value
12421242
------------
12431243
foo1
@@ -1251,9 +1251,9 @@ ERROR: can only specify a constant, non-aggregate function, or operator express
12511251
LINE 1: ...CT JSON_QUERY('"a"', '$.a' RETURNING int DEFAULT (SELECT '"...
12521252
^
12531253
-- CoerceToDomain
1254-
SELECT JSON_QUERY('"a"', '$.a' RETURNINGjsonb_test_domain DEFAULT (select '"1"')::jsonb_test_domain ON ERROR);
1254+
SELECT JSON_QUERY('"a"', '$.a' RETURNINGqueryfuncs_test_domain DEFAULT (select '"1"')::queryfuncs_test_domain ON ERROR);
12551255
ERROR: can only specify a constant, non-aggregate function, or operator expression for DEFAULT
1256-
LINE 1: ...('"a"', '$.a' RETURNINGjsonb_test_domain DEFAULT (select '"...
1256+
LINE 1: ...', '$.a' RETURNINGqueryfuncs_test_domain DEFAULT (select '"...
12571257
^
12581258
-- RelabelType
12591259
SELECT JSON_QUERY('"a"', '$.a' RETURNING int DEFAULT (SELECT 1)::oid::int ON ERROR);
@@ -1277,7 +1277,7 @@ SELECT JSON_QUERY('"a"', '$.a' RETURNING someparent DEFAULT (SELECT '(1)')::som
12771277
ERROR: can only specify a constant, non-aggregate function, or operator expression for DEFAULT
12781278
LINE 1: ..._QUERY('"a"', '$.a' RETURNING someparent DEFAULT (SELECT '(...
12791279
^
1280-
DROP DOMAINjsonb_test_domain;
1280+
DROP DOMAINqueryfuncs_test_domain;
12811281
DROP TABLE someparent, somechild;
12821282
-- Extension: non-constant JSON path
12831283
SELECT JSON_EXISTS(jsonb '{"a": 123}', '$' || '.' || 'a');

‎src/test/regress/sql/sqljson_queryfuncs.sql

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -411,19 +411,19 @@ SELECT JSON_QUERY(js, '$' RETURNING int DEFAULT (SELECT 1) ON ERROR) FROM test_
411411
DROPTABLE test_jsonb_mutability;
412412
DROPFUNCTION ret_setint;
413413

414-
CREATEDOMAINjsonb_test_domainAStextCHECK (value<>'foo');
415-
SELECT JSON_VALUE(jsonb'{"d1": "H"}','$.a2' RETURNINGjsonb_test_domain DEFAULT'foo'::jsonb_test_domainON ERROR);
416-
SELECT JSON_VALUE(jsonb'{"d1": "H"}','$.a2' RETURNINGjsonb_test_domain DEFAULT'foo1'::jsonb_test_domainON ERROR);
417-
SELECT JSON_VALUE(jsonb'{"d1": "H"}','$.a2' RETURNINGjsonb_test_domain DEFAULT'"foo1"'::jsonb::textON ERROR);
418-
SELECT JSON_VALUE(jsonb'{"d1": "foo"}','$.a2' RETURNINGjsonb_test_domain DEFAULT'foo1'::jsonb_test_domainON ERROR);
414+
CREATEDOMAINqueryfuncs_test_domainAStextCHECK (value<>'foo');
415+
SELECT JSON_VALUE(jsonb'{"d1": "H"}','$.a2' RETURNINGqueryfuncs_test_domain DEFAULT'foo'::queryfuncs_test_domainON ERROR);
416+
SELECT JSON_VALUE(jsonb'{"d1": "H"}','$.a2' RETURNINGqueryfuncs_test_domain DEFAULT'foo1'::queryfuncs_test_domainON ERROR);
417+
SELECT JSON_VALUE(jsonb'{"d1": "H"}','$.a2' RETURNINGqueryfuncs_test_domain DEFAULT'"foo1"'::jsonb::textON ERROR);
418+
SELECT JSON_VALUE(jsonb'{"d1": "foo"}','$.a2' RETURNINGqueryfuncs_test_domain DEFAULT'foo1'::queryfuncs_test_domainON ERROR);
419419

420420
-- Check the cases where a coercion-related expression is masking an
421421
-- unsupported expressions
422422

423423
-- CoerceViaIO
424424
SELECT JSON_QUERY('"a"','$.a' RETURNINGint DEFAULT (SELECT'"1"')::jsonbON ERROR);
425425
-- CoerceToDomain
426-
SELECT JSON_QUERY('"a"','$.a' RETURNINGjsonb_test_domain DEFAULT (select'"1"')::jsonb_test_domainON ERROR);
426+
SELECT JSON_QUERY('"a"','$.a' RETURNINGqueryfuncs_test_domain DEFAULT (select'"1"')::queryfuncs_test_domainON ERROR);
427427
-- RelabelType
428428
SELECT JSON_QUERY('"a"','$.a' RETURNINGint DEFAULT (SELECT1)::oid::intON ERROR);
429429
-- ArrayCoerceExpr
@@ -435,7 +435,7 @@ CREATE TABLE someparent (a int);
435435
CREATETABLEsomechild () INHERITS (someparent);
436436
SELECT JSON_QUERY('"a"','$.a' RETURNING someparent DEFAULT (SELECT'(1)')::somechild::someparentON ERROR);
437437

438-
DROPDOMAINjsonb_test_domain;
438+
DROPDOMAINqueryfuncs_test_domain;
439439
DROPTABLE someparent, somechild;
440440

441441
-- Extension: non-constant JSON path

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp