Changeset: 8c6bcde5014b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8c6bcde5014b
Modified Files:
        sql/test/BugTracker-2017/Tests/default-insert-update.Bug-6249.stable.err
        sql/test/BugTracker-2017/Tests/exist-bigint-missing.Bug-6315.stable.err
        sql/test/BugTracker-2017/Tests/nestedoperators.Bug-6292.stable.err
        sql/test/BugTracker-2017/Tests/push_subslice.Bug-6322.stable.err
Branch: malerrors
Log Message:

approved output


diffs (68 lines):

diff --git 
a/sql/test/BugTracker-2017/Tests/default-insert-update.Bug-6249.stable.err 
b/sql/test/BugTracker-2017/Tests/default-insert-update.Bug-6249.stable.err
--- a/sql/test/BugTracker-2017/Tests/default-insert-update.Bug-6249.stable.err
+++ b/sql/test/BugTracker-2017/Tests/default-insert-update.Bug-6249.stable.err
@@ -29,10 +29,10 @@ stderr of test 'default-insert-update.Bu
 
 MAPI  = (monetdb) /var/tmp/mtest-21586/.s.monetdb.39704
 QUERY = INSERT INTO test2 VALUES (1, 'a', DEFAULT, 'a'); --throw an error
-ERROR = !INSERT INTO: column 'c' has no valid default value
-MAPI  = (monetdb) /var/tmp/mtest-23398/.s.monetdb.31464
+ERROR = !ParseException:SQLparser:SQLSTATE 42000 !INSERT INTO: column 'c' has 
no valid default value
+MAPI  = (monetdb) /var/tmp/mtest-26073/.s.monetdb.33079
 QUERY = UPDATE test2 SET b = DEFAULT; --throw an error
-ERROR = !UPDATE: column 'b' has no valid default value
+ERROR = !ParseException:SQLparser:SQLSTATE 42000 !UPDATE: column 'b' has no 
valid default value
 
 
 # 11:11:43 >  
diff --git 
a/sql/test/BugTracker-2017/Tests/exist-bigint-missing.Bug-6315.stable.err 
b/sql/test/BugTracker-2017/Tests/exist-bigint-missing.Bug-6315.stable.err
--- a/sql/test/BugTracker-2017/Tests/exist-bigint-missing.Bug-6315.stable.err
+++ b/sql/test/BugTracker-2017/Tests/exist-bigint-missing.Bug-6315.stable.err
@@ -49,7 +49,7 @@ QUERY = insert into sys.privileges value
                 case when (select dependency_type_name from 
sys.dependency_types)
                        is not NULL then 7 else 7 end
                   );
-ERROR = !cardinality violation, scalar value expected
+ERROR = !SQLException:zero_or_one:SQLSTATE 21000 !Cardinality violation, 
scalar value expected
 
 # 16:32:28 >  
 # 16:32:28 >  "Done."
diff --git a/sql/test/BugTracker-2017/Tests/nestedoperators.Bug-6292.stable.err 
b/sql/test/BugTracker-2017/Tests/nestedoperators.Bug-6292.stable.err
--- a/sql/test/BugTracker-2017/Tests/nestedoperators.Bug-6292.stable.err
+++ b/sql/test/BugTracker-2017/Tests/nestedoperators.Bug-6292.stable.err
@@ -29,23 +29,6 @@ stderr of test 'nestedoperators.Bug-6292
 # 15:14:18 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-18530" "--port=30197"
 # 15:14:18 >  
 
-MAPI  = (monetdb) /var/tmp/mtest-26377/.s.monetdb.39857
-QUERY = CREATE FUNCTION rooms_derivative( stride bigint)
-        RETURNS TABLE( 
-            time timestamp,
-            room string,
-            level integer,
-            temp double)
-        BEGIN
-           RETURN
-                  WITH bounds(first, last, period) 
-                       AS (SELECT min(time) AS mintime, max(time) as maxtime, 
epoch(time)/60 AS period FROM rooms GROUP BY period) 
-                       SELECT r2.time, r2.room, r2.level, (r2.temp - r1.temp)/ 
(epoch(bounds.last) - epoch(bounds.first)) FROM bounds, rooms r1, rooms r2
-                  WHERE r1.time = bounds.first and r2.time = bounds.last and 
r1.room = r2.room and r1.level = r2.level;
-ERROR = !ParseException:SQLparser:SQLSTATE 42000 !SELECT: too many nested 
operators
-MAPI  = (monetdb) /var/tmp/mtest-26377/.s.monetdb.39857
-QUERY = DROP FUNCTION rooms_derivative;
-ERROR = !ParseException:SQLparser:SQLSTATE 42000 !DROP FUNCTION: no such 
function 'rooms_derivative'
 
 
 # 15:14:19 >  
diff --git a/sql/test/BugTracker-2017/Tests/push_subslice.Bug-6322.stable.err 
b/sql/test/BugTracker-2017/Tests/push_subslice.Bug-6322.stable.err
--- a/sql/test/BugTracker-2017/Tests/push_subslice.Bug-6322.stable.err
+++ b/sql/test/BugTracker-2017/Tests/push_subslice.Bug-6322.stable.err
@@ -38,7 +38,7 @@ QUERY = select
               from sys.spatial_ref_sys as sample_0
                       where sample_0.srtext is not NULL limit 95) as subq_0
         where cast(coalesce(17, subq_0.c1) as int) is not NULL;
-ERROR = !cardinality violation, scalar value expected
+ERROR = !SQLException:zero_or_one:SQLSTATE 21000 !Cardinality violation, 
scalar value expected
 
 # 14:35:34 >  
 # 14:35:34 >  "Done."
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to