Changeset: a219824bb780 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a219824bb780
Modified Files:
clients/Tests/SQL-dump.SQL.py
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
geom/sql/40_geom.sql
sql/backends/monet5/sql_upgrades.c
sql/scripts/12_url.sql
sql/scripts/14_inet.sql
sql/scripts/39_analytics.sql
sql/scripts/39_analytics_hge.sql
sql/scripts/40_json.sql
sql/scripts/40_json_hge.sql
sql/scripts/45_uuid.sql
sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/check.stable.out
sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/check.stable.out
sql/test/emptydb-upgrade/Tests/check.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: default
Log Message:
Merge with Jun2016 branch.
diffs (truncated from 8562 to 300 lines):
diff --git a/clients/Tests/SQL-dump.SQL.py b/clients/Tests/SQL-dump.SQL.py
--- a/clients/Tests/SQL-dump.SQL.py
+++ b/clients/Tests/SQL-dump.SQL.py
@@ -61,7 +61,7 @@ sys.stderr.write(err)
# add queries to dump the system tables, but avoid dumping IDs since
# they are too volatile, and if it makes sense, dump an identifier
# from a referenced table
-out = '''
+out = r'''
-- helper function
create function pcre_replace(origin string, pat string, repl string, flags
string) returns string external name pcre.replace;
-- schemas
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
@@ -1190,15 +1190,11 @@ create function pcre_replace(origin stri
-- schemas
select name, authorization, owner, system from sys.schemas order by name;
-- _tables
-select s.name, t.name,
replace(replace(pcre_replace(pcre_replace(pcre_replace(t.query, '--.*
-', '', ''), '[
-]+', ' ', 'm'), '^ ', '', ''), '( ', '('), ' )', ')') as query, t.type,
t.system, t.commit_action, t.access from sys._tables t left outer join
sys.schemas s on t.schema_id = s.id order by s.name, t.name;
+select s.name, t.name,
replace(replace(pcre_replace(pcre_replace(pcre_replace(t.query, '--.*\n', '',
''), '[ \t\n]+', ' ', 'm'), '^ ', '', ''), '( ', '('), ' )', ')') as query,
t.type, t.system, t.commit_action, t.access from sys._tables t left outer join
sys.schemas s on t.schema_id = s.id order by s.name, t.name;
-- _columns
select t.name, c.name, c.type, c.type_digits, c.type_scale, c."default",
c."null", c.number, c.storage from sys._tables t, sys._columns c where t.id =
c.table_id order by t.name, c.number;
-- functions
-select s.name, f.name,
replace(replace(pcre_replace(pcre_replace(pcre_replace(f.func, '--.*
-', '', ''), '[
-]+', ' ', 'm'), '^ ', '', ''), '( ', '('), ' )', ')') as query, f.mod,
f.language, f.type, f.side_effect, f.varres, f.vararg from sys.functions f left
outer join sys.schemas s on f.schema_id = s.id order by s.name, f.name, query;
+select s.name, f.name,
replace(replace(pcre_replace(pcre_replace(pcre_replace(f.func, '--.*\n', '',
''), '[ \t\n]+', ' ', 'm'), '^ ', '', ''), '( ', '('), ' )', ')') as query,
f.mod, f.language, f.type, f.side_effect, f.varres, f.vararg from sys.functions
f left outer join sys.schemas s on f.schema_id = s.id order by s.name, f.name,
query;
-- args
with
arg1 (id, id1, name1, type1, type_digits1, type_scale1, inout1) as (select
f.id, a1.id, a1.name, a1.type, a1.type_digits, a1.type_scale, a1.inout from
sys.functions f left outer join args a1 on a1.func_id = f.id and a1.number = 1),
@@ -5231,7 +5227,7 @@ drop function pcre_replace(string, strin
% sys.t, sys.a, .p, .g, .p # table_name
% name, name, privileges, name, grantable # name
% varchar, varchar, int, varchar, int # type
-% 15, 6, 1, 7, 1 # length
+% 16, 6, 1, 7, 1 # length
[ "_columns", "public", 1, NULL, 0 ]
[ "_tables", "public", 1, NULL, 0 ]
[ "args", "public", 1, NULL, 0 ]
@@ -5240,12 +5236,14 @@ drop function pcre_replace(string, strin
[ "connections", "public", 1, NULL, 0 ]
[ "dependencies", "public", 1, NULL, 0 ]
[ "functions", "public", 1, NULL, 0 ]
+[ "geometry_columns", "public", 1, "monetdb", 0 ]
[ "idxs", "public", 1, NULL, 0 ]
[ "keys", "public", 1, NULL, 0 ]
[ "objects", "public", 1, NULL, 0 ]
[ "privileges", "public", 1, NULL, 0 ]
[ "schemas", "public", 1, NULL, 0 ]
[ "sequences", "public", 1, NULL, 0 ]
+[ "spatial_ref_sys", "public", 1, "monetdb", 0 ]
[ "systemfunctions", "public", 1, "monetdb", 0 ]
[ "tables", "public", 1, NULL, 0 ]
[ "triggers", "public", 1, NULL, 0 ]
@@ -5260,8 +5258,17 @@ drop function pcre_replace(string, strin
% sys.f, sys.a, .p, .g, .p # table_name
% name, name, privileges, name, grantable # name
% varchar, varchar, int, varchar, int # type
-% 16, 6, 2, 7, 1 # length
+% 20, 6, 2, 7, 1 # length
+[ "abbrev", "public", 16, "monetdb", 0 ]
[ "alpha", "public", 16, "monetdb", 0 ]
+[ "broadcast", "public", 16, "monetdb", 0 ]
+[ "contains", "public", 16, "monetdb", 0 ]
+[ "corr", "public", 16, "monetdb", 0 ]
+[ "corr", "public", 16, "monetdb", 0 ]
+[ "corr", "public", 16, "monetdb", 0 ]
+[ "corr", "public", 16, "monetdb", 0 ]
+[ "corr", "public", 16, "monetdb", 0 ]
+[ "corr", "public", 16, "monetdb", 0 ]
[ "date_to_str", "public", 16, "monetdb", 0 ]
[ "degrees", "public", 16, "monetdb", 0 ]
[ "env", "public", 16, NULL, 0 ]
@@ -5269,23 +5276,251 @@ drop function pcre_replace(string, strin
[ "epoch", "public", 16, "monetdb", 0 ]
[ "epoch", "public", 16, "monetdb", 0 ]
[ "epoch", "public", 16, "monetdb", 0 ]
+[ "filter", "public", 16, "monetdb", 0 ]
+[ "filter", "public", 16, "monetdb", 0 ]
+[ "filter", "public", 16, "monetdb", 0 ]
+[ "filter", "public", 16, "monetdb", 0 ]
+[ "geometrytype", "public", 16, "monetdb", 0 ]
+[ "get_type", "public", 16, "monetdb", 0 ]
+[ "getanchor", "public", 16, "monetdb", 0 ]
+[ "getbasename", "public", 16, "monetdb", 0 ]
+[ "getcontent", "public", 16, "monetdb", 0 ]
+[ "getcontext", "public", 16, "monetdb", 0 ]
+[ "getdomain", "public", 16, "monetdb", 0 ]
+[ "getextension", "public", 16, "monetdb", 0 ]
+[ "getfile", "public", 16, "monetdb", 0 ]
+[ "gethost", "public", 16, "monetdb", 0 ]
+[ "getport", "public", 16, "monetdb", 0 ]
+[ "getproj4", "public", 16, "monetdb", 0 ]
+[ "getprotocol", "public", 16, "monetdb", 0 ]
+[ "getquery", "public", 16, "monetdb", 0 ]
+[ "getroboturl", "public", 16, "monetdb", 0 ]
+[ "getuser", "public", 16, "monetdb", 0 ]
+[ "has_m", "public", 16, "monetdb", 0 ]
+[ "has_z", "public", 16, "monetdb", 0 ]
+[ "host", "public", 16, "monetdb", 0 ]
+[ "hostmask", "public", 16, "monetdb", 0 ]
[ "ilike", "public", 16, "monetdb", 0 ]
[ "ilike", "public", 16, "monetdb", 0 ]
+[ "integer", "public", 16, "monetdb", 0 ]
+[ "internaltransform", "public", 16, "monetdb", 0 ]
+[ "isarray", "public", 16, "monetdb", 0 ]
+[ "isarray", "public", 16, "monetdb", 0 ]
+[ "isaurl", "public", 16, "monetdb", 0 ]
+[ "isauuid", "public", 16, "monetdb", 0 ]
+[ "isobject", "public", 16, "monetdb", 0 ]
+[ "isobject", "public", 16, "monetdb", 0 ]
+[ "isvalid", "public", 16, "monetdb", 0 ]
+[ "isvalid", "public", 16, "monetdb", 0 ]
+[ "keyarray", "public", 16, "monetdb", 0 ]
+[ "left_shift", "public", 16, "monetdb", 0 ]
+[ "left_shift_assign", "public", 16, "monetdb", 0 ]
+[ "length", "public", 16, "monetdb", 0 ]
[ "like", "public", 16, "monetdb", 0 ]
[ "like", "public", 16, "monetdb", 0 ]
+[ "masklen", "public", 16, "monetdb", 0 ]
+[ "mbr", "public", 16, "monetdb", 0 ]
[ "md5", "public", 16, "monetdb", 0 ]
+[ "median", "public", 16, "monetdb", 0 ]
+[ "median", "public", 16, "monetdb", 0 ]
+[ "median", "public", 16, "monetdb", 0 ]
+[ "median", "public", 16, "monetdb", 0 ]
+[ "median", "public", 16, "monetdb", 0 ]
+[ "median", "public", 16, "monetdb", 0 ]
+[ "median", "public", 16, "monetdb", 0 ]
+[ "median", "public", 16, "monetdb", 0 ]
+[ "median", "public", 16, "monetdb", 0 ]
+[ "median", "public", 16, "monetdb", 0 ]
[ "ms_round", "public", 16, "monetdb", 0 ]
[ "ms_str", "public", 16, "monetdb", 0 ]
[ "ms_stuff", "public", 16, "monetdb", 0 ]
[ "ms_trunc", "public", 16, "monetdb", 0 ]
+[ "netmask", "public", 16, "monetdb", 0 ]
+[ "network", "public", 16, "monetdb", 0 ]
+[ "newurl", "public", 16, "monetdb", 0 ]
+[ "newurl", "public", 16, "monetdb", 0 ]
+[ "number", "public", 16, "monetdb", 0 ]
+[ "output", "public", 16, "monetdb", 0 ]
+[ "quantile", "public", 16, "monetdb", 0 ]
+[ "quantile", "public", 16, "monetdb", 0 ]
+[ "quantile", "public", 16, "monetdb", 0 ]
+[ "quantile", "public", 16, "monetdb", 0 ]
+[ "quantile", "public", 16, "monetdb", 0 ]
+[ "quantile", "public", 16, "monetdb", 0 ]
+[ "quantile", "public", 16, "monetdb", 0 ]
+[ "quantile", "public", 16, "monetdb", 0 ]
+[ "quantile", "public", 16, "monetdb", 0 ]
+[ "quantile", "public", 16, "monetdb", 0 ]
[ "radians", "public", 16, "monetdb", 0 ]
[ "rejects", "public", 16, "monetdb", 0 ]
+[ "right_shift", "public", 16, "monetdb", 0 ]
+[ "right_shift_assign", "public", 16, "monetdb", 0
]
+[ "setmasklen", "public", 16, "monetdb", 0 ]
+[ "st_area", "public", 16, "monetdb", 0 ]
+[ "st_asbinary", "public", 16, "monetdb", 0 ]
+[ "st_asewkt", "public", 16, "monetdb", 0 ]
+[ "st_astext", "public", 16, "monetdb", 0 ]
+[ "st_bdmpolyfromtext", "public", 16, "monetdb", 0
]
+[ "st_bdpolyfromtext", "public", 16, "monetdb", 0 ]
+[ "st_boundary", "public", 16, "monetdb", 0 ]
+[ "st_buffer", "public", 16, "monetdb", 0 ]
+[ "st_centroid", "public", 16, "monetdb", 0 ]
+[ "st_collect", "public", 16, "monetdb", 0 ]
+[ "st_contains", "public", 16, "monetdb", 0 ]
+[ "st_contains", "public", 16, "monetdb", 0 ]
+[ "st_convexhull", "public", 16, "monetdb", 0 ]
+[ "st_coorddim", "public", 16, "monetdb", 0 ]
+[ "st_coveredby", "public", 16, "monetdb", 0 ]
+[ "st_covers", "public", 16, "monetdb", 0 ]
+[ "st_crosses", "public", 16, "monetdb", 0 ]
+[ "st_delaunaytriangles", "public", 16, "monetdb", 0
]
+[ "st_difference", "public", 16, "monetdb", 0 ]
+[ "st_dimension", "public", 16, "monetdb", 0 ]
+[ "st_disjoint", "public", 16, "monetdb", 0 ]
+[ "st_distance", "public", 16, "monetdb", 0 ]
+[ "st_distance", "public", 16, "monetdb", 0 ]
+[ "st_dump", "public", 16, "monetdb", 0 ]
+[ "st_dumppoints", "public", 16, "monetdb", 0 ]
+[ "st_dwithin", "public", 16, "monetdb", 0 ]
+[ "st_endpoint", "public", 16, "monetdb", 0 ]
+[ "st_envelope", "public", 16, "monetdb", 0 ]
+[ "st_equals", "public", 16, "monetdb", 0 ]
+[ "st_equals", "public", 16, "monetdb", 0 ]
+[ "st_exteriorring", "public", 16, "monetdb", 0 ]
+[ "st_force2d", "public", 16, "monetdb", 0 ]
+[ "st_force3d", "public", 16, "monetdb", 0 ]
+[ "st_geomcollfromtext", "public", 16, "monetdb", 0
]
+[ "st_geomcollfromtext", "public", 16, "monetdb", 0
]
+[ "st_geometryfromtext", "public", 16, "monetdb", 0
]
+[ "st_geometryfromtext", "public", 16, "monetdb", 0
]
+[ "st_geometryn", "public", 16, "monetdb", 0 ]
+[ "st_geometrytype", "public", 16, "monetdb", 0 ]
+[ "st_geomfromtext", "public", 16, "monetdb", 0 ]
+[ "st_geomfromtext", "public", 16, "monetdb", 0 ]
+[ "st_interiorringn", "public", 16, "monetdb", 0 ]
+[ "st_interiorrings", "public", 16, "monetdb", 0 ]
+[ "st_intersection", "public", 16, "monetdb", 0 ]
+[ "st_intersects", "public", 16, "monetdb", 0 ]
+[ "st_isclosed", "public", 16, "monetdb", 0 ]
+[ "st_isempty", "public", 16, "monetdb", 0 ]
+[ "st_isring", "public", 16, "monetdb", 0 ]
+[ "st_issimple", "public", 16, "monetdb", 0 ]
+[ "st_isvalid", "public", 16, "monetdb", 0 ]
+[ "st_isvalidreason", "public", 16, "monetdb", 0 ]
+[ "st_length", "public", 16, "monetdb", 0 ]
+[ "st_length2d", "public", 16, "monetdb", 0 ]
+[ "st_linefromtext", "public", 16, "monetdb", 0 ]
+[ "st_linefromtext", "public", 16, "monetdb", 0 ]
+[ "st_makebox2d", "public", 16, "monetdb", 0 ]
+[ "st_makeenvelope", "public", 16, "monetdb", 0 ]
+[ "st_makeenvelope", "public", 16, "monetdb", 0 ]
+[ "st_makeline", "public", 16, "monetdb", 0 ]
+[ "st_makepoint", "public", 16, "monetdb", 0 ]
+[ "st_makepoint", "public", 16, "monetdb", 0 ]
+[ "st_makepoint", "public", 16, "monetdb", 0 ]
+[ "st_makepointm", "public", 16, "monetdb", 0 ]
+[ "st_makepolygon", "public", 16, "monetdb", 0 ]
+[ "st_mlinefromtext", "public", 16, "monetdb", 0 ]
+[ "st_mlinefromtext", "public", 16, "monetdb", 0 ]
+[ "st_mpointfromtext", "public", 16, "monetdb", 0 ]
+[ "st_mpointfromtext", "public", 16, "monetdb", 0 ]
+[ "st_mpolyfromtext", "public", 16, "monetdb", 0 ]
+[ "st_mpolyfromtext", "public", 16, "monetdb", 0 ]
+[ "st_npoints", "public", 16, "monetdb", 0 ]
+[ "st_nrings", "public", 16, "monetdb", 0 ]
+[ "st_numgeometries", "public", 16, "monetdb", 0 ]
+[ "st_numinteriorring", "public", 16, "monetdb", 0
]
+[ "st_numinteriorrings", "public", 16, "monetdb", 0
]
+[ "st_numpatches", "public", 16, "monetdb", 0 ]
+[ "st_numpoints", "public", 16, "monetdb", 0 ]
+[ "st_overlaps", "public", 16, "monetdb", 0 ]
+[ "st_overlaps", "public", 16, "monetdb", 0 ]
+[ "st_patchn", "public", 16, "monetdb", 0 ]
+[ "st_point", "public", 16, "monetdb", 0 ]
+[ "st_pointfromtext", "public", 16, "monetdb", 0 ]
+[ "st_pointfromtext", "public", 16, "monetdb", 0 ]
+[ "st_pointn", "public", 16, "monetdb", 0 ]
+[ "st_pointonsurface", "public", 16, "monetdb", 0 ]
+[ "st_polygon", "public", 16, "monetdb", 0 ]
+[ "st_polygonfromtext", "public", 16, "monetdb", 0
]
+[ "st_polygonfromtext", "public", 16, "monetdb", 0
]
+[ "st_relate", "public", 16, "monetdb", 0 ]
+[ "st_segmentize", "public", 16, "monetdb", 0 ]
+[ "st_setexteriorring", "public", 16, "monetdb", 0
]
+[ "st_setsrid", "public", 16, "monetdb", 0 ]
+[ "st_srid", "public", 16, "monetdb", 0 ]
+[ "st_startpoint", "public", 16, "monetdb", 0 ]
+[ "st_symdifference", "public", 16, "monetdb", 0 ]
+[ "st_touches", "public", 16, "monetdb", 0 ]
+[ "st_transform", "public", 16, "monetdb", 0 ]
+[ "st_translate", "public", 16, "monetdb", 0 ]
+[ "st_translate", "public", 16, "monetdb", 0 ]
+[ "st_union", "public", 16, "monetdb", 0 ]
+[ "st_within", "public", 16, "monetdb", 0 ]
+[ "st_wkbtosql", "public", 16, "monetdb", 0 ]
+[ "st_wkttosql", "public", 16, "monetdb", 0 ]
+[ "st_x", "public", 16, "monetdb", 0 ]
+[ "st_xmax", "public", 16, "monetdb", 0 ]
+[ "st_xmax", "public", 16, "monetdb", 0 ]
+[ "st_xmin", "public", 16, "monetdb", 0 ]
+[ "st_xmin", "public", 16, "monetdb", 0 ]
+[ "st_y", "public", 16, "monetdb", 0 ]
+[ "st_ymax", "public", 16, "monetdb", 0 ]
+[ "st_ymax", "public", 16, "monetdb", 0 ]
+[ "st_ymin", "public", 16, "monetdb", 0 ]
+[ "st_ymin", "public", 16, "monetdb", 0 ]
+[ "st_z", "public", 16, "monetdb", 0 ]
+[ "stddev_pop", "public", 16, "monetdb", 0 ]
+[ "stddev_pop", "public", 16, "monetdb", 0 ]
+[ "stddev_pop", "public", 16, "monetdb", 0 ]
+[ "stddev_pop", "public", 16, "monetdb", 0 ]
+[ "stddev_pop", "public", 16, "monetdb", 0 ]
+[ "stddev_pop", "public", 16, "monetdb", 0 ]
+[ "stddev_pop", "public", 16, "monetdb", 0 ]
+[ "stddev_pop", "public", 16, "monetdb", 0 ]
+[ "stddev_pop", "public", 16, "monetdb", 0 ]
+[ "stddev_samp", "public", 16, "monetdb", 0 ]
+[ "stddev_samp", "public", 16, "monetdb", 0 ]
+[ "stddev_samp", "public", 16, "monetdb", 0 ]
+[ "stddev_samp", "public", 16, "monetdb", 0 ]
+[ "stddev_samp", "public", 16, "monetdb", 0 ]
+[ "stddev_samp", "public", 16, "monetdb", 0 ]
+[ "stddev_samp", "public", 16, "monetdb", 0 ]
+[ "stddev_samp", "public", 16, "monetdb", 0 ]
+[ "stddev_samp", "public", 16, "monetdb", 0 ]
[ "str_to_date", "public", 16, "monetdb", 0 ]
[ "str_to_time", "public", 16, "monetdb", 0 ]
[ "str_to_timestamp", "public", 16, "monetdb", 0 ]
+[ "text", "public", 16, "monetdb", 0 ]
+[ "text", "public", 16, "monetdb", 0 ]
+[ "text", "public", 16, "monetdb", 0 ]
+[ "text", "public", 16, "monetdb", 0 ]
+[ "text", "public", 16, "monetdb", 0 ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
