Changeset: b99f892aae34 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b99f892aae34 Modified Files: sql/jdbc/tests/Tests/Test_Dobjects.stable.out sql/test/Tests/systemfunctions.stable.out Branch: sciql Log Message:
approved expected stable.out diffs (43 lines): diff --git a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out --- a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out +++ b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out @@ -62,6 +62,7 @@ TABLE_SCHEM TABLE_CATALOG TABLE_CAT sys mTests_jdbc_tests mTests_jdbc_tests Resultset with 10 columns TABLE_CAT TABLE_SCHEM TABLE_NAME TABLE_TYPE REMARKS TYPE_CAT TYPE_SCHEM TYPE_NAME SELF_REFERENCING_COL_NAME REF_GENERATION +mTests_jdbc_tests sys _arrays SYSTEM TABLE null null null null rowid SYSTEM mTests_jdbc_tests sys _columns SYSTEM TABLE null null null null rowid SYSTEM mTests_jdbc_tests sys _dimensions SYSTEM TABLE null null null null rowid SYSTEM mTests_jdbc_tests sys _tables SYSTEM TABLE null null null null rowid SYSTEM @@ -84,6 +85,7 @@ mTests_jdbc_tests sys systemfunctions SY mTests_jdbc_tests sys triggers SYSTEM TABLE null null null null rowid SYSTEM mTests_jdbc_tests sys types SYSTEM TABLE null null null null rowid SYSTEM mTests_jdbc_tests sys user_role SYSTEM TABLE null null null null rowid SYSTEM +mTests_jdbc_tests tmp _arrays SYSTEM TABLE null null null null rowid SYSTEM mTests_jdbc_tests tmp _columns SYSTEM TABLE null null null null rowid SYSTEM mTests_jdbc_tests tmp _dimensions SYSTEM TABLE null null null null rowid SYSTEM mTests_jdbc_tests tmp _tables SYSTEM TABLE null null null null rowid SYSTEM @@ -91,9 +93,9 @@ mTests_jdbc_tests tmp idxs SYSTEM TABLE mTests_jdbc_tests tmp keys SYSTEM TABLE null null null null rowid SYSTEM mTests_jdbc_tests tmp objects SYSTEM TABLE null null null null rowid SYSTEM mTests_jdbc_tests tmp triggers SYSTEM TABLE null null null null rowid SYSTEM -mTests_jdbc_tests sys arrays SYSTEM VIEW SELECT * FROM (SELECT p.*, 0 AS "temporary" FROM "sys"."_tables" AS p WHERE nr_dimensions > 0 UNION ALL SELECT t.*, 1 AS "temporary" FROM "tmp"."_tables" AS t WHERE nr_dimensions > 0) AS arrays; null null null rowid SYSTEM +mTests_jdbc_tests sys arrays SYSTEM VIEW SELECT * FROM (SELECT pt.*, 0 AS "temporary", pa.valence, pa.fixed, pa.materialised FROM "sys"."_tables" AS pt, "sys"."_arrays" AS pa WHERE pt.id = pa.table_id UNION ALL SELECT tt.*, 1 AS "temporary", ta.valence, ta.fixed, ta.materialised FROM "tmp"."_tables" AS tt, "tmp"."_arrays" AS ta WHERE tt.id = ta.table_id) AS arrays; null null null rowid SYSTEM mTests_jdbc_tests sys columns SYSTEM VIEW SELECT * FROM (SELECT p.* FROM "sys"."_columns" AS p UNION ALL SELECT t.* FROM "tmp"."_columns" AS t) AS columns; null null null rowid SYSTEM -mTests_jdbc_tests sys dimensions SYSTEM VIEW SELECT * FROM (SELECT pc.*, "pd"."start", pd.step, pd.stop FROM "sys"."_columns" AS pc, "sys"."_dimensions" AS pd WHERE pc.id = pd.column_id UNION ALL SELECT tc.*, "td"."start", td.step, td.stop FROM "tmp"."_columns" AS tc, "tmp"."_dimensions" AS td WHERE tc.id = td.column_id) AS dimensions; null null null rowid SYSTEM +mTests_jdbc_tests sys dimensions SYSTEM VIEW SELECT * FROM (SELECT pc.*, "pd"."start", pd.step, pd.stop, pd.storage_order FROM "sys"."_columns" AS pc, "sys"."_dimensions" AS pd WHERE pc.id = pd.column_id UNION ALL SELECT tc.*, "td"."start", td.step, td.stop, td.storage_order FROM "tmp"."_columns" AS tc, "tmp"."_dimensions" AS td WHERE tc.id = td.column_id) AS dimensions; null null null rowid SYSTEM mTests_jdbc_tests sys querylog SYSTEM VIEW create view querylog as select qd.*, ql.ctime, ql.arguments, ql.exec, ql.result, ql.foot, ql.memory, ql.tuples, ql.inblock, ql.oublock from queryhistory qd, callhistory ql where qd.id = ql.id; null null null rowid SYSTEM diff --git a/sql/test/Tests/systemfunctions.stable.out b/sql/test/Tests/systemfunctions.stable.out --- a/sql/test/Tests/systemfunctions.stable.out +++ b/sql/test/Tests/systemfunctions.stable.out @@ -49,7 +49,7 @@ Ready. % sys.s, sys.f, sys.a, sys.a, sys. # table_name % schema, function, argno, argtype, definition # name % varchar, varchar, int, varchar, varchar # type -% 3, 35, 2, 15, 1317 # length +% 3, 35, 2, 15, 1579 # length [ "rs", "attach", 0, "varchar", "create procedure rs.attach(fname varchar(256)) external name geotiff.attach;" ] [ "rs", "import", 0, "int", "create procedure rs.import(imgid int) external name geotiff.import;" ] [ "sys", "Dimension", 0, "int", "-- CREATE FUNCTION Point(g Geometry) RETURNS Point external name geom.point;\n-- CREATE FUNCTION Curve(g Geometry) RETURNS Curve external name geom.curve;\n-- CREATE FUNCTION LineString(g Geometry) RETURNS LineString external name geom.linestring;\n-- CREATE FUNCTION Surface(g Geometry) RETURNS Surface external name geom.surface;\n-- CREATE FUNCTION Polygon(g Geometry) RETURNS Polygon external name geom.polygon;\n\n-- ogc basic methods\ncreate function \"Dimension\"(g geometry) returns integer external name geom.\"Dimension\";" ] _______________________________________________ checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
