Changeset: fd8ababbe0b4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fd8ababbe0b4
Modified Files:
sql/backends/monet5/Tests/pyloader07.stable.out
sql/backends/monet5/Tests/pyloader07.stable.out.Windows
sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_01.stable.out
sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_02.stable.out
sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_05.stable.out
Branch: default
Log Message:
Approve tests.
diffs (89 lines):
diff --git a/sql/backends/monet5/Tests/pyloader07.stable.out
b/sql/backends/monet5/Tests/pyloader07.stable.out
--- a/sql/backends/monet5/Tests/pyloader07.stable.out
+++ b/sql/backends/monet5/Tests/pyloader07.stable.out
@@ -82,7 +82,6 @@ Ready.
# _emit.emit({'d': ['2014-05-20'], 's': ['00:02:30'], 't': ['2014-05-20
00:02:30']});
#};
#COPY LOADER INTO tstamp FROM pyloader07();
-[ 2 ]
#SELECT * FROM tstamp;
% sys.tstamp, sys.tstamp, sys.tstamp # table_name
% d, s, t # name
diff --git a/sql/backends/monet5/Tests/pyloader07.stable.out.Windows
b/sql/backends/monet5/Tests/pyloader07.stable.out.Windows
--- a/sql/backends/monet5/Tests/pyloader07.stable.out.Windows
+++ b/sql/backends/monet5/Tests/pyloader07.stable.out.Windows
@@ -82,7 +82,6 @@ Ready.
# _emit.emit({'d': ['2014-05-20'], 's': ['00:02:30'], 't': ['2014-05-20
00:02:30']});
#};
#COPY LOADER INTO tstamp FROM pyloader07();
-[ 2 ]
#SELECT * FROM tstamp;
% sys.tstamp, sys.tstamp, sys.tstamp # table_name
% d, s, t # name
diff --git a/sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_01.stable.out
b/sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_01.stable.out
--- a/sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_01.stable.out
+++ b/sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_01.stable.out
@@ -44,23 +44,19 @@ Ready.
% varchar, varchar, varchar, int, int, boolean,
boolean, boolean # type
% 6, 32, 5, 1, 1, 5, 5, 5 # length
[ "myfunc", "{\n\t_emit.emit({'a':42,'d':1})\n};", "pyapi", 6,
7, true, true, false ]
-#COPY INTO mytable FROM LOADER myfunc3(46, 'asdf', 3.2);
-[ 1 ]
-#COPY INTO mytable FROM LOADER myfunc2(45, 'asdf');
-[ 1 ]
-#COPY INTO mytable FROM LOADER myfunc1(44);
-[ 1 ]
-#COPY INTO mytable FROM LOADER myfunc();
-[ 1 ]
+#COPY LOADER INTO mytable FROM myfunc();
+#COPY LOADER INTO mytable FROM myfunc3(46, 'asdf', 3.2);
+#COPY LOADER INTO mytable FROM myfunc2(45, 'asdf');
+#COPY LOADER INTO mytable FROM myfunc1(44);
#SELECT * FROM mytable;
% sys.mytable, sys.mytable, sys.mytable # table_name
% a, d, s # name
% double, int, clob # type
-% 24, 1, 5 # length
+% 24, 1, 7 # length
+[ 42, 1, "'hello'" ]
[ 46, 4, "hello" ]
-[ 45, 3, NULL ]
-[ 44, 2, NULL ]
-[ 42, 1, NULL ]
+[ 45, 3, "'hello'" ]
+[ 44, 2, "'hello'" ]
#DROP TABLE mytable;
#DROP ALL LOADER myfunc;
#CREATE LOADER myfunc() LANGUAGE PYTHON {
diff --git a/sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_02.stable.out
b/sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_02.stable.out
--- a/sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_02.stable.out
+++ b/sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_02.stable.out
@@ -35,12 +35,9 @@ Ready.
# res['a'+str(j+1)] = (i+1)*(j+1)
# _emit.emit(res)
#};
-#COPY INTO mytable3 FROM LOADER myfunc(10, 3);
-[ 10 ]
-#COPY INTO mytable4 FROM LOADER myfunc(10, 3);
-[ 10 ]
-#COPY INTO mytable2 FROM LOADER myfunc(20, 2);
-[ 20 ]
+#COPY LOADER INTO mytable3 FROM myfunc(10, 3);
+#COPY LOADER INTO mytable4 FROM myfunc(10, 3);
+#COPY LOADER INTO mytable2 FROM myfunc(20, 2);
#SELECT * FROM mytable4;
% sys.mytable4, sys.mytable4, sys.mytable4, sys.mytable4 #
table_name
% a1, a2, a3, a4 # name
diff --git a/sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_05.stable.out
b/sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_05.stable.out
--- a/sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_05.stable.out
+++ b/sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_05.stable.out
@@ -73,8 +73,7 @@ Ready.
# _emit.emit({'s': numpy.array([u'\u00D6', 'hello', 33])});
# _emit.emit({'s': numpy.arange(3).astype(numpy.float32)});
# _emit.emit({'s': numpy.arange(3).astype(numpy.float64)});
-#COPY INTO pyloader05table FROM LOADER pyloader05();
-[ 35 ]
+#COPY LOADER INTO pyloader05table FROM pyloader05();
#SELECT * FROM pyloader05table;
% sys.pyloader05table # table_name
% s # name
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
