Changeset: 77a779b72d25 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=77a779b72d25
Modified Files:
sql/backends/monet5/Tests/pyapi10.stable.err
sql/backends/monet5/Tests/pyapi10.stable.out
sql/backends/monet5/Tests/pyapi25.stable.err
sql/backends/monet5/Tests/pyapi25.stable.out
Branch: Dec2016
Log Message:
Approve new tests.
diffs (139 lines):
diff --git a/sql/backends/monet5/Tests/pyapi10.stable.err
b/sql/backends/monet5/Tests/pyapi10.stable.err
--- a/sql/backends/monet5/Tests/pyapi10.stable.err
+++ b/sql/backends/monet5/Tests/pyapi10.stable.err
@@ -33,7 +33,7 @@ stderr of test 'pyapi10` in directory 's
MAPI = (monetdb) /var/tmp/mtest-30156/.s.monetdb.35525
QUERY = SELECT AVG(pyapi10_error(i,j)) FROM pyapi10_random_table_nulls(5000);
-ERROR = !MALException:pyapi.eval:Could not parse Python code
+ERROR = !Could not parse Python code
!
! 1. def pyfun(i,j,_columns,_column_types,_conn):
!> 2. return(i*j
@@ -41,7 +41,7 @@ ERROR = !MALException:pyapi.eval:Could n
!invalid syntax (<string>, line 2)
MAPI = (monetdb) /var/tmp/mtest-30156/.s.monetdb.35525
QUERY = SELECT AVG(pyapi10_indentation_error(i,j)) FROM
pyapi10_random_table_nulls(5000);
-ERROR = !MALException:pyapi.eval:Could not parse Python code
+ERROR = !Could not parse Python code
! 7. f = 6
! 8. g = 7
!> 9. h = 8
@@ -50,7 +50,7 @@ ERROR = !MALException:pyapi.eval:Could n
!unexpected indent (<string>, line 9)
MAPI = (monetdb) /var/tmp/mtest-30156/.s.monetdb.35525
QUERY = SELECT AVG(pyapi10_runtime_exception(i,j)) FROM
pyapi10_random_table_nulls(5000);
-ERROR = !MALException:pyapi.eval:Python exception
+ERROR = !Python exception
! 4. mydivision = 0
! 5. # comments
!> 6. hello = myint / mydivision
diff --git a/sql/backends/monet5/Tests/pyapi10.stable.out
b/sql/backends/monet5/Tests/pyapi10.stable.out
--- a/sql/backends/monet5/Tests/pyapi10.stable.out
+++ b/sql/backends/monet5/Tests/pyapi10.stable.out
@@ -65,14 +65,14 @@ Ready.
# return(i*j
#};
#SELECT AVG(pyapi10_mult(i,j)) FROM pyapi10_random_table(5000);
-% .L3 # table_name
-% L2 # name
+% .L6 # table_name
+% L5 # name
% double # type
% 24 # length
[ 2487.9556 ]
#SELECT AVG(pyapi10_mult(i,j)) FROM pyapi10_random_table_nulls(5000);
-% .L3 # table_name
-% L2 # name
+% .L6 # table_name
+% L5 # name
% double # type
% 24 # length
[ 5603.14638 ]
diff --git a/sql/backends/monet5/Tests/pyapi25.stable.err
b/sql/backends/monet5/Tests/pyapi25.stable.err
--- a/sql/backends/monet5/Tests/pyapi25.stable.err
+++ b/sql/backends/monet5/Tests/pyapi25.stable.err
@@ -34,7 +34,13 @@ stderr of test 'pyapi25` in directory 's
MAPI = (monetdb) /var/tmp/mtest-14818/.s.monetdb.37353
QUERY = SELECT * FROM pyapi25errortable();
ERROR = !SELECT: no such table 'hopefullynonexistanttable'
- !SELECT: no such table 'hopefullynonexistanttable'
+ !Python exception
+ !
+ ! 1. def pyfun(_columns,_column_types,_conn):
+ !> 2. _conn.execute('SELECT * FROM HOPEFULLYNONEXISTANTTABLE;')
+ ! 3. return 1
+ ! 4.
+ !SQL Query Failed: ParseException:SQLparser:42S02!SELECT: no such
table 'hopefullynonexistanttable'
# 12:40:01 >
# 12:40:01 > "Done."
diff --git a/sql/backends/monet5/Tests/pyapi25.stable.out
b/sql/backends/monet5/Tests/pyapi25.stable.out
--- a/sql/backends/monet5/Tests/pyapi25.stable.out
+++ b/sql/backends/monet5/Tests/pyapi25.stable.out
@@ -81,8 +81,8 @@ Great success!
# return res['i'] * i
#};
#SELECT pyapi25(i) FROM pyapi25table; #multiply by 3
-% sys.L1 # table_name
-% L1 # name
+% sys.L2 # table_name
+% L2 # name
% int # type
% 2 # length
[ 3 ]
@@ -92,8 +92,8 @@ Great success!
#UPDATE pyapi25multiplication SET i=10;
[ 1 ]
#SELECT pyapi25(i) FROM pyapi25table; #multiply by 10
-% sys.L1 # table_name
-% L1 # name
+% sys.L2 # table_name
+% L2 # name
% int # type
% 2 # length
[ 10 ]
@@ -114,8 +114,8 @@ Great success!
# return i
#};
#SELECT pyapi25(i) FROM pyapi25table;
-% sys.L1 # table_name
-% L1 # name
+% sys.L2 # table_name
+% L2 # name
% int # type
% 1 # length
[ 1 ]
@@ -138,8 +138,8 @@ Great success!
[ 3 ]
[ 4 ]
#SELECT pyapi25map(i) FROM pyapi25table;
-% sys.L1 # table_name
-% L1 # name
+% sys.L2 # table_name
+% L2 # name
% int # type
% 1 # length
[ 1 ]
@@ -170,8 +170,8 @@ Great success!
#};
#CREATE TABLE randomtable AS SELECT * FROM pyapi25randomtable() WITH DATA;
#SELECT pyapi25mediancompute(d) FROM randomtable;
-% sys.L1 # table_name
-% L1 # name
+% sys.L2 # table_name
+% L2 # name
% double # type
% 24 # length
[ 1 ]
@@ -183,8 +183,8 @@ Great success!
[ 1 ]
[ 1 ]
#SELECT pyapi25checker(mean) FROM pyapi25medians;
-% sys.L1 # table_name
-% L1 # name
+% sys.L2 # table_name
+% L2 # name
% boolean # type
% 5 # length
[ true ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
