Changeset: e1bb5c283470 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e1bb5c283470 Modified Files: sql/test/Tests/All sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/Tests/systemfunctions_gsl.stable.out sql/test/Tests/systemfunctions_gsl.stable.out.int128 Branch: default Log Message:
merger diffs (103 lines): diff --git a/sql/test/Tests/All b/sql/test/Tests/All --- a/sql/test/Tests/All +++ b/sql/test/Tests/All @@ -1,7 +1,7 @@ -HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?systemfunctions -HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS?systemfunctions_gsl -HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?systemfunctions_bam -!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?systemfunctions_nogeom +HAVE_FITS&HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?systemfunctions +HAVE_FITS&HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS?systemfunctions_gsl +!HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?systemfunctions_bam +!HAVE_FITS&!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?systemfunctions_nogeom example example-queries example-drop 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 @@ -276,6 +276,8 @@ Ready. [ "sys", "equals", 2, "geometry", "" ] [ "sys", "evalalgebra", 0, "clob", "create procedure sys.evalalgebra( ra_stmt string, opt bool)\n\texternal name sql.\"evalAlgebra\";" ] [ "sys", "evalalgebra", 1, "boolean", "" ] +[ "sys", "fitsattach", 0, "clob", "create procedure fitsattach(fname string) external name fits.attach;" ] +[ "sys", "fitsload", 0, "clob", "create procedure fitsload(tname string) external name fits.load;" ] [ "sys", "fuse", 0, "smallint", "-- fuse two (1-byte) tinyint values into one (2-byte) smallint value\ncreate function fuse(one tinyint, two tinyint)\nreturns smallint external name udf.fuse;" ] [ "sys", "fuse", 1, "tinyint", "" ] [ "sys", "fuse", 2, "tinyint", "" ] @@ -411,6 +413,9 @@ Ready. [ "sys", "linefromtext", 0, "linestring", "create function linefromtext(wkt string, srid smallint) returns linestring external name geom.\"LineFromText\";" ] [ "sys", "linefromtext", 1, "clob", "" ] [ "sys", "linefromtext", 2, "smallint", "" ] +[ "sys", "listdir", 0, "clob", "\n\ncreate procedure listdir(dirname string) external name fits.listdir;" ] +[ "sys", "listdirpat", 0, "clob", "create procedure listdirpat(dirname string,pat string) external name fits.listdirpattern;" ] +[ "sys", "listdirpat", 1, "clob", "" ] [ "sys", "masklen", 0, "int", "create function \"masklen\" (p inet) returns int\n\texternal name inet.\"masklen\";" ] [ "sys", "masklen", 1, "inet", "" ] [ "sys", "mbr", 0, "mbr", "-- currently we only use mbr instead of\n-- Envelope():Geometry\n-- as that returns Geometry objects, and we prefer the explicit mbr's\n-- minimum bounding rectangle (mbr)\ncreate function mbr (g geometry) returns mbr external name geom.mbr;" ] diff --git a/sql/test/Tests/systemfunctions.stable.out.int128 b/sql/test/Tests/systemfunctions.stable.out.int128 --- a/sql/test/Tests/systemfunctions.stable.out.int128 +++ b/sql/test/Tests/systemfunctions.stable.out.int128 @@ -282,6 +282,8 @@ Ready. [ "sys", "equals", 2, "geometry", "" ] [ "sys", "evalalgebra", 0, "clob", "create procedure sys.evalalgebra( ra_stmt string, opt bool)\n\texternal name sql.\"evalAlgebra\";" ] [ "sys", "evalalgebra", 1, "boolean", "" ] +[ "sys", "fitsattach", 0, "clob", "create procedure fitsattach(fname string) external name fits.attach;" ] +[ "sys", "fitsload", 0, "clob", "create procedure fitsload(tname string) external name fits.load;" ] [ "sys", "fuse", 0, "smallint", "-- fuse two (1-byte) tinyint values into one (2-byte) smallint value\ncreate function fuse(one tinyint, two tinyint)\nreturns smallint external name udf.fuse;" ] [ "sys", "fuse", 1, "tinyint", "" ] [ "sys", "fuse", 2, "tinyint", "" ] @@ -427,6 +429,9 @@ Ready. [ "sys", "linefromtext", 0, "linestring", "create function linefromtext(wkt string, srid smallint) returns linestring external name geom.\"LineFromText\";" ] [ "sys", "linefromtext", 1, "clob", "" ] [ "sys", "linefromtext", 2, "smallint", "" ] +[ "sys", "listdir", 0, "clob", "\n\ncreate procedure listdir(dirname string) external name fits.listdir;" ] +[ "sys", "listdirpat", 0, "clob", "create procedure listdirpat(dirname string,pat string) external name fits.listdirpattern;" ] +[ "sys", "listdirpat", 1, "clob", "" ] [ "sys", "masklen", 0, "int", "create function \"masklen\" (p inet) returns int\n\texternal name inet.\"masklen\";" ] [ "sys", "masklen", 1, "inet", "" ] [ "sys", "mbr", 0, "mbr", "-- currently we only use mbr instead of\n-- Envelope():Geometry\n-- as that returns Geometry objects, and we prefer the explicit mbr's\n-- minimum bounding rectangle (mbr)\ncreate function mbr (g geometry) returns mbr external name geom.mbr;" ] diff --git a/sql/test/Tests/systemfunctions_gsl.stable.out b/sql/test/Tests/systemfunctions_gsl.stable.out --- a/sql/test/Tests/systemfunctions_gsl.stable.out +++ b/sql/test/Tests/systemfunctions_gsl.stable.out @@ -279,6 +279,8 @@ Ready. [ "sys", "equals", 2, "geometry", "" ] [ "sys", "evalalgebra", 0, "clob", "create procedure sys.evalalgebra( ra_stmt string, opt bool)\n\texternal name sql.\"evalAlgebra\";" ] [ "sys", "evalalgebra", 1, "boolean", "" ] +[ "sys", "fitsattach", 0, "clob", "create procedure fitsattach(fname string) external name fits.attach;" ] +[ "sys", "fitsload", 0, "clob", "create procedure fitsload(tname string) external name fits.load;" ] [ "sys", "fuse", 0, "smallint", "-- fuse two (1-byte) tinyint values into one (2-byte) smallint value\ncreate function fuse(one tinyint, two tinyint)\nreturns smallint external name udf.fuse;" ] [ "sys", "fuse", 1, "tinyint", "" ] [ "sys", "fuse", 2, "tinyint", "" ] @@ -414,6 +416,9 @@ Ready. [ "sys", "linefromtext", 0, "linestring", "create function linefromtext(wkt string, srid smallint) returns linestring external name geom.\"LineFromText\";" ] [ "sys", "linefromtext", 1, "clob", "" ] [ "sys", "linefromtext", 2, "smallint", "" ] +[ "sys", "listdir", 0, "clob", "\n\ncreate procedure listdir(dirname string) external name fits.listdir;" ] +[ "sys", "listdirpat", 0, "clob", "create procedure listdirpat(dirname string,pat string) external name fits.listdirpattern;" ] +[ "sys", "listdirpat", 1, "clob", "" ] [ "sys", "masklen", 0, "int", "create function \"masklen\" (p inet) returns int\n\texternal name inet.\"masklen\";" ] [ "sys", "masklen", 1, "inet", "" ] [ "sys", "mbr", 0, "mbr", "-- currently we only use mbr instead of\n-- Envelope():Geometry\n-- as that returns Geometry objects, and we prefer the explicit mbr's\n-- minimum bounding rectangle (mbr)\ncreate function mbr (g geometry) returns mbr external name geom.mbr;" ] diff --git a/sql/test/Tests/systemfunctions_gsl.stable.out.int128 b/sql/test/Tests/systemfunctions_gsl.stable.out.int128 --- a/sql/test/Tests/systemfunctions_gsl.stable.out.int128 +++ b/sql/test/Tests/systemfunctions_gsl.stable.out.int128 @@ -285,6 +285,8 @@ Ready. [ "sys", "equals", 2, "geometry", "" ] [ "sys", "evalalgebra", 0, "clob", "create procedure sys.evalalgebra( ra_stmt string, opt bool)\n\texternal name sql.\"evalAlgebra\";" ] [ "sys", "evalalgebra", 1, "boolean", "" ] +[ "sys", "fitsattach", 0, "clob", "create procedure fitsattach(fname string) external name fits.attach;" ] +[ "sys", "fitsload", 0, "clob", "create procedure fitsload(tname string) external name fits.load;" ] [ "sys", "fuse", 0, "smallint", "-- fuse two (1-byte) tinyint values into one (2-byte) smallint value\ncreate function fuse(one tinyint, two tinyint)\nreturns smallint external name udf.fuse;" ] [ "sys", "fuse", 1, "tinyint", "" ] [ "sys", "fuse", 2, "tinyint", "" ] @@ -430,6 +432,9 @@ Ready. [ "sys", "linefromtext", 0, "linestring", "create function linefromtext(wkt string, srid smallint) returns linestring external name geom.\"LineFromText\";" ] [ "sys", "linefromtext", 1, "clob", "" ] [ "sys", "linefromtext", 2, "smallint", "" ] +[ "sys", "listdir", 0, "clob", "\n\ncreate procedure listdir(dirname string) external name fits.listdir;" ] +[ "sys", "listdirpat", 0, "clob", "create procedure listdirpat(dirname string,pat string) external name fits.listdirpattern;" ] +[ "sys", "listdirpat", 1, "clob", "" ] [ "sys", "masklen", 0, "int", "create function \"masklen\" (p inet) returns int\n\texternal name inet.\"masklen\";" ] [ "sys", "masklen", 1, "inet", "" ] [ "sys", "mbr", 0, "mbr", "-- currently we only use mbr instead of\n-- Envelope():Geometry\n-- as that returns Geometry objects, and we prefer the explicit mbr's\n-- minimum bounding rectangle (mbr)\ncreate function mbr (g geometry) returns mbr external name geom.mbr;" ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
