Changeset: b6c462f2f6df for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b6c462f2f6df
Added Files:
sql/test/BugTracker-2016/Tests/min-max-uuid-column-wrong-results.Bug-3953.sql
Removed Files:
sql/test/BugTracker-2016/Tests/data-uuid.csv.bz2
sql/test/BugTracker-2016/Tests/min-max-uuid-column-wrong-results.Bug-3953.sql.in
Modified Files:
sql/test/BugTracker-2016/Tests/All
sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.sql
sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.stable.out
Branch: Jul2017
Log Message:
Sorry again for the merge
diffs (89 lines):
diff --git a/sql/test/BugTracker-2016/Tests/All
b/sql/test/BugTracker-2016/Tests/All
--- a/sql/test/BugTracker-2016/Tests/All
+++ b/sql/test/BugTracker-2016/Tests/All
@@ -19,7 +19,7 @@ catalog_name_qualifier.Bug-3948
stream_table_crash.Bug-3952
null_in_null.Bug-3900
rank_rewrite.Bug-3890
-HAVE_LIBBZ2?min-max-uuid-column-wrong-results.Bug-3953
+min-max-uuid-column-wrong-results.Bug-3953
update_crash.Bug-3954
group_distinct_quantile.Bug-3927
HAVE_GEOM?merge_project.Bug-3955
diff --git a/sql/test/BugTracker-2016/Tests/data-uuid.csv.bz2
b/sql/test/BugTracker-2016/Tests/data-uuid.csv.bz2
deleted file mode 100644
index
90b03b56a0ff24e708d77fbeadc169f998762bfc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
diff --git
a/sql/test/BugTracker-2016/Tests/min-max-uuid-column-wrong-results.Bug-3953.sql.in
b/sql/test/BugTracker-2016/Tests/min-max-uuid-column-wrong-results.Bug-3953.sql
rename from
sql/test/BugTracker-2016/Tests/min-max-uuid-column-wrong-results.Bug-3953.sql.in
rename to
sql/test/BugTracker-2016/Tests/min-max-uuid-column-wrong-results.Bug-3953.sql
---
a/sql/test/BugTracker-2016/Tests/min-max-uuid-column-wrong-results.Bug-3953.sql.in
+++
b/sql/test/BugTracker-2016/Tests/min-max-uuid-column-wrong-results.Bug-3953.sql
@@ -1,5 +1,5 @@
CREATE TABLE test (c UUID);
-COPY 200000 RECORDS INTO test FROM '$QTSTSRCDIR/data-uuid.csv.bz2' DELIMITERS
',';
+INSERT INTO test (SELECT CAST('1e1a9c62-d656-11e5-9fd7-9b884ad020cd' AS UUID)
FROM generate_series(CAST(0 AS INTEGER), 200000, 1));
SELECT MIN(c) AS mn, MAX(c) AS mx FROM test;
SELECT MIN(c) AS mn, MAX(c) AS mx FROM test;
SELECT MIN(c) AS mn, MAX(c) AS mx FROM test;
diff --git a/sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.sql
b/sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.sql
--- a/sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.sql
+++ b/sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.sql
@@ -1,3 +1,3 @@
-select name,name from sys.functions group by name limit 2;
-select name, name from sys.functions group by name,name limit 2;
-select f.name, f.name from sys.functions AS f group by name,name limit 2;
+select privilege_code_name,privilege_code_name from sys.privilege_codes group
by privilege_code_name limit 2;
+select privilege_code_name, privilege_code_name from sys.privilege_codes group
by privilege_code_name,privilege_code_name limit 2;
+select f.privilege_code_name, f.privilege_code_name from sys.privilege_codes
AS f group by privilege_code_name,privilege_code_name limit 2;
diff --git
a/sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.stable.out
b/sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.stable.out
--- a/sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.stable.out
+++ b/sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.stable.out
@@ -24,27 +24,27 @@ Ready.
# 08:52:53 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-4722" "--port=34679"
# 08:52:53 >
-#select name,name from sys.functions group by name limit 2;
-% sys.functions, sys.functions # table_name
-% name, name # name
+#select privilege_code_name,privilege_code_name from sys.privilege_codes group
by privilege_code_name limit 2;
+% sys.privilege_codes, sys.privilege_codes # table_name
+% privilege_code_name, privilege_code_name # name
% varchar, varchar # type
-% 11, 11 # length
-[ "mbr_overlap", "mbr_overlap" ]
-[ "mbr_above", "mbr_above" ]
-#select name, name from sys.functions group by name,name limit 2;
-% sys.functions, sys.functions # table_name
-% name, name # name
+% 6, 6 # length
+[ "SELECT", "SELECT" ]
+[ "UPDATE", "UPDATE" ]
+#select privilege_code_name, privilege_code_name from sys.privilege_codes
group by privilege_code_name,privilege_code_name limit 2;
+% sys.privilege_codes, sys.privilege_codes # table_name
+% privilege_code_name, privilege_code_name # name
% varchar, varchar # type
-% 11, 11 # length
-[ "mbr_overlap", "mbr_overlap" ]
-[ "mbr_above", "mbr_above" ]
-#select f.name, f.name from sys.functions AS f group by name,name limit 2;
+% 6, 6 # length
+[ "SELECT", "SELECT" ]
+[ "UPDATE", "UPDATE" ]
+#select f.privilege_code_name, f.privilege_code_name from sys.privilege_codes
AS f group by privilege_code_name,privilege_code_name limit 2;
% sys.f, sys.f # table_name
-% name, name # name
+% privilege_code_name, privilege_code_name # name
% varchar, varchar # type
-% 11, 11 # length
-[ "mbr_overlap", "mbr_overlap" ]
-[ "mbr_above", "mbr_above" ]
+% 6, 6 # length
+[ "SELECT", "SELECT" ]
+[ "UPDATE", "UPDATE" ]
# 08:52:53 >
# 08:52:53 > "Done."
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
