Changeset: 092415e7334b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/092415e7334b
Modified Files:
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/sys-schema/Tests/webExamplesComparisonFunctionsOperators.test
Branch: Jul2021
Log Message:
approve output after 'case' changes
diffs (87 lines):
diff --git a/sql/test/emptydb/Tests/check.stable.out
b/sql/test/emptydb/Tests/check.stable.out
--- a/sql/test/emptydb/Tests/check.stable.out
+++ b/sql/test/emptydb/Tests/check.stable.out
@@ -534,6 +534,7 @@ SYSTEM FUNCTION sys.bit_not
SYSTEM FUNCTION sys.bit_or
SYSTEM FUNCTION sys.bit_xor
SYSTEM FUNCTION sys.broadcast
+SYSTEM FUNCTION sys.case
SYSTEM FUNCTION sys.casewhen
SYSTEM FUNCTION sys.cbrt
SYSTEM FUNCTION sys.ceil
@@ -2564,6 +2565,7 @@ drop function pcre_replace(string, strin
[ "sys.functions", "sys", "bit_xor", "SYSTEM", "xor", "calc",
"Internal C", "Scalar function", false, false, false, false,
"res_0", "smallint", 16, 0, "out", "arg_1",
"smallint", 16, 0, "in", "arg_2", "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 ]
[ "sys.functions", "sys", "bit_xor", "SYSTEM", "xor", "calc",
"Internal C", "Scalar function", false, false, false, false,
"res_0", "tinyint", 8, 0, "out", "arg_1",
"tinyint", 8, 0, "in", "arg_2", "tinyint", 8,
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 ]
[ "sys.functions", "sys", "broadcast", "SYSTEM", "create
function \"broadcast\" (p inet) returns inet external name
inet.\"broadcast\";", "inet", "MAL", "Scalar function", false,
false, false, true, "result", "inet", 0, 0, "out", "p",
"inet", 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 ]
+[ "sys.functions", "sys", "case", "SYSTEM", "", "",
"Internal C", "Scalar function", false, false, false, true,
"res_0", "any", 0, 0, "out", "arg_1", "any", 0,
0, "in", "arg_2", "any", 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 ]
[ "sys.functions", "sys", "casewhen", "SYSTEM", "", "",
"Internal C", "Scalar function", false, false, false, true,
"res_0", "any", 0, 0, "out", "arg_1", "any", 0,
0, "in", "arg_2", "any", 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 ]
[ "sys.functions", "sys", "cbrt", "SYSTEM", "cbrt", "mmath",
"Internal C", "Scalar function", false, false, false, false,
"res_0", "double", 53, 0, "out", "arg_1",
"double", 53, 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 ]
[ "sys.functions", "sys", "cbrt", "SYSTEM", "cbrt", "mmath",
"Internal C", "Scalar function", false, false, false, false,
"res_0", "real", 24, 0, "out", "arg_1", "real", 24,
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 ]
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
@@ -534,6 +534,7 @@ SYSTEM FUNCTION sys.bit_not
SYSTEM FUNCTION sys.bit_or
SYSTEM FUNCTION sys.bit_xor
SYSTEM FUNCTION sys.broadcast
+SYSTEM FUNCTION sys.case
SYSTEM FUNCTION sys.casewhen
SYSTEM FUNCTION sys.cbrt
SYSTEM FUNCTION sys.ceil
@@ -2566,6 +2567,7 @@ drop function pcre_replace(string, strin
[ "sys.functions", "sys", "bit_xor", "SYSTEM", "xor", "calc",
"Internal C", "Scalar function", false, false, false, false,
"res_0", "smallint", 16, 0, "out", "arg_1",
"smallint", 16, 0, "in", "arg_2", "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 ]
[ "sys.functions", "sys", "bit_xor", "SYSTEM", "xor", "calc",
"Internal C", "Scalar function", false, false, false, false,
"res_0", "tinyint", 8, 0, "out", "arg_1",
"tinyint", 8, 0, "in", "arg_2", "tinyint", 8,
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 ]
[ "sys.functions", "sys", "broadcast", "SYSTEM", "create
function \"broadcast\" (p inet) returns inet external name
inet.\"broadcast\";", "inet", "MAL", "Scalar function", false,
false, false, true, "result", "inet", 0, 0, "out", "p",
"inet", 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 ]
+[ "sys.functions", "sys", "case", "SYSTEM", "", "",
"Internal C", "Scalar function", false, false, false, true,
"res_0", "any", 0, 0, "out", "arg_1", "any", 0,
0, "in", "arg_2", "any", 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 ]
[ "sys.functions", "sys", "casewhen", "SYSTEM", "", "",
"Internal C", "Scalar function", false, false, false, true,
"res_0", "any", 0, 0, "out", "arg_1", "any", 0,
0, "in", "arg_2", "any", 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 ]
[ "sys.functions", "sys", "cbrt", "SYSTEM", "cbrt", "mmath",
"Internal C", "Scalar function", false, false, false, false,
"res_0", "double", 53, 0, "out", "arg_1",
"double", 53, 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 ]
[ "sys.functions", "sys", "cbrt", "SYSTEM", "cbrt", "mmath",
"Internal C", "Scalar function", false, false, false, false,
"res_0", "real", 24, 0, "out", "arg_1", "real", 24,
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 ]
diff --git a/sql/test/emptydb/Tests/check.stable.out.int128
b/sql/test/emptydb/Tests/check.stable.out.int128
--- a/sql/test/emptydb/Tests/check.stable.out.int128
+++ b/sql/test/emptydb/Tests/check.stable.out.int128
@@ -534,6 +534,7 @@ SYSTEM FUNCTION sys.bit_not
SYSTEM FUNCTION sys.bit_or
SYSTEM FUNCTION sys.bit_xor
SYSTEM FUNCTION sys.broadcast
+SYSTEM FUNCTION sys.case
SYSTEM FUNCTION sys.casewhen
SYSTEM FUNCTION sys.cbrt
SYSTEM FUNCTION sys.ceil
@@ -2600,6 +2601,7 @@ drop function pcre_replace(string, strin
[ "sys.functions", "sys", "bit_xor", "SYSTEM", "xor", "calc",
"Internal C", "Scalar function", false, false, false, false,
"res_0", "smallint", 16, 0, "out", "arg_1",
"smallint", 16, 0, "in", "arg_2", "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 ]
[ "sys.functions", "sys", "bit_xor", "SYSTEM", "xor", "calc",
"Internal C", "Scalar function", false, false, false, false,
"res_0", "tinyint", 8, 0, "out", "arg_1",
"tinyint", 8, 0, "in", "arg_2", "tinyint", 8,
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 ]
[ "sys.functions", "sys", "broadcast", "SYSTEM", "create
function \"broadcast\" (p inet) returns inet external name
inet.\"broadcast\";", "inet", "MAL", "Scalar function", false,
false, false, true, "result", "inet", 0, 0, "out", "p",
"inet", 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 ]
+[ "sys.functions", "sys", "case", "SYSTEM", "", "",
"Internal C", "Scalar function", false, false, false, true,
"res_0", "any", 0, 0, "out", "arg_1", "any", 0,
0, "in", "arg_2", "any", 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 ]
[ "sys.functions", "sys", "casewhen", "SYSTEM", "", "",
"Internal C", "Scalar function", false, false, false, true,
"res_0", "any", 0, 0, "out", "arg_1", "any", 0,
0, "in", "arg_2", "any", 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 ]
[ "sys.functions", "sys", "cbrt", "SYSTEM", "cbrt", "mmath",
"Internal C", "Scalar function", false, false, false, false,
"res_0", "double", 53, 0, "out", "arg_1",
"double", 53, 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 ]
[ "sys.functions", "sys", "cbrt", "SYSTEM", "cbrt", "mmath",
"Internal C", "Scalar function", false, false, false, false,
"res_0", "real", 24, 0, "out", "arg_1", "real", 24,
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 ]
diff --git
a/sql/test/sys-schema/Tests/webExamplesComparisonFunctionsOperators.test
b/sql/test/sys-schema/Tests/webExamplesComparisonFunctionsOperators.test
--- a/sql/test/sys-schema/Tests/webExamplesComparisonFunctionsOperators.test
+++ b/sql/test/sys-schema/Tests/webExamplesComparisonFunctionsOperators.test
@@ -722,7 +722,7 @@ project (
query T rowsort
plan select CASE WHEN null = null THEN NULL ELSE null END
----
-) [ "sys"."ifthenelse"(boolean "NULL", smallint "NULL", smallint "NULL") ]
+) [ "sys"."case"(boolean "NULL", smallint "NULL", smallint "NULL") ]
project (
| [ boolean "true" ]
@@ -736,7 +736,7 @@ project (
query T rowsort
plan select CASE WHEN 'ac' = 'ac' THEN NULL ELSE 'ac' END
----
-) [ "sys"."ifthenelse"("sys"."="(char(2) "ac", char(2) "ac") NOT NULL, char
"NULL", char "ac") ]
+) [ "sys"."case"("sys"."="(char(2) "ac", char(2) "ac") NOT NULL, char "NULL",
char "ac") ]
project (
| [ boolean "true" ]
@@ -750,7 +750,7 @@ project (
query T rowsort
plan select CASE WHEN 9 = 9 THEN NULL ELSE 9 END
----
-) [ "sys"."ifthenelse"("sys"."="(tinyint "9", tinyint "9") NOT NULL, tinyint
"NULL", tinyint "9") ]
+) [ "sys"."case"("sys"."="(tinyint "9", tinyint "9") NOT NULL, tinyint "NULL",
tinyint "9") ]
project (
| [ boolean "true" ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
