MonetDB: trails - Always use a consistent return

[Martin Kersten]

Changeset: b8a2059e25fd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b8a2059e25fd
Added Files:
        monetdb5/optimizer/Tests/factory06.malC
Removed Files:
        monetdb5/optimizer/Tests/factory01.malC
Modified Files:
        sql/backends/monet5/Tests/factory10.sql
        sql/backends/monet5/Tests/factory13.sql
        sql/backends/monet5/Tests/factory14.sql
Branch: trails
Log Message:

Always use a consistent return


diffs (62 lines):

diff --git a/monetdb5/optimizer/Tests/factory01.malC 
b/monetdb5/optimizer/Tests/factory06.malC
rename from monetdb5/optimizer/Tests/factory01.malC
rename to monetdb5/optimizer/Tests/factory06.malC
--- a/monetdb5/optimizer/Tests/factory01.malC
+++ b/monetdb5/optimizer/Tests/factory06.malC
@@ -1,3 +1,4 @@
+# The support function for SQL factory test 06
 factory user.factory06(Aparam:int):int;
     X_3 := Aparam;
     yield factory06:int := X_3;
@@ -47,5 +48,6 @@ k:= factory06a(1);
 io.print(k);
 
 mdb.List("user","factory06");
+mdb.var("user","factory06");
 optimizer.aliases("user","factory06");
 mdb.List("user","factory06");
diff --git a/sql/backends/monet5/Tests/factory10.sql 
b/sql/backends/monet5/Tests/factory10.sql
--- a/sql/backends/monet5/Tests/factory10.sql
+++ b/sql/backends/monet5/Tests/factory10.sql
@@ -19,6 +19,7 @@ CREATE FUNCTION factory10() RETURNS TABL
         END IF;
         SET pointer = pointer + 1;
     END WHILE;
+       RETURN (SELECT MIN(aa), MAX(dd) FROM myTable10);
 END;
 
 SELECT aa, dd FROM factory10();
diff --git a/sql/backends/monet5/Tests/factory13.sql 
b/sql/backends/monet5/Tests/factory13.sql
--- a/sql/backends/monet5/Tests/factory13.sql
+++ b/sql/backends/monet5/Tests/factory13.sql
@@ -5,6 +5,7 @@ CREATE FUNCTION factory13() RETURNS TABL
     WHILE TRUE DO
         YIELD TABLE (SELECT aa, bb, cc FROM myTable13);
     END WHILE;
+       RETURN TABLE (SELECT aa, bb, cc FROM myTable13);
 END;
 
 INSERT INTO myTable13 VALUES (1, cast('08:00:00' AS TIME), '1234');
diff --git a/sql/backends/monet5/Tests/factory14.sql 
b/sql/backends/monet5/Tests/factory14.sql
--- a/sql/backends/monet5/Tests/factory14.sql
+++ b/sql/backends/monet5/Tests/factory14.sql
@@ -1,4 +1,4 @@
---Update the arguments durinf
+--Update the arguments during
 CREATE FUNCTION factory14(aa INT, bb CLOB) RETURNS TABLE (aa INT, bb CLOB) 
BEGIN
     YIELD TABLE (SELECT aa, bb);
     SET aa = aa + 1;
@@ -13,9 +13,9 @@ CREATE FUNCTION factory14(aa INT, bb CLO
 END;
 
 SELECT aa, bb FROM factory14(0, '');
-SELECT aa, bb FROM factory14(0, '');
-SELECT aa, bb FROM factory14(0, '');
-SELECT aa, bb FROM factory14(0, '');
-SELECT aa, bb FROM factory14(0, ''); --error
+SELECT aa, bb FROM factory14(1, 'first');
+SELECT aa, bb FROM factory14(2, 'second');
+SELECT aa, bb FROM factory14(3, 'third');
+SELECT aa, bb FROM factory14(4, 'fourth'); --error
 
 DROP FUNCTION factory14;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list