Changeset: 76ec5eab83ea for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=76ec5eab83ea
Modified Files:
sql/backends/monet5/generator/Tests/generator00.sql
sql/backends/monet5/generator/Tests/generator00.stable.out
sql/backends/monet5/generator/Tests/generator04.sql
sql/backends/monet5/generator/Tests/generator04.stable.err
sql/backends/monet5/generator/Tests/joins00.sql
sql/backends/monet5/generator/Tests/joins00.stable.out
Branch: generator
Log Message:
Approve (expected) output
diffs (132 lines):
diff --git a/sql/backends/monet5/generator/Tests/generator00.sql
b/sql/backends/monet5/generator/Tests/generator00.sql
--- a/sql/backends/monet5/generator/Tests/generator00.sql
+++ b/sql/backends/monet5/generator/Tests/generator00.sql
@@ -15,3 +15,5 @@ select * from generate_series(10,0,-2) a
select * from generate_series(10,0,-2) as v where value <7 and value >3 and
value <=6 and value >=4;
select * from generate_series(-2,8,2);
+
+select * from generate_series(0,0,2);
diff --git a/sql/backends/monet5/generator/Tests/generator00.stable.out
b/sql/backends/monet5/generator/Tests/generator00.stable.out
--- a/sql/backends/monet5/generator/Tests/generator00.stable.out
+++ b/sql/backends/monet5/generator/Tests/generator00.stable.out
@@ -129,6 +129,11 @@ Ready.
[ 2 ]
[ 4 ]
[ 6 ]
+#select * from generate_series(0,0,2);
+% . # table_name
+% value # name
+% tinyint # type
+% 1 # length
# 18:09:07 >
# 18:09:07 > "Done."
diff --git a/sql/backends/monet5/generator/Tests/generator04.sql
b/sql/backends/monet5/generator/Tests/generator04.sql
--- a/sql/backends/monet5/generator/Tests/generator04.sql
+++ b/sql/backends/monet5/generator/Tests/generator04.sql
@@ -1,5 +1,5 @@
-- some unit tests
-select * from generate_series('a','b','c');
+select * from generate_series('a','a','c');
select * from generate_series(false,true,false) ;
diff --git a/sql/backends/monet5/generator/Tests/generator04.stable.err
b/sql/backends/monet5/generator/Tests/generator04.stable.err
--- a/sql/backends/monet5/generator/Tests/generator04.stable.err
+++ b/sql/backends/monet5/generator/Tests/generator04.stable.err
@@ -29,19 +29,19 @@ stderr of test 'generator04` in director
# 21:38:52 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-14305" "--port=36294"
# 21:38:52 >
-MAPI = (monetdb) /var/tmp/mtest-27050/.s.monetdb.39285
-QUERY = select * from generate_series('a','b','c');
+MAPI = (monetdb) /var/tmp/mtest-20193/.s.monetdb.34458
+QUERY = select * from generate_series('a','a','c');
ERROR = !timestamp (a) has incorrect format
-MAPI = (monetdb) /var/tmp/mtest-27050/.s.monetdb.39285
+MAPI = (monetdb) /var/tmp/mtest-20193/.s.monetdb.34458
QUERY = select * from generate_series(false,true,false) ;
ERROR = !types boolean(1,0) and timestamp(7,0) are not equal for column 'L1'
-MAPI = (monetdb) /var/tmp/mtest-27050/.s.monetdb.39285
+MAPI = (monetdb) /var/tmp/mtest-20193/.s.monetdb.34458
QUERY = select * from generate_series(null,null,1);
ERROR = !Illegal generator range
-MAPI = (monetdb) /var/tmp/mtest-27050/.s.monetdb.39285
+MAPI = (monetdb) /var/tmp/mtest-20193/.s.monetdb.34458
QUERY = select * from generate_series(10,null,1);
ERROR = !Illegal generator range
-MAPI = (monetdb) /var/tmp/mtest-27050/.s.monetdb.39285
+MAPI = (monetdb) /var/tmp/mtest-20193/.s.monetdb.34458
QUERY = select * from generate_series(null,10,1);
ERROR = !types tinyint(8,0) and timestamp(7,0) are not equal for column 'L2'
diff --git a/sql/backends/monet5/generator/Tests/joins00.sql
b/sql/backends/monet5/generator/Tests/joins00.sql
--- a/sql/backends/monet5/generator/Tests/joins00.sql
+++ b/sql/backends/monet5/generator/Tests/joins00.sql
@@ -29,3 +29,17 @@ select * from generate_series(0,10,2) as
select * from generate_series(0,10,2) as X, tmp2 Y where Y.i = X.value and
value <12 and value >3;
drop table tmp2;
+
+-- negative range
+create table tmp(i tinyint);
+insert into tmp values(3),(4),(5);
+select * from tmp;
+
+select * from generate_series(9,0,-2) X, tmp Y where X.value = Y.i;
+select * from generate_series(9,0,-2) X, tmp Y where Y.i = X.value;
+
+select * from generate_series(9,0,-2) X, tmp Y where X.value = Y.i and value
<5;
+
+select * from generate_series(9,0,-2) as X, tmp Y where X.value = Y.i and
value <7 and value >3;
+
+drop table tmp;
diff --git a/sql/backends/monet5/generator/Tests/joins00.stable.out
b/sql/backends/monet5/generator/Tests/joins00.stable.out
--- a/sql/backends/monet5/generator/Tests/joins00.stable.out
+++ b/sql/backends/monet5/generator/Tests/joins00.stable.out
@@ -110,6 +110,44 @@ Ready.
% 1, 1 # length
[ 8, 8 ]
#drop table tmp2;
+#create table tmp(i tinyint);
+#insert into tmp values(3),(4),(5);
+[ 3 ]
+#select * from tmp;
+% sys.tmp # table_name
+% i # name
+% tinyint # type
+% 1 # length
+[ 3 ]
+[ 4 ]
+[ 5 ]
+#select * from generate_series(9,0,-2) X, tmp Y where X.value = Y.i;
+% .x, sys.y # table_name
+% value, i # name
+% tinyint, tinyint # type
+% 1, 1 # length
+[ 3, 3 ]
+[ 5, 5 ]
+#select * from generate_series(9,0,-2) X, tmp Y where Y.i = X.value;
+% .x, sys.y # table_name
+% value, i # name
+% tinyint, tinyint # type
+% 1, 1 # length
+[ 3, 3 ]
+[ 5, 5 ]
+#select * from generate_series(9,0,-2) X, tmp Y where X.value = Y.i and value
<5;
+% .x, sys.y # table_name
+% value, i # name
+% tinyint, tinyint # type
+% 1, 1 # length
+[ 3, 3 ]
+#select * from generate_series(9,0,-2) as X, tmp Y where X.value = Y.i and
value <7 and value >3;
+% .x, sys.y # table_name
+% value, i # name
+% tinyint, tinyint # type
+% 1, 1 # length
+[ 5, 5 ]
+#drop table tmp;
# 14:48:53 >
# 14:48:53 > "Done."
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
