Changeset: 3cf85b21a86b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3cf85b21a86b
Modified Files:
sql/test/sciql/Tests/ngram.sql
sql/test/sciql/Tests/sciql09.sql
sql/test/sciql/Tests/sciql16.sql
sql/test/sciql/Tests/sciql16.stable.err
sql/test/sciql/Tests/sciql17.sql
sql/test/sciql/Tests/sciql28.sql
sql/test/sciql/Tests/sciql29.sql
Branch: sciql
Log Message:
several small fixes in testing queries, fixed several FIXME notes.
other minor changes
diffs (78 lines):
diff --git a/sql/test/sciql/Tests/ngram.sql b/sql/test/sciql/Tests/ngram.sql
--- a/sql/test/sciql/Tests/ngram.sql
+++ b/sql/test/sciql/Tests/ngram.sql
@@ -2,5 +2,5 @@
-- it shows the use of expanded tiling
select v1,v2,v3,v4, count( *) from
- ( select img.v as (v1,v2,v3,v4) from img group by img[x:x:3][y]) as x
+ ( select img.v as (v1,v2,v3,v4) from img group by img[x:x+4][y]) as x
group by v1,v2,v3,v4;
diff --git a/sql/test/sciql/Tests/sciql09.sql b/sql/test/sciql/Tests/sciql09.sql
--- a/sql/test/sciql/Tests/sciql09.sql
+++ b/sql/test/sciql/Tests/sciql09.sql
@@ -1,8 +1,8 @@
--- FIXME: does this query update all 'v'-s in a row/column?
+-- FIXME: do these queries update all 'v'-s in a row/column?
UPDATE matrix SET matrix[0:2].v = v * 1.19;
--- FIXME: the query does not match its description in the paper, nl., the CASE
statement doesn't cover all value cases.
UPDATE matrix SET matrix[x].v = CASE
WHEN matrix[x].v < 0 THEN x
- WHEN matrix[x].v >10 THEN 10 * x END;
+ WHEN matrix[x].v >10 THEN 10 * x
+ ELSE 0 END;
diff --git a/sql/test/sciql/Tests/sciql16.sql b/sql/test/sciql/Tests/sciql16.sql
--- a/sql/test/sciql/Tests/sciql16.sql
+++ b/sql/test/sciql/Tests/sciql16.sql
@@ -1,2 +1,2 @@
--- FIXME: 'img' is not created before this first use
+CREATE ARRAY img (x int DIMENSION[0:1024:1], y int DIMENSION[0:1024:1], v
float);
ALTER ARRAY img ALTER x DIMENSION[-5:*];
diff --git a/sql/test/sciql/Tests/sciql16.stable.err
b/sql/test/sciql/Tests/sciql16.stable.err
--- a/sql/test/sciql/Tests/sciql16.stable.err
+++ b/sql/test/sciql/Tests/sciql16.stable.err
@@ -74,9 +74,6 @@
# 22:24:00 > mclient -lsql -ftest -i -e --host=eir --port=37193
# 22:24:00 >
-MAPI = monetdb@eir:37193
-QUERY = ALTER ARRAY img ALTER x DIMENSION[-5:*];
-ERROR = !ALTER TABLE: no such table 'img'
# 22:24:00 >
# 22:24:00 > Done.
diff --git a/sql/test/sciql/Tests/sciql17.sql b/sql/test/sciql/Tests/sciql17.sql
--- a/sql/test/sciql/Tests/sciql17.sql
+++ b/sql/test/sciql/Tests/sciql17.sql
@@ -1,7 +1,9 @@
+-- FIXME: 1) SQL:2003 doesn't allow such expression in de DEFAULT clause
+-- 2) 'r' should be declared as a dimension, and its [start:final:step]
+-- should be defined differently.
ALTER ARRAY matrix ADD r float DEFAULT sqrt( power(x,2) + power(y,2));
--- FIXME: 1) where does 'r' come from?
--- 2) in CASE: what is x = 0 and y <> 0?
+-- FIXME: in CASE: what is x = 0 and y <> 0?
ALTER ARRAY matrix ADD theta float
DEFAULT (CASE WHEN x=0 AND y=0 THEN 0
WHEN x> 0 THEN arcsin( CAST( x AS float) / r)
diff --git a/sql/test/sciql/Tests/sciql28.sql b/sql/test/sciql/Tests/sciql28.sql
--- a/sql/test/sciql/Tests/sciql28.sql
+++ b/sql/test/sciql/Tests/sciql28.sql
@@ -1,3 +1,5 @@
+CREATE TABLE events ( x int, y int);
+
CREATE ARRAY ximage ( x integer DIMENSION, y integer DIMENSION, v integer
DEFAULT 0);
INSERT INTO ximage SELECT [x], [y], count(*) FROM events GROUP BY x, y;
diff --git a/sql/test/sciql/Tests/sciql29.sql b/sql/test/sciql/Tests/sciql29.sql
--- a/sql/test/sciql/Tests/sciql29.sql
+++ b/sql/test/sciql/Tests/sciql29.sql
@@ -1,4 +1,4 @@
-CREATE ARRAY wcs_img (
+CREATE VIEW ARRAY wcs_img (
wcs_x FLOAT DIMENSION,
wcs_y FLOAT DIMENSION,
v INTEGER DEFAULT 0) AS
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
