MonetDB: SciQL-2 - teleios_noa_bsm: declared tables in functions...

[Stefan Manegold]

Changeset: ca856b5939cc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ca856b5939cc
Modified Files:
        sql/test/sciql/Tests/teleios_noa_bsm.sql
Branch: SciQL-2
Log Message:

teleios_noa_bsm: declared tables in functions do work, now.


diffs (45 lines):

diff --git a/sql/test/sciql/Tests/teleios_noa_bsm.sql 
b/sql/test/sciql/Tests/teleios_noa_bsm.sql
--- a/sql/test/sciql/Tests/teleios_noa_bsm.sql
+++ b/sql/test/sciql/Tests/teleios_noa_bsm.sql
@@ -47,12 +47,6 @@ SET size_y = (SELECT MAX(y) + 1 FROM rs.
 
 CREATE ARRAY fire (x INT DIMENSION[size_x], y INT DIMENSION[size_y], f INT);
 
----- These two tables SHOULD be DECLARED inside the function(s),
----- but that does not seem to work (correctly) yet !??
----- Hence, we create them globally, for now ...
-CREATE TABLE bridges (x INT, y INT, i INT, a INT);
-CREATE TABLE trans (i INT UNIQUE, a INT, x INT);
-
 
 -- BSM classification (landsatFirePredicate()) --
 
@@ -121,7 +115,7 @@ UPDATE fire SET f = x * size_y + y WHERE
 --CREATE FUNCTION clump_4connected()
 --RETURNS TABLE (i1 INT, i2 INT)
 --BEGIN
---  --DECLARE TABLE trans (i INT UNIQUE, a INT, x INT);
+--  DECLARE TABLE trans (i INT, a INT, x INT);
 --  DECLARE iter_0 INT, iter_1 INT;
 --  SET iter_0 = 0;
 --  SET iter_1 = 0;
@@ -182,7 +176,7 @@ UPDATE fire SET f = x * size_y + y WHERE
 CREATE FUNCTION clump_8connected()
 RETURNS TABLE (i1 INT, i2 INT)
 BEGIN
-  --DECLARE TABLE trans (i INT UNIQUE, a INT, x INT);
+  DECLARE TABLE trans (i INT, a INT, x INT);
   DECLARE iter_0 INT, iter_1 INT;
   SET iter_0 = 0;
   SET iter_1 = 0;
@@ -255,8 +249,8 @@ UPDATE fire SET f = NULL WHERE f IN (
 CREATE FUNCTION connect_neighbors()
 RETURNS TABLE (i1 INT, i2 INT)
 BEGIN
-  --DECLARE TABLE bridges (x INT, y INT, i INT, a INT);
-  --DECLARE TABLE trans (i INT UNIQUE, a INT, x INT);
+  DECLARE TABLE bridges (x INT, y INT, i INT, a INT);
+  DECLARE TABLE trans (i INT, a INT, x INT);
   DECLARE iter_0 INT, iter_1 INT;
   SET iter_0 = 0;
   SET iter_1 = 0;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list