Changeset: 9533467b9b92 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9533467b9b92
Modified Files:
Branch: sciql
Log Message:
merge
diffs (24 lines):
diff --git a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
--- a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
+++ b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
@@ -86,7 +86,7 @@ mTests_jdbc_tests tmp idxs SYSTEM TABLE
mTests_jdbc_tests tmp keys SYSTEM TABLE null null null
null rowid SYSTEM
mTests_jdbc_tests tmp objects SYSTEM TABLE null null null
null rowid SYSTEM
mTests_jdbc_tests tmp triggers SYSTEM TABLE null null
null null rowid SYSTEM
-mTests_jdbc_tests sys arrays SYSTEM VIEW SELECT * FROM (SELECT
p.*, 0 AS "temporary" FROM "sys"."_tables" AS p WHERE type = 6 UNION ALL SELECT
t.*, 1 AS "temporary" FROM "tmp"."_tables" AS t WHERE type = 6) AS arrays;
null null null rowid SYSTEM
+mTests_jdbc_tests sys arrays SYSTEM VIEW SELECT * FROM (SELECT
p.*, 0 AS "temporary" FROM "sys"."_tables" AS p WHERE nr_dimensions > 0 UNION
ALL SELECT t.*, 1 AS "temporary" FROM "tmp"."_tables" AS t WHERE nr_dimensions
> 0) AS arrays; null null null rowid SYSTEM
mTests_jdbc_tests sys columns SYSTEM VIEW SELECT * FROM (SELECT
p.* FROM "sys"."_columns" AS p UNION ALL SELECT t.* FROM "tmp"."_columns" AS t)
AS columns; null null null rowid SYSTEM
mTests_jdbc_tests sys dimensions SYSTEM VIEW SELECT * FROM
(SELECT pc.*, "pd"."start", pd.step, pd.stop FROM "sys"."_columns" AS pc,
"sys"."_dimensions" AS pd WHERE pc.id = pd.column_id UNION ALL SELECT tc.*,
"td"."start", td.step, td.stop FROM "tmp"."_columns" AS tc, "tmp"."_dimensions"
AS td WHERE tc.id = td.column_id) AS dimensions; null null null
rowid SYSTEM
mTests_jdbc_tests sys querylog SYSTEM VIEW create view
querylog as
diff --git a/sql/test/LSST/Tests/dbQuery036.stable.err
b/sql/test/LSST/Tests/dbQuery036.stable.err
--- a/sql/test/LSST/Tests/dbQuery036.stable.err
+++ b/sql/test/LSST/Tests/dbQuery036.stable.err
@@ -86,7 +86,7 @@ QUERY = SELECT ROUND(uMag-gMag,0) AS UG
AND (uMag+gMag+rMag+iMag+zMag+yMag) < 150 -- exclude bogus
magnitudes (== 999)
GROUP BY UG, GR, RI, IZ, ZY
HAVING pop > 500 -- Common bucktes have 500 or more members, so
delete them
-ERROR = !COUNT: 'count(*)' not implemented for array tiles
+ERROR = !SELECT: identifier 'pop' unknown
# 05:57:35 >
# 05:57:35 > Done.
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
