Changeset: 8876f3abe70e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8876f3abe70e
Modified Files:
        sql/backends/monet5/generator/Tests/generator01.stable.err
        sql/backends/monet5/generator/Tests/generator03.stable.out
        sql/backends/monet5/generator/Tests/generator04.stable.err
Branch: generator
Log Message:

Accept new output


diffs (90 lines):

diff --git a/sql/backends/monet5/generator/Tests/generator01.stable.err 
b/sql/backends/monet5/generator/Tests/generator01.stable.err
--- a/sql/backends/monet5/generator/Tests/generator01.stable.err
+++ b/sql/backends/monet5/generator/Tests/generator01.stable.err
@@ -29,22 +29,23 @@ stderr of test 'generator01` in director
 # 12:42:21 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-23485" "--port=37579"
 # 12:42:21 >  
 
-MAPI  = (monetdb) /var/tmp/mtest-14690/.s.monetdb.36598
+MAPI  = (monetdb) /var/tmp/mtest-13429/.s.monetdb.33058
 QUERY = select * from generate_series(0,10,-2);
-ERROR = !Illegal generator arguments
-MAPI  = (monetdb) /var/tmp/mtest-14690/.s.monetdb.36598
+ERROR = !Illegal generator range
+MAPI  = (monetdb) /var/tmp/mtest-13429/.s.monetdb.33058
 QUERY = select * from generate_series(10,2,2);
-ERROR = !Illegal generator arguments
-MAPI  = (monetdb) /var/tmp/mtest-14690/.s.monetdb.36598
+ERROR = !Illegal generator range
+MAPI  = (monetdb) /var/tmp/mtest-13429/.s.monetdb.33058
 QUERY = select * from generate_series(0,10,0) ;
 ERROR = !zero step size not allowed
-MAPI  = (monetdb) /var/tmp/mtest-14690/.s.monetdb.36598
+MAPI  = (monetdb) /var/tmp/mtest-13429/.s.monetdb.33058
 QUERY = select * from generate_series(0,10,null) ;
 ERROR = !null step size not allowed
-MAPI  = (monetdb) /var/tmp/mtest-14690/.s.monetdb.36598
+MAPI  = (monetdb) /var/tmp/mtest-13429/.s.monetdb.33058
 QUERY = select * from generate_series(0,10,-2) as v
         where value <7 and value >3;
-ERROR = !Illegal generator arguments
+ERROR = !Illegal generator range
+
 
 # 12:42:21 >  
 # 12:42:21 >  "Done."
diff --git a/sql/backends/monet5/generator/Tests/generator03.stable.out 
b/sql/backends/monet5/generator/Tests/generator03.stable.out
--- a/sql/backends/monet5/generator/Tests/generator03.stable.out
+++ b/sql/backends/monet5/generator/Tests/generator03.stable.out
@@ -102,6 +102,20 @@ Ready.
 [ 2008-03-01 20:00:00.000000   ]
 [ 2008-03-02 06:00:00.000000   ]
 [ 2008-03-02 16:00:00.000000   ]
+#select * from generate_series(
+#      timestamp '2008-03-01 00:00',
+#      timestamp '2008-03-04 12:00',
+#      cast( '10' as interval hour))
+#where value > timestamp '2008-03-01 00:00'
+#and value < timestamp '2008-03-03 00:00' 
+#and value > timestamp '2008-03-01 11:00';
+% . # table_name
+% value # name
+% timestamp # type
+% 26 # length
+[ 2008-03-01 20:00:00.000000   ]
+[ 2008-03-02 06:00:00.000000   ]
+[ 2008-03-02 16:00:00.000000   ]
 
 # 09:47:33 >  
 # 09:47:33 >  "Done."
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-14305/.s.monetdb.36294
+MAPI  = (monetdb) /var/tmp/mtest-27050/.s.monetdb.39285
 QUERY = select * from generate_series('a','b','c');
-ERROR = !timestamp (b) has incorrect format
-MAPI  = (monetdb) /var/tmp/mtest-14305/.s.monetdb.36294
+ERROR = !timestamp (a) has incorrect format
+MAPI  = (monetdb) /var/tmp/mtest-27050/.s.monetdb.39285
 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-14305/.s.monetdb.36294
+MAPI  = (monetdb) /var/tmp/mtest-27050/.s.monetdb.39285
 QUERY = select * from generate_series(null,null,1);
-ERROR = !Illegal generator arguments
-MAPI  = (monetdb) /var/tmp/mtest-14305/.s.monetdb.36294
+ERROR = !Illegal generator range
+MAPI  = (monetdb) /var/tmp/mtest-27050/.s.monetdb.39285
 QUERY = select * from generate_series(10,null,1);
-ERROR = !Illegal generator arguments
-MAPI  = (monetdb) /var/tmp/mtest-14305/.s.monetdb.36294
+ERROR = !Illegal generator range
+MAPI  = (monetdb) /var/tmp/mtest-27050/.s.monetdb.39285
 QUERY = select * from generate_series(null,10,1);
 ERROR = !types tinyint(8,0) and timestamp(7,0) are not equal for column 'L2'
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to