Changeset: d1bec232a265 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d1bec232a265
Modified Files:
sql/backends/monet5/Tests/pyloader07.stable.out.32bit
sql/test/BugTracker-2015/Tests/sql2pcre.Bug-3800.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/emptydb/Tests/check.stable.out.32bit
Branch: Aug2018
Log Message:
Approved some tests.
diffs (183 lines):
diff --git a/sql/backends/monet5/Tests/pyloader07.stable.out.32bit
b/sql/backends/monet5/Tests/pyloader07.stable.out.32bit
--- a/sql/backends/monet5/Tests/pyloader07.stable.out.32bit
+++ b/sql/backends/monet5/Tests/pyloader07.stable.out.32bit
@@ -82,7 +82,6 @@ Ready.
# _emit.emit({'d': ['2014-05-20'], 's': ['00:02:30'], 't': ['2014-05-20
00:02:30']});
#};
#COPY LOADER INTO tstamp FROM pyloader07();
-[ 2 ]
#SELECT * FROM tstamp;
% sys.tstamp, sys.tstamp, sys.tstamp # table_name
% d, s, t # name
diff --git a/sql/test/BugTracker-2015/Tests/sql2pcre.Bug-3800.stable.out
b/sql/test/BugTracker-2015/Tests/sql2pcre.Bug-3800.stable.out
--- a/sql/test/BugTracker-2015/Tests/sql2pcre.Bug-3800.stable.out
+++ b/sql/test/BugTracker-2015/Tests/sql2pcre.Bug-3800.stable.out
@@ -105,8 +105,8 @@ Ready.
% .L2 # table_name
% L2 # name
% clob # type
-% 4 # length
-[ "^.*$" ]
+% 5 # length
+[ "^.*?$" ]
#SELECT sql2pcre('_??', '?');
% .L2 # table_name
% L2 # name
@@ -123,8 +123,8 @@ Ready.
% .L2 # table_name
% L2 # name
% clob # type
-% 8 # length
-[ "^.*\\^.*$" ]
+% 10 # length
+[ "^.*?\\^.*?$" ]
#DROP FUNCTION sql2pcre;
# 16:37:27 >
diff --git a/sql/test/Tests/systemfunctions.stable.out
b/sql/test/Tests/systemfunctions.stable.out
--- a/sql/test/Tests/systemfunctions.stable.out
+++ b/sql/test/Tests/systemfunctions.stable.out
@@ -564,47 +564,47 @@ Ready.
[ "sys", "fuse", 0, "bigint", "create function fuse(one
integer, two integer)\nreturns bigint external name udf.fuse;" ]
[ "sys", "fuse", 1, "int", "" ]
[ "sys", "fuse", 2, "int", "" ]
-[ "sys", "generate_series", 0, "tinyint", "create
function sys.generate_series(first tinyint, last tinyint)\nreturns table (value
tinyint)\nexternal name generator.series;" ]
+[ "sys", "generate_series", 0, "tinyint", "create
function sys.generate_series(first tinyint, \"limit\" tinyint)\nreturns table
(value tinyint)\nexternal name generator.series;" ]
[ "sys", "generate_series", 1, "tinyint", "" ]
[ "sys", "generate_series", 2, "tinyint", "" ]
-[ "sys", "generate_series", 0, "tinyint", "create
function sys.generate_series(first tinyint, last tinyint, stepsize
tinyint)\nreturns table (value tinyint)\nexternal name generator.series;" ]
+[ "sys", "generate_series", 0, "tinyint", "create
function sys.generate_series(first tinyint, \"limit\" tinyint, stepsize
tinyint)\nreturns table (value tinyint)\nexternal name generator.series;"
]
[ "sys", "generate_series", 1, "tinyint", "" ]
[ "sys", "generate_series", 2, "tinyint", "" ]
[ "sys", "generate_series", 3, "tinyint", "" ]
-[ "sys", "generate_series", 0, "smallint", "create
function sys.generate_series(first smallint, last smallint)\nreturns table
(value smallint)\nexternal name generator.series;" ]
+[ "sys", "generate_series", 0, "smallint", "create
function sys.generate_series(first smallint, \"limit\" smallint)\nreturns table
(value smallint)\nexternal name generator.series;" ]
[ "sys", "generate_series", 1, "smallint", "" ]
[ "sys", "generate_series", 2, "smallint", "" ]
-[ "sys", "generate_series", 0, "smallint", "create
function sys.generate_series(first smallint, last smallint, stepsize
smallint)\nreturns table (value smallint)\nexternal name generator.series;"
]
+[ "sys", "generate_series", 0, "smallint", "create
function sys.generate_series(first smallint, \"limit\" smallint, stepsize
smallint)\nreturns table (value smallint)\nexternal name generator.series;" ]
[ "sys", "generate_series", 1, "smallint", "" ]
[ "sys", "generate_series", 2, "smallint", "" ]
[ "sys", "generate_series", 3, "smallint", "" ]
-[ "sys", "generate_series", 0, "int", "create function
sys.generate_series(first int, last int)\nreturns table (value int)\nexternal
name generator.series;" ]
+[ "sys", "generate_series", 0, "int", "create function
sys.generate_series(first int, \"limit\" int)\nreturns table (value
int)\nexternal name generator.series;" ]
[ "sys", "generate_series", 1, "int", "" ]
[ "sys", "generate_series", 2, "int", "" ]
-[ "sys", "generate_series", 0, "int", "create function
sys.generate_series(first int, last int, stepsize int)\nreturns table (value
int)\nexternal name generator.series;" ]
+[ "sys", "generate_series", 0, "int", "create function
sys.generate_series(first int, \"limit\" int, stepsize int)\nreturns table
(value int)\nexternal name generator.series;" ]
[ "sys", "generate_series", 1, "int", "" ]
[ "sys", "generate_series", 2, "int", "" ]
[ "sys", "generate_series", 3, "int", "" ]
-[ "sys", "generate_series", 0, "bigint", "create
function sys.generate_series(first bigint, last bigint)\nreturns table (value
bigint)\nexternal name generator.series;" ]
+[ "sys", "generate_series", 0, "bigint", "create
function sys.generate_series(first bigint, \"limit\" bigint)\nreturns table
(value bigint)\nexternal name generator.series;" ]
[ "sys", "generate_series", 1, "bigint", "" ]
[ "sys", "generate_series", 2, "bigint", "" ]
-[ "sys", "generate_series", 0, "bigint", "create
function sys.generate_series(first bigint, last bigint, stepsize
bigint)\nreturns table (value bigint)\nexternal name generator.series;" ]
+[ "sys", "generate_series", 0, "bigint", "create
function sys.generate_series(first bigint, \"limit\" bigint, stepsize
bigint)\nreturns table (value bigint)\nexternal name generator.series;" ]
[ "sys", "generate_series", 1, "bigint", "" ]
[ "sys", "generate_series", 2, "bigint", "" ]
[ "sys", "generate_series", 3, "bigint", "" ]
-[ "sys", "generate_series", 0, "real", "create function
sys.generate_series(first real, last real, stepsize real)\nreturns table (value
real)\nexternal name generator.series;" ]
+[ "sys", "generate_series", 0, "real", "create function
sys.generate_series(first real, \"limit\" real, stepsize real)\nreturns table
(value real)\nexternal name generator.series;" ]
[ "sys", "generate_series", 1, "real", "" ]
[ "sys", "generate_series", 2, "real", "" ]
[ "sys", "generate_series", 3, "real", "" ]
-[ "sys", "generate_series", 0, "double", "create
function sys.generate_series(first double, last double, stepsize
double)\nreturns table (value double)\nexternal name generator.series;" ]
+[ "sys", "generate_series", 0, "double", "create
function sys.generate_series(first double, \"limit\" double, stepsize
double)\nreturns table (value double)\nexternal name generator.series;" ]
[ "sys", "generate_series", 1, "double", "" ]
[ "sys", "generate_series", 2, "double", "" ]
[ "sys", "generate_series", 3, "double", "" ]
-[ "sys", "generate_series", 0, "decimal", "create
function sys.generate_series(first decimal(10,2), last decimal(10,2), stepsize
decimal(10,2))\nreturns table (value decimal(10,2))\nexternal name
generator.series;" ]
+[ "sys", "generate_series", 0, "decimal", "create
function sys.generate_series(first decimal(10,2), \"limit\" decimal(10,2),
stepsize decimal(10,2))\nreturns table (value decimal(10,2))\nexternal name
generator.series;" ]
[ "sys", "generate_series", 1, "decimal", "" ]
[ "sys", "generate_series", 2, "decimal", "" ]
[ "sys", "generate_series", 3, "decimal", "" ]
-[ "sys", "generate_series", 0, "timestamp", "create
function sys.generate_series(first timestamp, last timestamp, stepsize interval
second)\nreturns table (value timestamp)\nexternal name generator.series;"
]
+[ "sys", "generate_series", 0, "timestamp", "create
function sys.generate_series(first timestamp, \"limit\" timestamp, stepsize
interval second)\nreturns table (value timestamp)\nexternal name
generator.series;" ]
[ "sys", "generate_series", 1, "timestamp", "" ]
[ "sys", "generate_series", 2, "timestamp", "" ]
[ "sys", "generate_series", 3, "sec_interval", "" ]
diff --git a/sql/test/Tests/systemfunctions.stable.out.int128
b/sql/test/Tests/systemfunctions.stable.out.int128
--- a/sql/test/Tests/systemfunctions.stable.out.int128
+++ b/sql/test/Tests/systemfunctions.stable.out.int128
@@ -601,54 +601,54 @@ Ready.
[ "sys", "fuse", 0, "hugeint", "create function fuse(one
bigint, two bigint)\nreturns hugeint external name udf.fuse;" ]
[ "sys", "fuse", 1, "bigint", "" ]
[ "sys", "fuse", 2, "bigint", "" ]
-[ "sys", "generate_series", 0, "tinyint", "create
function sys.generate_series(first tinyint, last tinyint)\nreturns table (value
tinyint)\nexternal name generator.series;" ]
+[ "sys", "generate_series", 0, "tinyint", "create
function sys.generate_series(first tinyint, \"limit\" tinyint)\nreturns table
(value tinyint)\nexternal name generator.series;" ]
[ "sys", "generate_series", 1, "tinyint", "" ]
[ "sys", "generate_series", 2, "tinyint", "" ]
-[ "sys", "generate_series", 0, "tinyint", "create
function sys.generate_series(first tinyint, last tinyint, stepsize
tinyint)\nreturns table (value tinyint)\nexternal name generator.series;" ]
+[ "sys", "generate_series", 0, "tinyint", "create
function sys.generate_series(first tinyint, \"limit\" tinyint, stepsize
tinyint)\nreturns table (value tinyint)\nexternal name generator.series;"
]
[ "sys", "generate_series", 1, "tinyint", "" ]
[ "sys", "generate_series", 2, "tinyint", "" ]
[ "sys", "generate_series", 3, "tinyint", "" ]
-[ "sys", "generate_series", 0, "smallint", "create
function sys.generate_series(first smallint, last smallint)\nreturns table
(value smallint)\nexternal name generator.series;" ]
+[ "sys", "generate_series", 0, "smallint", "create
function sys.generate_series(first smallint, \"limit\" smallint)\nreturns table
(value smallint)\nexternal name generator.series;" ]
[ "sys", "generate_series", 1, "smallint", "" ]
[ "sys", "generate_series", 2, "smallint", "" ]
-[ "sys", "generate_series", 0, "smallint", "create
function sys.generate_series(first smallint, last smallint, stepsize
smallint)\nreturns table (value smallint)\nexternal name generator.series;"
]
+[ "sys", "generate_series", 0, "smallint", "create
function sys.generate_series(first smallint, \"limit\" smallint, stepsize
smallint)\nreturns table (value smallint)\nexternal name generator.series;" ]
[ "sys", "generate_series", 1, "smallint", "" ]
[ "sys", "generate_series", 2, "smallint", "" ]
[ "sys", "generate_series", 3, "smallint", "" ]
-[ "sys", "generate_series", 0, "int", "create function
sys.generate_series(first int, last int)\nreturns table (value int)\nexternal
name generator.series;" ]
+[ "sys", "generate_series", 0, "int", "create function
sys.generate_series(first int, \"limit\" int)\nreturns table (value
int)\nexternal name generator.series;" ]
[ "sys", "generate_series", 1, "int", "" ]
[ "sys", "generate_series", 2, "int", "" ]
-[ "sys", "generate_series", 0, "int", "create function
sys.generate_series(first int, last int, stepsize int)\nreturns table (value
int)\nexternal name generator.series;" ]
+[ "sys", "generate_series", 0, "int", "create function
sys.generate_series(first int, \"limit\" int, stepsize int)\nreturns table
(value int)\nexternal name generator.series;" ]
[ "sys", "generate_series", 1, "int", "" ]
[ "sys", "generate_series", 2, "int", "" ]
[ "sys", "generate_series", 3, "int", "" ]
-[ "sys", "generate_series", 0, "bigint", "create
function sys.generate_series(first bigint, last bigint)\nreturns table (value
bigint)\nexternal name generator.series;" ]
+[ "sys", "generate_series", 0, "bigint", "create
function sys.generate_series(first bigint, \"limit\" bigint)\nreturns table
(value bigint)\nexternal name generator.series;" ]
[ "sys", "generate_series", 1, "bigint", "" ]
[ "sys", "generate_series", 2, "bigint", "" ]
-[ "sys", "generate_series", 0, "bigint", "create
function sys.generate_series(first bigint, last bigint, stepsize
bigint)\nreturns table (value bigint)\nexternal name generator.series;" ]
+[ "sys", "generate_series", 0, "bigint", "create
function sys.generate_series(first bigint, \"limit\" bigint, stepsize
bigint)\nreturns table (value bigint)\nexternal name generator.series;" ]
[ "sys", "generate_series", 1, "bigint", "" ]
[ "sys", "generate_series", 2, "bigint", "" ]
[ "sys", "generate_series", 3, "bigint", "" ]
-[ "sys", "generate_series", 0, "real", "create function
sys.generate_series(first real, last real, stepsize real)\nreturns table (value
real)\nexternal name generator.series;" ]
+[ "sys", "generate_series", 0, "real", "create function
sys.generate_series(first real, \"limit\" real, stepsize real)\nreturns table
(value real)\nexternal name generator.series;" ]
[ "sys", "generate_series", 1, "real", "" ]
[ "sys", "generate_series", 2, "real", "" ]
[ "sys", "generate_series", 3, "real", "" ]
-[ "sys", "generate_series", 0, "double", "create
function sys.generate_series(first double, last double, stepsize
double)\nreturns table (value double)\nexternal name generator.series;" ]
+[ "sys", "generate_series", 0, "double", "create
function sys.generate_series(first double, \"limit\" double, stepsize
double)\nreturns table (value double)\nexternal name generator.series;" ]
[ "sys", "generate_series", 1, "double", "" ]
[ "sys", "generate_series", 2, "double", "" ]
[ "sys", "generate_series", 3, "double", "" ]
-[ "sys", "generate_series", 0, "decimal", "create
function sys.generate_series(first decimal(10,2), last decimal(10,2), stepsize
decimal(10,2))\nreturns table (value decimal(10,2))\nexternal name
generator.series;" ]
+[ "sys", "generate_series", 0, "decimal", "create
function sys.generate_series(first decimal(10,2), \"limit\" decimal(10,2),
stepsize decimal(10,2))\nreturns table (value decimal(10,2))\nexternal name
generator.series;" ]
[ "sys", "generate_series", 1, "decimal", "" ]
[ "sys", "generate_series", 2, "decimal", "" ]
[ "sys", "generate_series", 3, "decimal", "" ]
-[ "sys", "generate_series", 0, "timestamp", "create
function sys.generate_series(first timestamp, last timestamp, stepsize interval
second)\nreturns table (value timestamp)\nexternal name generator.series;"
]
+[ "sys", "generate_series", 0, "timestamp", "create
function sys.generate_series(first timestamp, \"limit\" timestamp, stepsize
interval second)\nreturns table (value timestamp)\nexternal name
generator.series;" ]
[ "sys", "generate_series", 1, "timestamp", "" ]
[ "sys", "generate_series", 2, "timestamp", "" ]
[ "sys", "generate_series", 3, "sec_interval", "" ]
-[ "sys", "generate_series", 0, "hugeint", "create
function sys.generate_series(first hugeint, last hugeint)\nreturns table (value
hugeint)\nexternal name generator.series;" ]
+[ "sys", "generate_series", 0, "hugeint", "create
function sys.generate_series(first hugeint, \"limit\" hugeint)\nreturns table
(value hugeint)\nexternal name generator.series;" ]
[ "sys", "generate_series", 1, "hugeint", "" ]
[ "sys", "generate_series", 2, "hugeint", "" ]
-[ "sys", "generate_series", 0, "hugeint", "create
function sys.generate_series(first hugeint, last hugeint, stepsize
hugeint)\nreturns table (value hugeint)\nexternal name generator.series;" ]
+[ "sys", "generate_series", 0, "hugeint", "create
function sys.generate_series(first hugeint, \"limit\" hugeint, stepsize
hugeint)\nreturns table (value hugeint)\nexternal name generator.series;"
]
[ "sys", "generate_series", 1, "hugeint", "" ]
[ "sys", "generate_series", 2, "hugeint", "" ]
[ "sys", "generate_series", 3, "hugeint", "" ]
diff --git a/sql/test/emptydb/Tests/check.stable.out.32bit
b/sql/test/emptydb/Tests/check.stable.out.32bit
--- a/sql/test/emptydb/Tests/check.stable.out.32bit
+++ b/sql/test/emptydb/Tests/check.stable.out.32bit
@@ -2033,7 +2033,7 @@ drop function pcre_replace(string, strin
% .s, .f, .L4, .f, .fl, .ft, .f, .f, .f, .L14,
.L16, .L20, .L22, .L24, .L26, .L30, .L32, .L34, .L36, .L40,
.L42, .L44, .L46, .L50, .L52, .L54, .L56, .L60, .L62, .L64,
.L66, .L70, .L72, .L74, .L76, .L100, .L102, .L104, .L106, .L110,
.L112, .L114, .L116, .L120, .L122, .L124, .L126, .L130, .L132, .L134,
.L136, .L140, .L142, .L144, .L146, .L150, .L152, .L154, .L156, .L160,
.L162, .L164, .L166, .L170, .L172, .L174, .L176, .L200, .L202, .L204,
.L206, .L210, .L212, .L214, .L216, .L220, .L222, .L224, .L226, .L230,
.L232, .L234, .L236, .L240, .L242, .L244, .L246, .L250, .L252 #
table_name
% name, name, query, mod, language_name, function_type_name,
side_effect, varres, vararg, name0, type0, type_digits0, type_scale0,
inout0, name1, type1, type_digits1, type_scale1, inout1, name2, type2,
type_digits2, type_scale2, inout2, name3, type3, type_digits3,
type_scale3, inout3, name4, type4, type_digits4, type_scale4, inout4,
name5, type5, type_digits5, type_scale5, inout5, name6, type6,
type_digits6, type_scale6, inout6, name7, type7, type_digits7,
type_scale7, inout7, name8, type8, type_digits8, type_scale8, inout8,
name9, type9, type_digits9, type_scale9, inout9, name10, type10,
type_digits10, type_scale10, inout10, name11, type11, type_digits11,
type_scale11, inout11, name12, type12, type_digits12, type_scale12,
inout12, name13, type13, type_digits13, type_scale13, inout13,
name14, type14, type_digits14, type_scale14, inout14, name15, type15,
type_digits15, type_scale15, inout15 # name
% varchar, varchar, varchar, varchar, varchar,
varchar, boolean, boolean, boolean, varchar,
varchar, int, int, char, varchar, varchar, int,
int, char, varchar, varchar, int, int, char,
varchar, varchar, int, int, char, varchar,
varchar, int, int, char, varchar, varchar, int,
int, char, varchar, varchar, int, int, char,
varchar, varchar, int, int, char, varchar,
varchar, int, int, char, varchar, varchar, int,
int, char, varchar, varchar, int, int, char,
varchar, varchar, int, int, char, varchar,
varchar, int, int, char, varchar, varchar, int,
int, char, varchar, varchar, int, int, char,
varchar, varchar, int, int, char # type
-% 8, 35, 831, 9, 10, 26, 5, 5, 5, 11,
14, 4, 1, 3, 16, 14, 4, 1, 3, 16,
14, 2, 1, 3, 27, 12, 2, 1, 3, 12,
7, 2, 1, 3, 10, 7, 2, 1, 3, 8,
7, 2, 1, 3, 9, 6, 2, 1, 3, 10,
6, 2, 1, 3, 8, 7, 2, 1, 3, 9,
7, 2, 1, 3, 6, 7, 2, 1, 3, 8,
6, 2, 1, 3, 6, 7, 1, 1, 3, 9,
7, 1, 1, 3, 6, 7, 1, 1, 3 # length
+% 8, 24, 831, 9, 10, 26, 5, 5, 5, 11,
14, 4, 1, 3, 16, 14, 4, 1, 3, 16,
14, 2, 1, 3, 27, 12, 2, 1, 3, 12,
7, 2, 1, 3, 10, 7, 2, 1, 3, 8,
7, 2, 1, 3, 9, 6, 2, 1, 3, 10,
6, 2, 1, 3, 8, 7, 2, 1, 3, 9,
7, 2, 1, 3, 6, 7, 2, 1, 3, 8,
6, 2, 1, 3, 6, 7, 1, 1, 3, 9,
7, 1, 1, 3, 6, 7, 1, 1, 3 # length
[ "bam", "bam_drop_file", "create procedure
bam.bam_drop_file(file_id bigint, dbschema smallint) external name
bam.bam_drop_file;", "bam", "MAL", "Procedure", true, false,
false, "file_id", "bigint", 64, 0, "in", "dbschema",
"smallint", 16, 0, "in", NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL ]
[ "bam", "bam_export", "create procedure bam.bam_export(output_path
string) external name bam.bam_export;", "bam", "MAL", "Procedure",
true, false, false, "output_path", "clob", 0, 0, "in", NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL ]
[ "bam", "bam_flag", "create function bam.bam_flag(flag smallint,
name string) returns boolean external name bam.bam_flag;", "bam", "MAL",
"Scalar function", false, false, false, "result", "boolean",
1, 0, "out", "flag", "smallint", 16, 0, "in", "name",
"clob", 0, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
