Changeset: 48fb5caf7ba7 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=48fb5caf7ba7 Modified Files: sql/test/json/Tests/books.stable.out sql/test/json/Tests/bulkjson.stable.out sql/test/json/Tests/bulklength.stable.out sql/test/json/Tests/bulkvalid.stable.out sql/test/json/Tests/coercions.stable.out sql/test/json/Tests/components.stable.out sql/test/json/Tests/jsonvalidity.Bug-3753.stable.out sql/test/json/Tests/load.stable.out sql/test/json/Tests/pathexpr.stable.out sql/test/json/Tests/pgexample.stable.out sql/test/json/Tests/shop.stable.out sql/test/json/Tests/spaceissue.stable.out Branch: json Log Message:
Approve test results diffs (truncated from 651 to 300 lines): diff --git a/sql/test/json/Tests/books.stable.out b/sql/test/json/Tests/books.stable.out --- a/sql/test/json/Tests/books.stable.out +++ b/sql/test/json/Tests/books.stable.out @@ -52,7 +52,7 @@ stdout of test 'books` in directory 'sql % 1, 717 # length [ 1, " { \"store\": {\n \"books\": [ \n { \"category\": \"reference\",\n \"author\": \"Nigel Rees\",\n \"title\": \"Sayings of the Century\",\n \"price\": 8.95\n },\n { \"category\": \"fiction\",\n \"author\": \"Evelyn Waugh\",\n \"title\": \"Sword of Honour\",\n \"price\": 12.99\n },\n { \"category\": \"fiction\",\n \"author\": \"Herman Melville\",\n \"title\": \"Moby Dick\",\n \"isbn\": \"0-553-21311-3\",\n \"price\": 8.99\n },\n { \"category\": \"fiction\",\n \"author\": \"J. R. R. Tolkien\",\n \"title\": \"The Lord of the Rings\",\n \"isbn\": \"0-395-19395-8\",\n \"price\": 22.99\n }\n ],\n \"bicycle\": {\n \"color\": \"red\",\n \"price\": 19.95\n }\n }\n}" ] #SELECT json.filter(j,'store.books.[1]..author') FROM books; -% sys.%1 # table_name +% sys. # table_name % %1 # name % json # type % 16 # length @@ -60,37 +60,37 @@ stdout of test 'books` in directory 'sql #SELECT json.filter(j,'..books..author[1]') AS j FROM ( # SELECT json.filter(j,'store') AS j FROM books #) AS L1; -% sys.%1 # table_name +% sys. # table_name % j # name % json # type % 16 # length [ "[\"Evelyn Waugh\"]" ] #SELECT json.filter(j,'..author') FROM books; -% sys.%1 # table_name +% sys. # table_name % %1 # name % json # type % 66 # length [ "[\"Nigel Rees\",\"Evelyn Waugh\",\"Herman Melville\",\"J. R. R. Tolkien\"]" ] #SELECT json.filter(j,'store.books[*]..author') FROM books; -% sys.%1 # table_name +% sys. # table_name % %1 # name % json # type % 66 # length [ "[\"Nigel Rees\",\"Evelyn Waugh\",\"Herman Melville\",\"J. R. R. Tolkien\"]" ] #SELECT json.filter(j,'store.books..author') FROM books; -% sys.%1 # table_name +% sys. # table_name % %1 # name % json # type % 66 # length [ "[\"Nigel Rees\",\"Evelyn Waugh\",\"Herman Melville\",\"J. R. R. Tolkien\"]" ] #SELECT json.filter(j,'store.books..author[1]') FROM books; -% sys.%1 # table_name +% sys. # table_name % %1 # name % json # type % 16 # length [ "[\"Evelyn Waugh\"]" ] #SELECT json.filter(j,'..bicycle.price') FROM books; -% sys.%1 # table_name +% sys. # table_name % %1 # name % json # type % 7 # length diff --git a/sql/test/json/Tests/bulkjson.stable.out b/sql/test/json/Tests/bulkjson.stable.out --- a/sql/test/json/Tests/bulkjson.stable.out +++ b/sql/test/json/Tests/bulkjson.stable.out @@ -43,7 +43,7 @@ stdout of test 'bulkjson` in directory ' [ "{\"f1\":1,\"f2\":2,\"f1\":3}" ] [ "{\"f1\":{\"f12\":3},\"f2\":[2,3,4]}" ] #select json.filter(j,'f1') from nosql; -% sys.%1 # table_name +% sys. # table_name % %1 # name % json # type % 11 # length @@ -53,7 +53,7 @@ stdout of test 'bulkjson` in directory ' [ "[1,3]" ] [ "[{\"f12\":3}]" ] #select json.filter(j,'f2') from nosql; -% sys.%1 # table_name +% sys. # table_name % %1 # name % json # type % 9 # length @@ -63,7 +63,7 @@ stdout of test 'bulkjson` in directory ' [ "[2]" ] [ "[[2,3,4]]" ] #select json.filter(j,'..f12') from nosql; -% sys.%1 # table_name +% sys. # table_name % %1 # name % json # type % 3 # length @@ -88,25 +88,25 @@ stdout of test 'bulkjson` in directory ' % 11 # length [ "[1,\"f2\", 2]" ] #select json.filter(j,0) from nosql; -% sys.%1 # table_name +% sys. # table_name % %1 # name % json # type % 3 # length [ "[1]" ] #select json.filter(j,1) from nosql; -% sys.%1 # table_name +% sys. # table_name % %1 # name % json # type % 6 # length [ "[\"f2\"]" ] #select json.filter(j,2) from nosql; -% sys.%1 # table_name +% sys. # table_name % %1 # name % json # type % 3 # length [ "[2]" ] #select json.filter(j,3) from nosql; -% sys.%1 # table_name +% sys. # table_name % %1 # name % json # type % 2 # length diff --git a/sql/test/json/Tests/bulklength.stable.out b/sql/test/json/Tests/bulklength.stable.out --- a/sql/test/json/Tests/bulklength.stable.out +++ b/sql/test/json/Tests/bulklength.stable.out @@ -74,7 +74,7 @@ stdout of test 'bulklength` in directory [ "{\"f1\":{\"f12\":3},\"f2\":[2,3,4]}" ] [ "[1,\"f2\", 2]" ] #select json.length(j) from nosql; -% sys.%1 # table_name +% sys. # table_name % %1 # name % int # type % 1 # length diff --git a/sql/test/json/Tests/bulkvalid.stable.out b/sql/test/json/Tests/bulkvalid.stable.out --- a/sql/test/json/Tests/bulkvalid.stable.out +++ b/sql/test/json/Tests/bulkvalid.stable.out @@ -67,7 +67,7 @@ stdout of test 'bulkvalid` in directory [ "{\"f1\":{\"f12\":3},\"f2\":[2,3,4]}" ] [ "[1,\"f2\", 2]" ] #select json.isvalid(j) from nosql; -% sys.%1 # table_name +% sys. # table_name % %1 # name % boolean # type % 5 # length @@ -78,7 +78,7 @@ stdout of test 'bulkvalid` in directory [ true ] [ true ] #select json.isobject(j) from nosql; -% sys.%1 # table_name +% sys. # table_name % %1 # name % boolean # type % 5 # length @@ -89,7 +89,7 @@ stdout of test 'bulkvalid` in directory [ true ] [ false ] #select json.isarray(j) from nosql; -% sys.%1 # table_name +% sys. # table_name % %1 # name % boolean # type % 5 # length @@ -120,7 +120,7 @@ stdout of test 'bulkvalid` in directory [ "{\"f1\":{\"f12\":3},\"f2\":[2,3,4]}" ] [ "[1,\"f2\", 2]" ] #select json.isvalid(j) from nosql; -% sys.%1 # table_name +% sys. # table_name % %1 # name % boolean # type % 5 # length @@ -131,7 +131,7 @@ stdout of test 'bulkvalid` in directory [ true ] [ true ] #select json.isobject(j) from nosql; -% sys.%1 # table_name +% sys. # table_name % %1 # name % boolean # type % 5 # length @@ -142,7 +142,7 @@ stdout of test 'bulkvalid` in directory [ true ] [ false ] #select json.isarray(j) from nosql; -% sys.%1 # table_name +% sys. # table_name % %1 # name % boolean # type % 5 # length diff --git a/sql/test/json/Tests/coercions.stable.out b/sql/test/json/Tests/coercions.stable.out --- a/sql/test/json/Tests/coercions.stable.out +++ b/sql/test/json/Tests/coercions.stable.out @@ -77,7 +77,7 @@ stdout of test 'coercions` in directory [ "{\"f1\":{\"f12\":3},\"f2\":[2,3,4]}" ] [ "[1,\"f2\", 2]" ] #select cast (j as json) as j from nosql_string; -% sys.%2 # table_name +% sys. # table_name % j # name % json # type % 29 # length @@ -120,7 +120,7 @@ stdout of test 'coercions` in directory [ "{\"f1\":{\"f12\":3},\"f2\":[2,3,4]}" ] [ "[1,\"f2\", 2]" ] #select cast (j as string) as j from tmpsql_json; -% sys.%2 # table_name +% sys. # table_name % j # name % clob # type % 29 # length diff --git a/sql/test/json/Tests/components.stable.out b/sql/test/json/Tests/components.stable.out --- a/sql/test/json/Tests/components.stable.out +++ b/sql/test/json/Tests/components.stable.out @@ -36,25 +36,25 @@ stdout of test 'components` in directory #declare js json; #set js = '{"myBoolean":true,"myList":["a","b"],"myMap":{"c":"d","a":"b"},"myObject":"myClass","myJsonObject":{"myString":"myStringValue"}}'; #select json.keyarray(js); -% .%1 # table_name +% . # table_name % %1 # name % json # type % 56 # length [ "[\"myBoolean\",\"myList\",\"myMap\",\"myObject\",\"myJsonObject\"]" ] #select json.valuearray(js); -% .%1 # table_name +% . # table_name % %1 # name % json # type % 73 # length [ "[true,[\"a\",\"b\"],{\"c\":\"d\",\"a\":\"b\"},\"myClass\",{\"myString\":\"myStringValue\"}]" ] #select json.keyarray(j) from jsoncomp; -% sys.%1 # table_name +% sys. # table_name % %1 # name % json # type % 56 # length [ "[\"myBoolean\",\"myList\",\"myMap\",\"myObject\",\"myJsonObject\"]" ] #select json.valuearray(j) from jsoncomp; -% sys.%1 # table_name +% sys. # table_name % %1 # name % json # type % 73 # length diff --git a/sql/test/json/Tests/jsonvalidity.Bug-3753.stable.out b/sql/test/json/Tests/jsonvalidity.Bug-3753.stable.out --- a/sql/test/json/Tests/jsonvalidity.Bug-3753.stable.out +++ b/sql/test/json/Tests/jsonvalidity.Bug-3753.stable.out @@ -29,161 +29,177 @@ stdout of test 'jsonvalidity.Bug-3753` i # 23:37:49 > #SELECT json.isvalid('[0,1]'); -% .%1 # table_name +% . # table_name % %1 # name % boolean # type % 5 # length [ true ] #SELECT json.isvalid('[0,,1]'); -% .%1 # table_name +% . # table_name % %1 # name % boolean # type % 5 # length [ false ] #SELECT json.isValid(null); -- false -% .%1 # table_name +% . # table_name % %1 # name % boolean # type % 5 # length [ false ] #SELECT json.isValid(''); -- false -% .%1 # table_name +% . # table_name % %1 # name % boolean # type % 5 # length [ false ] #SELECT json.isValid('null'); -- false -% .%1 # table_name +% . # table_name % %1 # name % boolean # type % 5 # length [ true ] #SELECT json.isValid('"'); -- false -% .%1 # table_name +% . # table_name % %1 # name % boolean # type % 5 # length [ false ] #SELECT json.isValid('""'); -- false -% .%1 # table_name +% . # table_name % %1 # name % boolean # type % 5 # length [ true ] #SELECT json.isValid('"""'); -- false -% .%1 # table_name +% . # table_name % %1 # name % boolean # type % 5 # length _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list