Changeset: 9b13691eabb1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9b13691eabb1
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/test/BugTracker-2017/Tests/heapextend.Bug-6134.sql.in
sql/test/BugTracker-2017/Tests/heapextend.Bug-6134.stable.out
Branch: default
Log Message:
Merge with Nov2019
diffs (67 lines):
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -2286,6 +2286,10 @@ sql_update_nov2019(Client c, mvc *sql, c
"GRANT EXECUTE ON AGGREGATE quantile(INTERVAL MONTH,
DOUBLE) TO PUBLIC;\n"
);
+ pos += snprintf(buf + pos, bufsize - pos,
+ "update sys.functions set system = true where schema_id
= (select id from sys.schemas where name = 'sys')"
+ " and name in ('stddev_samp', 'stddev_pop', 'var_samp',
'var_pop', 'median', 'quantile') and type = %d;\n", (int) F_AGGR);
+
/* The MAL implementation of functions json.text(string) and
json.text(int) do not exist */
pos += snprintf(buf + pos, bufsize - pos,
"drop function json.text(string);\n"
diff --git a/sql/test/BugTracker-2017/Tests/heapextend.Bug-6134.sql.in
b/sql/test/BugTracker-2017/Tests/heapextend.Bug-6134.sql.in
--- a/sql/test/BugTracker-2017/Tests/heapextend.Bug-6134.sql.in
+++ b/sql/test/BugTracker-2017/Tests/heapextend.Bug-6134.sql.in
@@ -1457,7 +1457,7 @@ COPY 56 RECORDS INTO segment4 FROM STDIN
"74406"|"74406"
"74404"|"74404"
-COPY INTO all_dates FROM E'$QTSTSRCDIR/all_dates.csv.gz' DELIMITERS '|' ,
E'\n', '"';
+COPY 49998 RECORDS INTO all_dates FROM E'$QTSTSRCDIR/all_dates.csv.gz'
DELIMITERS '|' , E'\n', '"';
-- this works
SELECT loc.code
@@ -1490,9 +1490,9 @@ SELECT loc.code
AND f.book_code = 'G2FIN'
AND ( cat.subcategory_code = 200 OR cat.subcategory_code = 301 OR
cat.subcategory_code >= 221 )
AND ( cat.subcategory_code = 200 OR cat.subcategory_code = 301 OR
cat.subcategory_code <= 290 )
- AND d.month_code BETWEEN '2016.01' AND '2016.10';
+ AND d.month_code BETWEEN '2016.01' AND '2016.10'
+ ORDER BY d.d_date;
-
SELECT loc.code
,cat.subcategory_code
,cat.category_code
@@ -1524,7 +1524,8 @@ SELECT loc.code
AND ( cat.subcategory_code = 200 OR cat.subcategory_code = 301 OR
cat.subcategory_code >= 221 )
AND ( cat.subcategory_code = 200 OR cat.subcategory_code = 301 OR
cat.subcategory_code <= 290 )
AND ( s1.code = '03' OR cat.subcategory_code = 25 )
- AND d.month_code BETWEEN '2016.01' AND '2016.10';
+ AND d.month_code BETWEEN '2016.01' AND '2016.10'
+ ORDER BY d.d_date;
SELECT 1 FROM location loc,segment1 s1,fact f WHERE s1.id = f.s1_id AND loc.id
= f.location_id;
diff --git a/sql/test/BugTracker-2017/Tests/heapextend.Bug-6134.stable.out
b/sql/test/BugTracker-2017/Tests/heapextend.Bug-6134.stable.out
--- a/sql/test/BugTracker-2017/Tests/heapextend.Bug-6134.stable.out
+++ b/sql/test/BugTracker-2017/Tests/heapextend.Bug-6134.stable.out
@@ -284,6 +284,7 @@ stdout of test 'heapextend.Bug-6134` in
% code, subcategory_code, category_code, code, code, code,
code, d_date, month_code # name
% varchar, varchar, varchar, varchar, varchar,
varchar, varchar, date, varchar # type
% 5, 3, 2, 2, 4, 4, 5, 10, 7 # length
+[ "(n/z)", "301", "30", "10", "1300", "7422", "00000",
2016-01-16, "2016.01" ]
[ "(n/z)", "301", "30", "10", "1300", "7422", "00000",
2016-02-16, "2016.02" ]
[ "(n/z)", "301", "30", "10", "1300", "7422", "00000",
2016-03-16, "2016.03" ]
[ "(n/z)", "301", "30", "10", "1300", "7422", "00000",
2016-04-16, "2016.04" ]
@@ -293,7 +294,6 @@ stdout of test 'heapextend.Bug-6134` in
[ "(n/z)", "301", "30", "10", "1300", "7422", "00000",
2016-08-16, "2016.08" ]
[ "(n/z)", "301", "30", "10", "1300", "7422", "00000",
2016-09-16, "2016.09" ]
[ "(n/z)", "301", "30", "10", "1300", "7422", "00000",
2016-10-16, "2016.10" ]
-[ "(n/z)", "301", "30", "10", "1300", "7422", "00000",
2016-01-16, "2016.01" ]
#SELECT loc.code
# ,cat.subcategory_code
# ,cat.category_code
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
