Changeset: 66c2edf8eaaa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=66c2edf8eaaa
Modified Files:
sql/test/miscellaneous/Tests/groupby_error.stable.err
sql/test/miscellaneous/Tests/groupby_expressions.stable.err
sql/test/miscellaneous/Tests/groupby_expressions.stable.out
sql/test/miscellaneous/Tests/select_groupby.stable.out
sql/test/miscellaneous/Tests/simple_selects.stable.out
sql/test/miscellaneous/Tests/trace_test.stable.out
sql/test/miscellaneous/Tests/values.stable.out
sql/test/null/Tests/coalesce.stable.out
sql/test/null/Tests/coalesce2.stable.out
sql/test/null/Tests/coalesce3.stable.out
sql/test/null/Tests/null_in_case.stable.out
sql/test/orderidx/Tests/oidx_all_types.stable.out
sql/test/orderidx/Tests/simpletable.stable.out
sql/test/orderidx/Tests/simpletable.stable.out.32bit
sql/test/orderidx/Tests/smalltable.stable.out
sql/test/orderidx/Tests/smalltable.stable.out.32bit
sql/test/osm/Tests/drop_constraint_bug.stable.out
sql/test/pg_regress/Tests/alter_table.stable.out
sql/test/pg_regress/Tests/boolean.stable.out
sql/test/pg_regress/Tests/box.stable.out
sql/test/pg_regress/Tests/case.stable.out
sql/test/pg_regress/Tests/char.stable.out
sql/test/pg_regress/Tests/comments.stable.out
sql/test/pg_regress/Tests/date.stable.out
sql/test/pg_regress/Tests/float4.stable.out
sql/test/pg_regress/Tests/float8.stable.out
sql/test/pg_regress/Tests/float8.stable.out.Windows
sql/test/pg_regress/Tests/horology.stable.out
sql/test/pg_regress/Tests/inet.stable.out
sql/test/pg_regress/Tests/int2.stable.out
sql/test/pg_regress/Tests/int4.stable.out
sql/test/pg_regress/Tests/int4.stable.out.int128
sql/test/pg_regress/Tests/int8.stable.out
sql/test/pg_regress/Tests/int8.stable.out.int128
sql/test/pg_regress/Tests/interval.stable.out
sql/test/pg_regress/Tests/interval.stable.out.int128
sql/test/pg_regress/Tests/limit.stable.out
sql/test/pg_regress/Tests/numeric.stable.out.int128
sql/test/pg_regress/Tests/numerology.stable.out
sql/test/pg_regress/Tests/oid.stable.out
sql/test/pg_regress/Tests/oid.stable.out.32bit
sql/test/pg_regress/Tests/path.stable.out
sql/test/pg_regress/Tests/point.stable.out
sql/test/pg_regress/Tests/polygon.stable.out
sql/test/pg_regress/Tests/random.stable.out
sql/test/pg_regress/Tests/reltime.stable.out
sql/test/pg_regress/Tests/strings.stable.out
sql/test/pg_regress/Tests/strings_cast.stable.out
sql/test/pg_regress/Tests/strings_concat.stable.out
sql/test/pg_regress/Tests/strings_like.stable.out
sql/test/pg_regress/Tests/text.stable.out
sql/test/pg_regress/Tests/time.stable.out
sql/test/pg_regress/Tests/timestamp.stable.out
sql/test/pg_regress/Tests/timestamptz.stable.out
sql/test/pg_regress/Tests/timetz.stable.out
sql/test/pg_regress/Tests/vacuum.stable.out
sql/test/pg_regress/Tests/vacuum.stable.out.single
sql/test/pg_regress/Tests/varchar.stable.out
sql/test/pg_regress/Tests/without_oid.stable.out
sql/test/pg_regress/Tests/without_oid.stable.out.32bit
sql/test/quantiles/Tests/quantiles.stable.out
sql/test/rdf/Tests/q1_t.stable.out
sql/test/rdf/Tests/q1_v.stable.out
sql/test/rdf/Tests/q2_28_t.stable.out
sql/test/rdf/Tests/q2_28_v.stable.out
sql/test/rdf/Tests/q2_t.stable.out
sql/test/rdf/Tests/q2_v.stable.out
sql/test/rdf/Tests/q3_28_t.stable.out
sql/test/rdf/Tests/q3_t.stable.out
sql/test/rdf/Tests/q4_28_t.stable.out
sql/test/rdf/Tests/q4_t.stable.out
sql/test/rdf/Tests/q6_28_t.stable.out
sql/test/rdf/Tests/q6_28_v.stable.out
sql/test/rdf/Tests/q6_t.stable.out
sql/test/rdf/Tests/q6_v.stable.out
sql/test/rename/Tests/rename05.stable.out
sql/test/sample/Tests/sample.1.stable.out
sql/test/sample/Tests/sample.10.stable.out
sql/test/sample/Tests/sample.11.stable.out
sql/test/sample/Tests/sample.12.stable.out
sql/test/sample/Tests/sample.13.stable.out
sql/test/sample/Tests/sample.14.stable.out
sql/test/sample/Tests/sample.2.stable.out
sql/test/sample/Tests/sample.3.stable.out
sql/test/sample/Tests/sample.4.stable.out
sql/test/sample/Tests/sample.5.stable.out
sql/test/sample/Tests/sample.6.stable.out
sql/test/sample/Tests/sample.7.stable.out
sql/test/sample/Tests/sample.8.stable.out
sql/test/sample/Tests/sample.9.stable.out
sql/test/snodgrass/Tests/cast_select.stable.out
sql/test/snodgrass/Tests/date_parsing.stable.out
sql/test/snodgrass/Tests/date_select.stable.out
sql/test/snodgrass/Tests/extract_select.stable.out
sql/test/snodgrass/Tests/interval_parsing.stable.out
sql/test/snodgrass/Tests/interval_select.stable.out
sql/test/sql_xml/Tests/load.stable.out
sql/test/sql_xml/Tests/xml.stable.out
sql/test/sql_xml/Tests/xml_attribute_parsing.SF-1855673.stable.out
sql/test/sql_xml/Tests/xmlelement_segfault.SF-2812767.stable.out
sql/test/ssqq/Tests/insert_query.stable.out
sql/test/ssqq/Tests/insert_queue.stable.out
sql/test/ssqq/Tests/insert_quser.stable.out
sql/test/sys-schema/Tests/bam_tables_checks.stable.out
sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.stable.out
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
sql/test/sys-schema/Tests/check_MaxStrLength_violations.stable.out
sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out
sql/test/sys-schema/Tests/geom_tables_checks.stable.out
sql/test/sys-schema/Tests/netcdf_tables_checks.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
Branch: sq2default
Log Message:
approved
diffs (truncated from 11832 to 300 lines):
diff --git a/sql/test/miscellaneous/Tests/groupby_error.stable.err
b/sql/test/miscellaneous/Tests/groupby_error.stable.err
--- a/sql/test/miscellaneous/Tests/groupby_error.stable.err
+++ b/sql/test/miscellaneous/Tests/groupby_error.stable.err
@@ -29,8 +29,8 @@ stderr of test 'groupby_error` in direct
MAPI = (monetdb) /var/tmp/mtest-13678/.s.monetdb.36667
QUERY = SELECT parent."sys_id" FROM "kagami_dump"."test_task" parent INNER
JOIN "kagami_dump"."test_task" child ON child."parent" = parent."sys_id" GROUP
BY parent."sys_id" HAVING count(child."sys_id") >= 1 ORDER BY parent."number";
--error, parent."number" requires an aggregate function
-ERROR = !SELECT: cannot use non GROUP BY column 'parent.number' in query
results without an aggregate function
-CODE = 42000
+ERROR = !SELECT: no such column 'parent.number'
+CODE = 42S22
# 10:56:47 >
# 10:56:47 > "Done."
diff --git a/sql/test/miscellaneous/Tests/groupby_expressions.stable.err
b/sql/test/miscellaneous/Tests/groupby_expressions.stable.err
--- a/sql/test/miscellaneous/Tests/groupby_expressions.stable.err
+++ b/sql/test/miscellaneous/Tests/groupby_expressions.stable.err
@@ -52,7 +52,7 @@ ERROR = !RANK: window function 'rank' no
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-20713/.s.monetdb.37878
QUERY = select cast("aa"+1 as bigint) from "groupings" group by "aa"+1 having
"bb"+1 > 2; --error
-ERROR = !SELECT: cannot use non GROUP BY column 'bb' in query results without
an aggregate function
+ERROR = !SELECT: cannot use non GROUP BY column in query results without an
aggregate function
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-25161/.s.monetdb.38103
QUERY = select cast("aa"+1 as bigint) from "groupings" group by "aa"+1 order
by "bb"+1; --error
diff --git a/sql/test/miscellaneous/Tests/groupby_expressions.stable.out
b/sql/test/miscellaneous/Tests/groupby_expressions.stable.out
--- a/sql/test/miscellaneous/Tests/groupby_expressions.stable.out
+++ b/sql/test/miscellaneous/Tests/groupby_expressions.stable.out
@@ -70,216 +70,216 @@ stdout of test 'groupby_expressions` in
#insert into "groupings" values (1, 1), (2, 2), (1, 3);
[ 3 ]
#select cast("aa"+1 as bigint) from "groupings" group by "aa"+1;
-% sys.L2 # table_name
-% L2 # name
+% sys.%2 # table_name
+% %2 # name
% bigint # type
% 1 # length
[ 2 ]
[ 3 ]
#select cast("aa"+1 as bigint) from "groupings" group by "aa"+1, "aa"+1;
-% sys.L3 # table_name
-% L3 # name
+% sys.%3 # table_name
+% %3 # name
% bigint # type
% 1 # length
[ 2 ]
[ 3 ]
#select cast(("aa"+1) + ("bb"+1) as bigint) from "groupings" group by "aa"+1,
"bb"+1;
-% sys.L3 # table_name
-% L3 # name
+% sys.%3 # table_name
+% %3 # name
% bigint # type
% 1 # length
[ 4 ]
[ 6 ]
[ 6 ]
#select cast(("aa"+1) + ("bb"+1) as bigint) from "groupings" group by ("aa"+1)
+ ("bb"+1);
-% sys.L2 # table_name
-% L2 # name
+% sys.%2 # table_name
+% %2 # name
% bigint # type
% 1 # length
[ 4 ]
[ 6 ]
#select cast(sum("aa"+1) as bigint) from "groupings" group by "aa"+1;
-% sys.L3 # table_name
-% L3 # name
+% sys.%3 # table_name
+% %3 # name
% bigint # type
% 1 # length
[ 4 ]
[ 3 ]
#select cast(sum(distinct "aa"+1) as bigint) from "groupings" group by "aa"+1;
-% sys.L3 # table_name
-% L3 # name
+% sys.%3 # table_name
+% %3 # name
% bigint # type
% 1 # length
[ 2 ]
[ 3 ]
#select cast(sum(("aa"+1) + ("bb"+2)) as bigint) from "groupings" group by
"aa"+1, "bb"+2;
-% sys.L4 # table_name
-% L4 # name
+% sys.%4 # table_name
+% %4 # name
% bigint # type
% 1 # length
[ 5 ]
[ 7 ]
[ 7 ]
#select cast(sum(("aa"+1) + ("bb"+2)) as bigint) from "groupings" group by
("aa"+1) + ("bb"+2);
-% sys.L3 # table_name
-% L3 # name
+% sys.%3 # table_name
+% %3 # name
% bigint # type
% 2 # length
[ 5 ]
[ 14 ]
#select cast("aa"+1 as bigint) from "groupings" group by "aa"+1 having "aa"+1
> 2;
-% sys.L2 # table_name
-% L2 # name
+% sys.%2 # table_name
+% %2 # name
% bigint # type
% 1 # length
[ 3 ]
#select cast("aa"+1 as bigint) from "groupings" group by "aa"+1 order by
"aa"+1;
-% sys.L2 # table_name
-% L2 # name
+% sys.%2 # table_name
+% %2 # name
% bigint # type
% 1 # length
[ 2 ]
[ 3 ]
#create function sumints(a int, b int) returns int begin return a + b; end;
#select count(*) from "groupings" group by sumints("aa","bb");
-% sys.L2 # table_name
-% L2 # name
+% sys.%2 # table_name
+% %2 # name
% bigint # type
% 1 # length
[ 1 ]
[ 2 ]
#select sumints("aa","bb") from "groupings" group by sumints("aa","bb");
-% sys.L1 # table_name
-% L1 # name
+% sys.%1 # table_name
+% %1 # name
% int # type
% 1 # length
[ 2 ]
[ 4 ]
#select cast(sumints("aa","bb")*sum("bb") as bigint) from "groupings" group by
sumints("aa","bb");
-% sys.L3 # table_name
-% L3 # name
+% sys.%3 # table_name
+% %3 # name
% bigint # type
% 2 # length
[ 2 ]
[ 20 ]
#select cast(sum("bb") as bigint) from "groupings" group by
sumints("aa","bb")*sumints("aa",19);
-% sys.L3 # table_name
-% L3 # name
+% sys.%3 # table_name
+% %3 # name
% bigint # type
% 1 # length
[ 1 ]
[ 2 ]
[ 3 ]
#select count("aa") from "groupings" group by "aa" > 1;
-% sys.L2 # table_name
-% L2 # name
+% sys.%2 # table_name
+% %2 # name
% bigint # type
% 1 # length
[ 2 ]
[ 1 ]
#select count(distinct "aa") from "groupings" group by "aa" > 1;
-% sys.L2 # table_name
-% L2 # name
+% sys.%2 # table_name
+% %2 # name
% bigint # type
% 1 # length
[ 1 ]
[ 1 ]
#select distinct count(distinct "aa") from "groupings" group by "aa" > 1;
-% sys.L2 # table_name
-% L2 # name
+% sys.%2 # table_name
+% %2 # name
% bigint # type
% 1 # length
[ 1 ]
#select "aa" > 1 from "groupings" group by "aa" > 1;
-% sys.L1 # table_name
-% L1 # name
+% sys.%1 # table_name
+% %1 # name
% boolean # type
% 5 # length
[ false ]
[ true ]
#select count(*) from "groupings" group by case when "aa" > 1 then "aa" else
"aa" + 10 end;
-% sys.L2 # table_name
-% L2 # name
+% sys.%2 # table_name
+% %2 # name
% bigint # type
% 1 # length
[ 2 ]
[ 1 ]
#select case when "aa" > 1 then "aa" else "aa" * 4 end from "groupings" group
by case when "aa" > 1 then "aa" else "aa" * 4 end;
-% sys.L1 # table_name
-% L1 # name
+% sys.%1 # table_name
+% %1 # name
% bigint # type
% 1 # length
[ 4 ]
[ 2 ]
#select cast(sum("aa"+"bb") as bigint) from "groupings" group by "aa"+"bb";
-% sys.L3 # table_name
-% L3 # name
+% sys.%3 # table_name
+% %3 # name
% bigint # type
% 1 # length
[ 2 ]
[ 8 ]
#select cast(sum(distinct "aa"+"bb") as bigint) from "groupings" group by
"aa"+"bb";
-% sys.L3 # table_name
-% L3 # name
+% sys.%3 # table_name
+% %3 # name
% bigint # type
% 1 # length
[ 2 ]
[ 4 ]
#select cast(sum("aa"+3452) as bigint) from "groupings" group by "aa"+"bb";
-% sys.L3 # table_name
-% L3 # name
+% sys.%3 # table_name
+% %3 # name
% bigint # type
% 4 # length
[ 3453 ]
[ 6907 ]
#select cast(sum(distinct "aa"+3452) as bigint) from "groupings" group by
"aa"+"bb";
-% sys.L3 # table_name
-% L3 # name
+% sys.%3 # table_name
+% %3 # name
% bigint # type
% 4 # length
[ 3453 ]
[ 6907 ]
#select count(*) from "groupings" having count("aa"-54) > 2;
-% .L1 # table_name
-% L1 # name
+% .%1 # table_name
+% %1 # name
% bigint # type
% 1 # length
[ 3 ]
#select count(*) from "groupings" order by count("bb"+1);
-% sys.L2 # table_name
-% L2 # name
+% sys.%1 # table_name
+% %1 # name
% bigint # type
% 1 # length
[ 3 ]
#select cast(sum("aa") as bigint), cast(sum("bb") as bigint), cast(sum("aa" +
"bb") as bigint) from "groupings" group by "aa", "bb", "aa" + "bb" having
sum("aa" + "bb") < 4;
-% sys.L3, sys.L5, sys.L7 # table_name
-% L3, L5, L7 # name
+% sys.%3, sys.%5, sys.%7 # table_name
+% %3, %5, %7 # name
% bigint, bigint, bigint # type
% 1, 1, 1 # length
[ 1, 1, 2 ]
#select count(*) from "groupings" order by rank() over ();
-% .L2 # table_name
-% L2 # name
+% .%1 # table_name
+% %1 # name
% bigint # type
% 1 # length
[ 3 ]
#select "aa" + "bb" from "groupings" order by case when "aa" > 1 then "aa"
else "aa" + 10 end;
-% sys.L1 # table_name
-% L1 # name
+% sys.%2 # table_name
+% %2 # name
% bigint # type
% 1 # length
[ 4 ]
[ 2 ]
[ 4 ]
#select cast(sum("aa") + sum("bb") as bigint) from "groupings" order by
sum("aa" + "bb");
-% sys.L4 # table_name
-% L4 # name
+% sys.%3 # table_name
+% %3 # name
% bigint # type
% 2 # length
[ 10 ]
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
