MonetDB: sciql - Killed several more small errors

[Jennie Zhang]

Changeset: aaddd77410d1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aaddd77410d1
Modified Files:
        sql/test/sciql/Tests/sci02.sql
        sql/test/sciql/Tests/sci04.sql
        sql/test/sciql/Tests/sci06.sql
        sql/test/sciql/Tests/sci10.sql
        sql/test/sciql/Tests/sci12.sql
Branch: sciql
Log Message:

Killed several more small errors


diffs (59 lines):

diff --git a/sql/test/sciql/Tests/sci02.sql b/sql/test/sciql/Tests/sci02.sql
--- a/sql/test/sciql/Tests/sci02.sql
+++ b/sql/test/sciql/Tests/sci02.sql
@@ -1,3 +1,8 @@
 CREATE TABLE experiment( 
        run date DIMENSION[  TIMESTAMP '2010-01-01':*: INTERVAL'1' day], 
        payload float ARRAY[4][4] DEFAULT 0.0 );
+
+CREATE ARRAY timeseries (
+    tick TIMESTAMP DIMENSION,
+    payload FLOAT DEFAULT 0.0 );
+
diff --git a/sql/test/sciql/Tests/sci04.sql b/sql/test/sciql/Tests/sci04.sql
--- a/sql/test/sciql/Tests/sci04.sql
+++ b/sql/test/sciql/Tests/sci04.sql
@@ -3,4 +3,4 @@
 DELETE FROM matrix WHERE x = 2;
 INSERT INTO matrix SELECT x-1, y, v FROM matrix WHERE x > 2;
 INSERT INTO matrix SELECT x, y, 0 FROM matrix WHERE x = 3;
-INSERT INTO matrix(v) SELECT v FROM stipes;
+INSERT INTO matrix(v) SELECT v FROM stripes;
diff --git a/sql/test/sciql/Tests/sci06.sql b/sql/test/sciql/Tests/sci06.sql
--- a/sql/test/sciql/Tests/sci06.sql
+++ b/sql/test/sciql/Tests/sci06.sql
@@ -1,4 +1,6 @@
 SELECT x, y, v FROM matrix WHERE v >2; 
 SELECT x, y, v FROM stripes WHERE v >2; 
 SELECT [x], [y], v FROM matrix WHERE v >2; 
+
+CREATE TABLE T (i int, k int);
 SELECT [T.k], [y], v FROM matrix JOIN T ON matrix.x = T.i;
diff --git a/sql/test/sciql/Tests/sci10.sql b/sql/test/sciql/Tests/sci10.sql
--- a/sql/test/sciql/Tests/sci10.sql
+++ b/sql/test/sciql/Tests/sci10.sql
@@ -1,13 +1,13 @@
 CREATE ARRAY vmatrix (
   x INTEGER DIMENSION[-1:4],
   y INTEGER DIMENSION[-1:4],
-  w FLOAT DEFAULT 0);AS SELECT y, x, v FROM matrix; 
+  w FLOAT DEFAULT 0) AS SELECT y, x, v FROM matrix; 
 
 CREATE ARRAY vector (
   x INTEGER DIMENSION[-1:4],
   w FLOAT DEFAULT 0);
-SELECT (A.v+B.v)/2 FROM vector A, 
-  (SELECT x+1, w FROM vector) B;
+SELECT (A.v+B.v)/2 FROM vector AS A JOIN
+  (SELECT x+1 AS x, w FROM vector) AS B ON A.x = B.x;
 
 CREATE ARRAY vmatrix (  x INTEGER DIMENSION[-1:4], 
   y INTEGER DIMENSION[-1:4],
diff --git a/sql/test/sciql/Tests/sci12.sql b/sql/test/sciql/Tests/sci12.sql
--- a/sql/test/sciql/Tests/sci12.sql
+++ b/sql/test/sciql/Tests/sci12.sql
@@ -1,3 +1,3 @@
 SELECT [x], [y], avg(v) FROM matrix GROUP BY matrix[x:x+2][y:y+2];
 SELECT [x], [y], avg(v) FROM matrix GROUP BY DISTINCT matrix[x:x+2][y:y+2];
-SELECT [x], [y], avg(v) FROM vmatrix GROUP BY matrix[x-1:x+1][y-1:y+1];
+SELECT [x], [y], avg(v) FROM matrix GROUP BY matrix[x-1:x+1][y-1:y+1];
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list