Skip to content

Commit b2bddf9

Browse files
committed
Fix json test by creating a schema.
It's been failing since HEAD introduced built-in json type. The solution is simply creating a schema and put the domain in it.
1 parent 1d69da3 commit b2bddf9

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

expected/json.out

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
CREATE SCHEMA plv8;
12
CREATE FUNCTION valid_json(json text) RETURNS boolean
23
LANGUAGE plv8 IMMUTABLE STRICT
34
AS $$
@@ -8,9 +9,9 @@ AS $$
89
return false;
910
}
1011
$$;
11-
CREATE DOMAIN json AS text
12+
CREATE DOMAIN plv8.json AS text
1213
CONSTRAINT json_check CHECK (valid_json(VALUE));
13-
CREATE FUNCTION get_key(key text, json_raw text) RETURNS json
14+
CREATE FUNCTION get_key(key text, json_raw text) RETURNS plv8.json
1415
LANGUAGE plv8 IMMUTABLE STRICT
1516
AS $$
1617
var val = JSON.parse(json_raw)[key];
@@ -19,7 +20,7 @@ AS $$
1920
return JSON.stringify(ret);
2021
$$;
2122
CREATE TABLE jsononly (
22-
data json
23+
data plv8.json
2324
);
2425
COPY jsononly (data) FROM stdin;
2526
-- Call twice to test the function cache.

sql/json.sql

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
CREATE SCHEMA plv8;
12
CREATE FUNCTION valid_json(json text) RETURNS boolean
23
LANGUAGE plv8 IMMUTABLE STRICT
34
AS $$
@@ -9,10 +10,10 @@ AS $$
910
}
1011
$$;
1112

12-
CREATE DOMAIN json AS text
13+
CREATE DOMAIN plv8.json AS text
1314
CONSTRAINT json_check CHECK (valid_json(VALUE));
1415

15-
CREATE FUNCTION get_key(key text, json_raw text) RETURNS json
16+
CREATE FUNCTION get_key(key text, json_raw text) RETURNS plv8.json
1617
LANGUAGE plv8 IMMUTABLE STRICT
1718
AS $$
1819
var val = JSON.parse(json_raw)[key];
@@ -22,7 +23,7 @@ AS $$
2223
$$;
2324

2425
CREATE TABLE jsononly (
25-
data json
26+
data plv8.json
2627
);
2728

2829
COPY jsononly (data) FROM stdin;

0 commit comments

Comments
 (0)