Changeset: 0f8f1f53d5b6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0f8f1f53d5b6
Modified Files:
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.32bit
clients/Tests/SQL-dump.stable.out.64bit.oid32
clients/Tests/SQL-dump_gsl.stable.out
clients/Tests/exports.stable.out
Branch: default
Log Message:
Approved after recent changes.
diffs (truncated from 37784 to 300 lines):
diff --git a/clients/Tests/SQL-dump.stable.out
b/clients/Tests/SQL-dump.stable.out
--- a/clients/Tests/SQL-dump.stable.out
+++ b/clients/Tests/SQL-dump.stable.out
@@ -48,8 +48,10 @@ Ready.
# 20:08:35 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-1201" "--port=33437"
# 20:08:35 >
+SCHEMA json
SCHEMA tmp
SCHEMA tmp
+SCHEMA json
SYSTEM SCHEMA sys
SYSTEM TABLE sys._columns
SYSTEM TABLE sys._tables
@@ -165,14 +167,6 @@ SYSTEM FUNCTION sys.isaurl
SYSTEM FUNCTION sys.isauuid
SYSTEM FUNCTION sys.isempty
SYSTEM FUNCTION sys.issimple
-SYSTEM FUNCTION sys.json_filter
-SYSTEM FUNCTION sys.json_filter_all
-SYSTEM FUNCTION sys.json_isvalid
-SYSTEM FUNCTION sys.json_isvalidarray
-SYSTEM FUNCTION sys.json_isvalidobject
-SYSTEM FUNCTION sys.json_length
-SYSTEM FUNCTION sys.json_path
-SYSTEM FUNCTION sys.json_text
SYSTEM FUNCTION sys.length
SYSTEM FUNCTION sys.like
SYSTEM FUNCTION sys.linefromtext
@@ -343,7 +337,8 @@ CREATE TABLE "sys"."schemas" (
"id" INTEGER,
"name" VARCHAR(1024),
"authorization" INTEGER,
- "owner" INTEGER
+ "owner" INTEGER,
+ "system" BOOLEAN
);
CREATE TABLE "sys"."sequences" (
"id" INTEGER,
@@ -777,27 +772,6 @@ create function sys.isauuid(u uuid)
returns uuid external name uuid."isaUUID";
create function isempty(g geometry) returns boolean external name
geom."IsEmpty";
create function issimple(g geometry) returns boolean external name
geom."IsSimple";
--- access the top level key by name, return its value
-create function sys.json_filter(js json, name string)
-returns json external name json.filter;
-create function sys.json_filter_all(js json, name string)
-returns json external name json.filterall;
--- test string for JSON compliancy
-create function sys.json_isvalid(js string)
-returns bool external name json.isvalid;
-create function sys.json_isvalidarray(js string)
-returns bool external name json.isvalidarray;
-create function sys.json_isvalidobject(js string)
-returns bool external name json.isvalidobject;
--- return the number of primary components
-create function sys.json_length(js json)
-returns integer external name json.length;
--- a simple path extractor
-create function sys.json_path(js json, e string)
-returns json external name json.path;
--- a simple path extractor as plain text
-create function sys.json_text(js json, e string)
-returns string external name json.text;
create function length(g geometry) returns float external name geom."Length";
-- The contents of this file are subject to the MonetDB Public License
-- Version 1.1 (the "License"); you may not use this file except in
@@ -1526,425 +1500,426 @@ CREATE TABLE "sys"."_columns" (
"number" INTEGER,
"storage" VARCHAR(2048)
);
-COPY 418 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 419 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS
'\t','\n','"';
2002 "id" "int" 32 0 2001 NULL true 0 NULL
2003 "name" "varchar" 1024 0 2001 NULL true 1
NULL
2004 "authorization" "int" 32 0 2001 NULL true 2
NULL
2005 "owner" "int" 32 0 2001 NULL true 3 NULL
-2007 "id" "int" 32 0 2006 NULL true 0 NULL
-2008 "systemname" "varchar" 256 0 2006 NULL true
1 NULL
-2009 "sqlname" "varchar" 1024 0 2006 NULL true
2 NULL
-2010 "digits" "int" 32 0 2006 NULL true 3
NULL
-2011 "scale" "int" 32 0 2006 NULL true 4 NULL
-2012 "radix" "int" 32 0 2006 NULL true 5 NULL
-2013 "eclass" "int" 32 0 2006 NULL true 6
NULL
-2014 "schema_id" "int" 32 0 2006 NULL true 7
NULL
-2016 "id" "int" 32 0 2015 NULL true 0 NULL
-2017 "name" "varchar" 256 0 2015 NULL true 1
NULL
-2018 "func" "varchar" 8196 0 2015 NULL true 2
NULL
-2019 "mod" "varchar" 8196 0 2015 NULL true 3
NULL
-2020 "sql" "boolean" 1 0 2015 NULL true 4
NULL
-2021 "type" "int" 32 0 2015 NULL true 5 NULL
-2022 "side_effect" "boolean" 1 0 2015 NULL true
6 NULL
-2023 "schema_id" "int" 32 0 2015 NULL true 7
NULL
-2025 "id" "int" 32 0 2024 NULL true 0 NULL
-2026 "func_id" "int" 32 0 2024 NULL true 1
NULL
-2027 "name" "varchar" 256 0 2024 NULL true 2
NULL
-2028 "type" "varchar" 1024 0 2024 NULL true 3
NULL
-2029 "type_digits" "int" 32 0 2024 NULL true 4
NULL
-2030 "type_scale" "int" 32 0 2024 NULL true 5
NULL
-2031 "number" "int" 32 0 2024 NULL true 6
NULL
-2033 "id" "int" 32 0 2032 NULL true 0 NULL
-2034 "schema_id" "int" 32 0 2032 NULL true 1
NULL
-2035 "name" "varchar" 256 0 2032 NULL true 2
NULL
-2036 "start" "bigint" 64 0 2032 NULL true 3
NULL
-2037 "minvalue" "bigint" 64 0 2032 NULL true
4 NULL
-2038 "maxvalue" "bigint" 64 0 2032 NULL true
5 NULL
-2039 "increment" "bigint" 64 0 2032 NULL true
6 NULL
-2040 "cacheinc" "bigint" 64 0 2032 NULL true
7 NULL
-2041 "cycle" "boolean" 1 0 2032 NULL true 8
NULL
-2043 "id" "int" 32 0 2042 NULL true 0 NULL
-2044 "depend_id" "int" 32 0 2042 NULL true 1
NULL
-2045 "depend_type" "smallint" 16 0 2042 NULL true
2 NULL
-2047 "id" "int" 32 0 2046 NULL true 0 NULL
-2048 "server" "char" 1024 0 2046 NULL true 1
NULL
-2049 "port" "int" 32 0 2046 NULL true 2 NULL
-2050 "db" "char" 64 0 2046 NULL true 3 NULL
-2051 "db_alias" "char" 1024 0 2046 NULL true 4
NULL
-2052 "user" "char" 1024 0 2046 NULL true 5 NULL
-2053 "password" "char" 1024 0 2046 NULL true 6
NULL
-2054 "language" "char" 1024 0 2046 NULL true 7
NULL
-2056 "id" "int" 32 0 2055 NULL true 0 NULL
-2057 "name" "varchar" 1024 0 2055 NULL true 1
NULL
-2058 "schema_id" "int" 32 0 2055 NULL true 2
NULL
-2059 "query" "varchar" 2048 0 2055 NULL true 3
NULL
-2060 "type" "smallint" 16 0 2055 NULL true 4
NULL
-2061 "system" "boolean" 1 0 2055 NULL true
5 NULL
-2062 "commit_action" "smallint" 16 0 2055 NULL true
6 NULL
-2063 "readonly" "boolean" 1 0 2055 NULL true
7 NULL
-2065 "id" "int" 32 0 2064 NULL true 0 NULL
-2066 "name" "varchar" 1024 0 2064 NULL true 1
NULL
-2067 "type" "varchar" 1024 0 2064 NULL true 2
NULL
-2068 "type_digits" "int" 32 0 2064 NULL true 3
NULL
-2069 "type_scale" "int" 32 0 2064 NULL true 4
NULL
-2070 "table_id" "int" 32 0 2064 NULL true 5
NULL
-2071 "default" "varchar" 2048 0 2064 NULL true
6 NULL
-2072 "null" "boolean" 1 0 2064 NULL true 7
NULL
-2073 "number" "int" 32 0 2064 NULL true 8
NULL
-2074 "storage" "varchar" 2048 0 2064 NULL true
9 NULL
-2076 "id" "int" 32 0 2075 NULL true 0 NULL
-2077 "table_id" "int" 32 0 2075 NULL true 1
NULL
-2078 "type" "int" 32 0 2075 NULL true 2 NULL
-2079 "name" "varchar" 1024 0 2075 NULL true 3
NULL
-2080 "rkey" "int" 32 0 2075 NULL true 4 NULL
-2081 "action" "int" 32 0 2075 NULL true 5
NULL
-2083 "id" "int" 32 0 2082 NULL true 0 NULL
-2084 "table_id" "int" 32 0 2082 NULL true 1
NULL
-2085 "type" "int" 32 0 2082 NULL true 2 NULL
-2086 "name" "varchar" 1024 0 2082 NULL true 3
NULL
-2088 "id" "int" 32 0 2087 NULL true 0 NULL
-2089 "name" "varchar" 1024 0 2087 NULL true 1
NULL
-2090 "table_id" "int" 32 0 2087 NULL true 2
NULL
-2091 "time" "smallint" 16 0 2087 NULL true 3
NULL
-2092 "orientation" "smallint" 16 0 2087 NULL true
4 NULL
-2093 "event" "smallint" 16 0 2087 NULL true 5
NULL
-2094 "old_name" "varchar" 1024 0 2087 NULL true
6 NULL
-2095 "new_name" "varchar" 1024 0 2087 NULL true
7 NULL
-2096 "condition" "varchar" 2048 0 2087 NULL true
8 NULL
-2097 "statement" "varchar" 2048 0 2087 NULL true
9 NULL
-2099 "id" "int" 32 0 2098 NULL true 0 NULL
-2100 "name" "varchar" 1024 0 2098 NULL true 1
NULL
-2101 "nr" "int" 32 0 2098 NULL true 2 NULL
-2104 "id" "int" 32 0 2103 NULL true 0 NULL
-2105 "name" "varchar" 1024 0 2103 NULL true 1
NULL
-2106 "schema_id" "int" 32 0 2103 NULL true 2
NULL
-2107 "query" "varchar" 2048 0 2103 NULL true 3
NULL
-2108 "type" "smallint" 16 0 2103 NULL true 4
NULL
-2109 "system" "boolean" 1 0 2103 NULL true
5 NULL
-2110 "commit_action" "smallint" 16 0 2103 NULL true
6 NULL
-2111 "readonly" "boolean" 1 0 2103 NULL true
7 NULL
-2113 "id" "int" 32 0 2112 NULL true 0 NULL
-2114 "name" "varchar" 1024 0 2112 NULL true 1
NULL
-2115 "type" "varchar" 1024 0 2112 NULL true 2
NULL
-2116 "type_digits" "int" 32 0 2112 NULL true 3
NULL
-2117 "type_scale" "int" 32 0 2112 NULL true 4
NULL
-2118 "table_id" "int" 32 0 2112 NULL true 5
NULL
-2119 "default" "varchar" 2048 0 2112 NULL true
6 NULL
-2120 "null" "boolean" 1 0 2112 NULL true 7
NULL
-2121 "number" "int" 32 0 2112 NULL true 8
NULL
-2122 "storage" "varchar" 2048 0 2112 NULL true
9 NULL
-2124 "id" "int" 32 0 2123 NULL true 0 NULL
-2125 "table_id" "int" 32 0 2123 NULL true 1
NULL
-2126 "type" "int" 32 0 2123 NULL true 2 NULL
-2127 "name" "varchar" 1024 0 2123 NULL true 3
NULL
-2128 "rkey" "int" 32 0 2123 NULL true 4 NULL
-2129 "action" "int" 32 0 2123 NULL true 5
NULL
-2131 "id" "int" 32 0 2130 NULL true 0 NULL
-2132 "table_id" "int" 32 0 2130 NULL true 1
NULL
-2133 "type" "int" 32 0 2130 NULL true 2 NULL
-2134 "name" "varchar" 1024 0 2130 NULL true 3
NULL
-2136 "id" "int" 32 0 2135 NULL true 0 NULL
-2137 "name" "varchar" 1024 0 2135 NULL true 1
NULL
-2138 "table_id" "int" 32 0 2135 NULL true 2
NULL
-2139 "time" "smallint" 16 0 2135 NULL true 3
NULL
-2140 "orientation" "smallint" 16 0 2135 NULL true
4 NULL
-2141 "event" "smallint" 16 0 2135 NULL true 5
NULL
-2142 "old_name" "varchar" 1024 0 2135 NULL true
6 NULL
-2143 "new_name" "varchar" 1024 0 2135 NULL true
7 NULL
-2144 "condition" "varchar" 2048 0 2135 NULL true
8 NULL
-2145 "statement" "varchar" 2048 0 2135 NULL true
9 NULL
-2147 "id" "int" 32 0 2146 NULL true 0 NULL
-2148 "name" "varchar" 1024 0 2146 NULL true 1
NULL
-2149 "nr" "int" 32 0 2146 NULL true 2 NULL
-5078 "id" "int" 32 0 5077 NULL true 0 NULL
-5079 "name" "varchar" 1024 0 5077 NULL true 1
NULL
-5080 "schema_id" "int" 32 0 5077 NULL true 2
NULL
-5081 "query" "varchar" 2048 0 5077 NULL true 3
NULL
-5082 "type" "smallint" 16 0 5077 NULL true 4
NULL
-5083 "system" "boolean" 1 0 5077 NULL true
5 NULL
-5084 "commit_action" "smallint" 16 0 5077 NULL true
6 NULL
-5085 "readonly" "boolean" 1 0 5077 NULL true
7 NULL
-5086 "temporary" "smallint" 16 0 5077 NULL true
8 NULL
-5088 "id" "int" 32 0 5087 NULL true 0 NULL
-5089 "name" "varchar" 1024 0 5087 NULL true 1
NULL
-5090 "type" "varchar" 1024 0 5087 NULL true 2
NULL
-5091 "type_digits" "int" 32 0 5087 NULL true 3
NULL
-5092 "type_scale" "int" 32 0 5087 NULL true 4
NULL
-5093 "table_id" "int" 32 0 5087 NULL true 5
NULL
-5094 "default" "varchar" 2048 0 5087 NULL true
6 NULL
-5095 "null" "boolean" 1 0 5087 NULL true 7
NULL
-5096 "number" "int" 32 0 5087 NULL true 8
NULL
-5097 "storage_type" "int" 32 0 5087 NULL true 9
NULL
-5099 "name" "varchar" 1024 0 5098 NULL true 0
NULL
-5100 "value" "varchar" 2048 0 5098 NULL true 1
NULL
-5104 "name" "varchar" 1024 0 5103 NULL true 0
NULL
-5108 "name" "varchar" 1024 0 5107 NULL true 0
NULL
-5109 "fullname" "varchar" 2048 0 5107 NULL true
1 NULL
-5110 "default_schema" "int" 9 0 5107 NULL true
2 NULL
-5112 "name" "varchar" 2048 0 5111 NULL true 0
NULL
-5116 "name" "varchar" 1024 0 5115 NULL true 0
NULL
-5117 "fullname" "varchar" 2024 0 5115 NULL true
1 NULL
-5118 "default_schema" "int" 9 0 5115 NULL true
2 NULL
-5120 "login_id" "int" 32 0 5119 NULL true 0
NULL
-5121 "role_id" "int" 32 0 5119 NULL true 1
NULL
-5123 "id" "int" 32 0 5122 NULL true 0 NULL
-5124 "name" "varchar" 1024 0 5122 NULL true 1
NULL
-5125 "grantor" "int" 32 0 5122 NULL true 2
NULL
-5127 "obj_id" "int" 32 0 5126 NULL true 0
NULL
-5128 "auth_id" "int" 32 0 5126 NULL true 1
NULL
-5129 "privileges" "int" 32 0 5126 NULL true 2
NULL
-5130 "grantor" "int" 32 0 5126 NULL true 3
NULL
-5131 "grantable" "int" 32 0 5126 NULL true 4
NULL
-5271 "id" "oid" 63 0 5270 NULL true 0 NULL
-5272 "owner" "clob" 0 0 5270 NULL true 1 NULL
-5273 "defined" "timestamp" 7 0 5270 NULL true
2 NULL
-5274 "query" "clob" 0 0 5270 NULL true 3 NULL
-5275 "pipe" "clob" 0 0 5270 NULL true 4 NULL
-5276 "mal" "int" 32 0 5270 NULL true 5 NULL
-5277 "optimize" "bigint" 64 0 5270 NULL true
6 NULL
-5282 "id" "oid" 63 0 5281 NULL true 0 NULL
-5283 "start" "timestamp" 7 0 5281 NULL true 1
NULL
-5284 "stop" "timestamp" 7 0 5281 NULL true 2
NULL
-5285 "arguments" "clob" 0 0 5281 NULL true 3
NULL
-5286 "tuples" "wrd" 64 0 5281 NULL true 4
NULL
-5287 "run" "bigint" 64 0 5281 NULL true 5
NULL
-5288 "ship" "bigint" 64 0 5281 NULL true 6
NULL
-5289 "cpu" "int" 32 0 5281 NULL true 7 NULL
-5290 "io" "int" 32 0 5281 NULL true 8 NULL
-5291 "space" "bigint" 64 0 5281 NULL true 9
NULL
-5296 "id" "oid" 63 0 5303 NULL true 0 NULL
-5297 "owner" "clob" 0 0 5303 NULL true 1 NULL
-5298 "defined" "timestamp" 7 0 5303 NULL true
2 NULL
-5299 "query" "clob" 0 0 5303 NULL true 3 NULL
-5300 "pipe" "clob" 0 0 5303 NULL true 4 NULL
-5301 "mal" "int" 32 0 5303 NULL true 5 NULL
-5302 "optimize" "bigint" 64 0 5303 NULL true
6 NULL
-5305 "id" "oid" 63 0 5315 NULL true 0 NULL
-5306 "start" "timestamp" 7 0 5315 NULL true 1
NULL
-5307 "stop" "timestamp" 7 0 5315 NULL true 2
NULL
-5308 "arguments" "clob" 0 0 5315 NULL true 3
NULL
-5309 "tuples" "wrd" 64 0 5315 NULL true 4
NULL
-5310 "run" "bigint" 64 0 5315 NULL true 5
NULL
-5311 "ship" "bigint" 64 0 5315 NULL true 6
NULL
-5312 "cpu" "int" 32 0 5315 NULL true 7 NULL
-5313 "io" "int" 32 0 5315 NULL true 8 NULL
-5314 "space" "bigint" 64 0 5315 NULL true 9
NULL
-5317 "id" "oid" 63 0 5333 NULL true 0 NULL
-5318 "owner" "clob" 0 0 5333 NULL true 1 NULL
-5319 "defined" "timestamp" 7 0 5333 NULL true
2 NULL
-5320 "query" "clob" 0 0 5333 NULL true 3 NULL
-5321 "pipe" "clob" 0 0 5333 NULL true 4 NULL
-5322 "mal" "int" 32 0 5333 NULL true 5 NULL
-5323 "optimize" "bigint" 64 0 5333 NULL true
6 NULL
-5324 "start" "timestamp" 7 0 5333 NULL true 7
NULL
-5325 "stop" "timestamp" 7 0 5333 NULL true 8
NULL
-5326 "arguments" "clob" 0 0 5333 NULL true 9
NULL
-5327 "tuples" "wrd" 64 0 5333 NULL true 10
NULL
-5328 "run" "bigint" 64 0 5333 NULL true 11
NULL
-5329 "ship" "bigint" 64 0 5333 NULL true 12
NULL
-5330 "cpu" "int" 32 0 5333 NULL true 13 NULL
-5331 "space" "bigint" 64 0 5333 NULL true 14
NULL
-5332 "io" "int" 32 0 5333 NULL true 15 NULL
-5344 "event" "int" 32 0 5343 NULL true 0 NULL
-5345 "clk" "varchar" 20 0 5343 NULL true 1
NULL
-5346 "pc" "varchar" 50 0 5343 NULL true 2
NULL
-5347 "thread" "int" 32 0 5343 NULL true 3
NULL
-5348 "user" "int" 32 0 5343 NULL true 4 NULL
-5349 "ticks" "bigint" 64 0 5343 NULL true 5
NULL
-5350 "reads" "bigint" 64 0 5343 NULL true 6
NULL
-5351 "writes" "bigint" 64 0 5343 NULL true
7 NULL
-5352 "rbytes" "bigint" 64 0 5343 NULL true
8 NULL
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
