Changeset: 93598dbcbb62 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=93598dbcbb62 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 geom/monetdb5/geom.mal geom/sql/40_geom.sql geom/sql/pg_regression/Tests/dump.stable.out Branch: geo Log Message:
Fix return type of geom.dump(): it returns a string BAT. diffs (truncated from 12690 to 300 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -38245,7 +38245,7 @@ command geom.DumpPoints(a:wkb) (id:bat[: address wkbDumpPoints; comment Gets a Geometry and returns the Points in it -command geom.Dump(a:wkb) (id:bat[:oid,:int],geom:bat[:oid,:wkb]) +command geom.Dump(a:wkb) (id:bat[:oid,:str],geom:bat[:oid,:wkb]) address wkbDump; comment Gets a MultiPolygon and returns the Polygons in it diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -49162,7 +49162,7 @@ command geom.DumpPoints(a:wkb) (id:bat[: address wkbDumpPoints; comment Gets a Geometry and returns the Points in it -command geom.Dump(a:wkb) (id:bat[:oid,:int],geom:bat[:oid,:wkb]) +command geom.Dump(a:wkb) (id:bat[:oid,:str],geom:bat[:oid,:wkb]) address wkbDump; comment Gets a MultiPolygon and returns the Polygons in it diff --git a/clients/Tests/SQL-dump.stable.out b/clients/Tests/SQL-dump.stable.out --- a/clients/Tests/SQL-dump.stable.out +++ b/clients/Tests/SQL-dump.stable.out @@ -1485,237 +1485,237 @@ 2149 "statement" "varchar" 2048 0 2139 N 2151 "id" "int" 32 0 2150 NULL true 0 NULL 2152 "name" "varchar" 1024 0 2150 NULL true 1 NULL 2153 "nr" "int" 32 0 2150 NULL true 2 NULL -5668 "id" "int" 32 0 5667 NULL true 0 NULL -5669 "name" "varchar" 1024 0 5667 NULL true 1 NULL -5670 "schema_id" "int" 32 0 5667 NULL true 2 NULL -5671 "query" "varchar" 2048 0 5667 NULL true 3 NULL -5672 "type" "smallint" 16 0 5667 NULL true 4 NULL -5673 "system" "boolean" 1 0 5667 NULL true 5 NULL -5674 "commit_action" "smallint" 16 0 5667 NULL true 6 NULL -5675 "access" "smallint" 16 0 5667 NULL true 7 NULL -5676 "temporary" "smallint" 16 0 5667 NULL true 8 NULL -5678 "id" "int" 32 0 5677 NULL true 0 NULL -5679 "name" "varchar" 1024 0 5677 NULL true 1 NULL -5680 "type" "varchar" 1024 0 5677 NULL true 2 NULL -5681 "type_digits" "int" 32 0 5677 NULL true 3 NULL -5682 "type_scale" "int" 32 0 5677 NULL true 4 NULL -5683 "table_id" "int" 32 0 5677 NULL true 5 NULL -5684 "default" "varchar" 2048 0 5677 NULL true 6 NULL -5685 "null" "boolean" 1 0 5677 NULL true 7 NULL -5686 "number" "int" 32 0 5677 NULL true 8 NULL -5687 "storage" "varchar" 2048 0 5677 NULL true 9 NULL -5694 "name" "varchar" 1024 0 5693 NULL true 0 NULL -5695 "fullname" "varchar" 2048 0 5693 NULL true 1 NULL -5696 "default_schema" "int" 9 0 5693 NULL true 2 NULL -5700 "name" "varchar" 1024 0 5699 NULL true 0 NULL -5701 "fullname" "varchar" 2024 0 5699 NULL true 1 NULL -5702 "default_schema" "int" 9 0 5699 NULL true 2 NULL -5704 "login_id" "int" 32 0 5703 NULL true 0 NULL -5705 "role_id" "int" 32 0 5703 NULL true 1 NULL -5707 "id" "int" 32 0 5706 NULL true 0 NULL -5708 "name" "varchar" 1024 0 5706 NULL true 1 NULL -5709 "grantor" "int" 32 0 5706 NULL true 2 NULL -5711 "obj_id" "int" 32 0 5710 NULL true 0 NULL -5712 "auth_id" "int" 32 0 5710 NULL true 1 NULL -5713 "privileges" "int" 32 0 5710 NULL true 2 NULL -5714 "grantor" "int" 32 0 5710 NULL true 3 NULL -5715 "grantable" "int" 32 0 5710 NULL true 4 NULL -5909 "id" "oid" 63 0 5917 NULL true 0 NULL -5910 "owner" "clob" 0 0 5917 NULL true 1 NULL -5911 "defined" "timestamp" 7 0 5917 NULL true 2 NULL -5912 "query" "clob" 0 0 5917 NULL true 3 NULL -5913 "pipe" "clob" 0 0 5917 NULL true 4 NULL -5914 "plan" "clob" 0 0 5917 NULL true 5 NULL -5915 "mal" "int" 32 0 5917 NULL true 6 NULL -5916 "optimize" "bigint" 64 0 5917 NULL true 7 NULL -5919 "id" "oid" 63 0 5928 NULL true 0 NULL -5920 "start" "timestamp" 7 0 5928 NULL true 1 NULL -5921 "stop" "timestamp" 7 0 5928 NULL true 2 NULL -5922 "arguments" "clob" 0 0 5928 NULL true 3 NULL -5923 "tuples" "wrd" 64 0 5928 NULL true 4 NULL -5924 "run" "bigint" 64 0 5928 NULL true 5 NULL -5925 "ship" "bigint" 64 0 5928 NULL true 6 NULL -5926 "cpu" "int" 32 0 5928 NULL true 7 NULL -5927 "io" "int" 32 0 5928 NULL true 8 NULL -5930 "id" "oid" 63 0 5946 NULL true 0 NULL -5931 "owner" "clob" 0 0 5946 NULL true 1 NULL -5932 "defined" "timestamp" 7 0 5946 NULL true 2 NULL -5933 "query" "clob" 0 0 5946 NULL true 3 NULL -5934 "pipe" "clob" 0 0 5946 NULL true 4 NULL -5935 "plan" "clob" 0 0 5946 NULL true 5 NULL -5936 "mal" "int" 32 0 5946 NULL true 6 NULL -5937 "optimize" "bigint" 64 0 5946 NULL true 7 NULL -5938 "start" "timestamp" 7 0 5946 NULL true 8 NULL -5939 "stop" "timestamp" 7 0 5946 NULL true 9 NULL -5940 "arguments" "clob" 0 0 5946 NULL true 10 NULL -5941 "tuples" "wrd" 64 0 5946 NULL true 11 NULL -5942 "run" "bigint" 64 0 5946 NULL true 12 NULL -5943 "ship" "bigint" 64 0 5946 NULL true 13 NULL -5944 "cpu" "int" 32 0 5946 NULL true 14 NULL -5945 "io" "int" 32 0 5946 NULL true 15 NULL -5972 "event" "int" 32 0 5985 NULL true 0 NULL -5973 "clk" "varchar" 20 0 5985 NULL true 1 NULL -5974 "pc" "varchar" 50 0 5985 NULL true 2 NULL -5975 "thread" "int" 32 0 5985 NULL true 3 NULL -5976 "ticks" "bigint" 64 0 5985 NULL true 4 NULL -5977 "rrsmb" "bigint" 64 0 5985 NULL true 5 NULL -5978 "vmmb" "bigint" 64 0 5985 NULL true 6 NULL -5979 "reads" "bigint" 64 0 5985 NULL true 7 NULL -5980 "writes" "bigint" 64 0 5985 NULL true 8 NULL -5981 "minflt" "bigint" 64 0 5985 NULL true 9 NULL -5982 "majflt" "bigint" 64 0 5985 NULL true 10 NULL -5983 "nvcsw" "bigint" 64 0 5985 NULL true 11 NULL -5984 "stmt" "clob" 0 0 5985 NULL true 12 NULL -6115 "user" "clob" 0 0 6121 NULL true 0 NULL -6116 "login" "timestamp" 7 0 6121 NULL true 1 NULL -6117 "sessiontimeout" "bigint" 64 0 6121 NULL true 2 NULL -6118 "lastcommand" "timestamp" 7 0 6121 NULL true 3 NULL -6119 "querytimeout" "bigint" 64 0 6121 NULL true 4 NULL -6120 "active" "boolean" 1 0 6121 NULL true 5 NULL -6198 "name" "clob" 0 0 6201 NULL true 0 NULL -6199 "def" "clob" 0 0 6201 NULL true 1 NULL -6200 "status" "clob" 0 0 6201 NULL true 2 NULL -6207 "name" "clob" 0 0 6209 NULL true 0 NULL -6208 "value" "clob" 0 0 6209 NULL true 1 NULL -6239 "qtag" "bigint" 64 0 6247 NULL true 0 NULL -6240 "user" "clob" 0 0 6247 NULL true 1 NULL -6241 "started" "timestamp" 7 0 6247 NULL true 2 NULL -6242 "estimate" "timestamp" 7 0 6247 NULL true 3 NULL -6243 "progress" "int" 32 0 6247 NULL true 4 NULL -6244 "status" "clob" 0 0 6247 NULL true 5 NULL -6245 "tag" "oid" 63 0 6247 NULL true 6 NULL -6246 "query" "clob" 0 0 6247 NULL true 7 NULL -6574 "srid" "int" 32 0 6581 NULL false 0 NULL -6577 "auth_name" "varchar" 256 0 6581 NULL true 1 NULL -6578 "auth_srid" "int" 32 0 6581 NULL true 2 NULL -6579 "srtext" "varchar" 2048 0 6581 NULL true 3 NULL -6580 "proj4text" "varchar" 2048 0 6581 NULL true 4 NULL -6583 "f_table_catalog" "clob" 0 0 6590 NULL true 0 NULL -6584 "f_table_schema" "varchar" 1024 0 6590 NULL true 1 NULL -6585 "f_table_name" "varchar" 1024 0 6590 NULL true 2 NULL -6586 "f_geometry_column" "varchar" 1024 0 6590 NULL true 3 NULL -6587 "coord_dimension" "bigint" 64 0 6590 NULL true 4 NULL -6588 "srid" "int" 32 0 6590 NULL true 5 NULL -6589 "type" "clob" 0 0 6590 NULL true 6 NULL -7281 "file_id" "int" 32 0 7283 NULL true 0 NULL -7282 "location" "char" 256 0 7283 NULL true 1 NULL -7285 "dim_id" "int" 32 0 7289 NULL true 0 NULL -7286 "file_id" "int" 32 0 7289 NULL true 1 NULL -7287 "name" "varchar" 64 0 7289 NULL true 2 NULL -7288 "length" "int" 32 0 7289 NULL true 3 NULL -7291 "var_id" "int" 32 0 7297 NULL true 0 NULL -7292 "file_id" "int" 32 0 7297 NULL true 1 NULL -7293 "name" "varchar" 64 0 7297 NULL true 2 NULL -7294 "vartype" "varchar" 64 0 7297 NULL true 3 NULL -7295 "ndim" "int" 32 0 7297 NULL true 4 NULL -7296 "coord_dim_id" "int" 32 0 7297 NULL true 5 NULL -7299 "var_id" "int" 32 0 7303 NULL true 0 NULL -7300 "dim_id" "int" 32 0 7303 NULL true 1 NULL -7301 "file_id" "int" 32 0 7303 NULL true 2 NULL -7302 "dimpos" "int" 32 0 7303 NULL true 3 NULL -7305 "obj_name" "varchar" 256 0 7311 NULL true 0 NULL -7306 "att_name" "varchar" 256 0 7311 NULL true 1 NULL -7307 "att_type" "varchar" 64 0 7311 NULL true 2 NULL -7308 "value" "clob" 0 0 7311 NULL true 3 NULL -7309 "file_id" "int" 32 0 7311 NULL true 4 NULL -7310 "gr_name" "varchar" 256 0 7311 NULL true 5 NULL -7336 "schema" "clob" 0 0 7350 NULL true 0 NULL -7337 "table" "clob" 0 0 7350 NULL true 1 NULL -7338 "column" "clob" 0 0 7350 NULL true 2 NULL -7339 "type" "clob" 0 0 7350 NULL true 3 NULL -7340 "mode" "clob" 0 0 7350 NULL true 4 NULL -7341 "location" "clob" 0 0 7350 NULL true 5 NULL -7342 "count" "bigint" 64 0 7350 NULL true 6 NULL -7343 "typewidth" "int" 32 0 7350 NULL true 7 NULL -7344 "columnsize" "bigint" 64 0 7350 NULL true 8 NULL -7345 "heapsize" "bigint" 64 0 7350 NULL true 9 NULL -7346 "hashes" "bigint" 64 0 7350 NULL true 10 NULL -7347 "phash" "boolean" 1 0 7350 NULL true 11 NULL -7348 "imprints" "bigint" 64 0 7350 NULL true 12 NULL -7349 "sorted" "boolean" 1 0 7350 NULL true 13 NULL -7352 "schema" "clob" 0 0 7362 NULL true 0 NULL -7353 "table" "clob" 0 0 7362 NULL true 1 NULL -7354 "column" "clob" 0 0 7362 NULL true 2 NULL -7355 "type" "clob" 0 0 7362 NULL true 3 NULL -7356 "typewidth" "int" 32 0 7362 NULL true 4 NULL -7357 "count" "bigint" 64 0 7362 NULL true 5 NULL -7358 "distinct" "bigint" 64 0 7362 NULL true 6 NULL -7359 "atomwidth" "int" 32 0 7362 NULL true 7 NULL -7360 "reference" "boolean" 1 0 7362 NULL true 8 NULL -7361 "sorted" "boolean" 1 0 7362 NULL true 9 NULL -7400 "schema" "clob" 0 0 7410 NULL true 0 NULL -7401 "table" "clob" 0 0 7410 NULL true 1 NULL -7402 "column" "clob" 0 0 7410 NULL true 2 NULL -7403 "type" "clob" 0 0 7410 NULL true 3 NULL -7404 "count" "bigint" 64 0 7410 NULL true 4 NULL -7405 "columnsize" "bigint" 64 0 7410 NULL true 5 NULL -7406 "heapsize" "bigint" 64 0 7410 NULL true 6 NULL -7407 "hashes" "bigint" 64 0 7410 NULL true 7 NULL -7408 "imprints" "bigint" 64 0 7410 NULL true 8 NULL -7409 "sorted" "boolean" 1 0 7410 NULL true 9 NULL -7412 "schema" "clob" 0 0 7420 NULL true 0 NULL -7413 "table" "clob" 0 0 7420 NULL true 1 NULL -7414 "count" "bigint" 64 0 7420 NULL true 2 NULL -7415 "columnsize" "bigint" 64 0 7420 NULL true 3 NULL -7416 "heapsize" "bigint" 64 0 7420 NULL true 4 NULL -7417 "hashes" "bigint" 64 0 7420 NULL true 5 NULL -7418 "imprints" "bigint" 64 0 7420 NULL true 6 NULL -7419 "auxiliary" "bigint" 64 0 7420 NULL true 7 NULL -7422 "column_id" "int" 32 0 7433 NULL true 0 NULL -7423 "type" "clob" 0 0 7433 NULL true 1 NULL -7424 "width" "int" 32 0 7433 NULL true 2 NULL -7425 "stamp" "timestamp" 7 0 7433 NULL true 3 NULL -7426 "sample" "bigint" 64 0 7433 NULL true 4 NULL -7427 "count" "bigint" 64 0 7433 NULL true 5 NULL -7428 "unique" "bigint" 64 0 7433 NULL true 6 NULL -7429 "nils" "bigint" 64 0 7433 NULL true 7 NULL -7430 "minval" "clob" 0 0 7433 NULL true 8 NULL -7431 "maxval" "clob" 0 0 7433 NULL true 9 NULL -7432 "sorted" "boolean" 1 0 7433 NULL true 10 NULL -7528 "file_id" "bigint" 64 0 7536 NULL false 0 NULL -7529 "file_location" "clob" 0 0 7536 NULL false 1 NULL -7530 "dbschema" "smallint" 16 0 7536 NULL false 2 NULL -7531 "format_version" "varchar" 7 0 7536 NULL true 3 NULL -7532 "sorting_order" "varchar" 10 0 7536 NULL true 4 NULL -7533 "comments" "clob" 0 0 7536 NULL true 5 NULL -7538 "sn" "clob" 0 0 7549 NULL false 0 NULL -7539 "file_id" "bigint" 64 0 7549 NULL false 1 NULL -7540 "ln" "int" 32 0 7549 NULL true 2 NULL -7541 "as" "int" 32 0 7549 NULL true 3 NULL -7542 "m5" "clob" 0 0 7549 NULL true 4 NULL -7543 "sp" "clob" 0 0 7549 NULL true 5 NULL -7544 "ur" "clob" 0 0 7549 NULL true 6 NULL -7551 "id" "clob" 0 0 7568 NULL false 0 NULL -7552 "file_id" "bigint" 64 0 7568 NULL false 1 NULL -7553 "cn" "clob" 0 0 7568 NULL true 2 NULL -7554 "ds" "clob" 0 0 7568 NULL true 3 NULL -7555 "dt" "timestamp" 7 0 7568 NULL true 4 NULL -7556 "fo" "clob" 0 0 7568 NULL true 5 NULL -7557 "ks" "clob" 0 0 7568 NULL true 6 NULL -7558 "lb" "clob" 0 0 7568 NULL true 7 NULL -7559 "pg" "clob" 0 0 7568 NULL true 8 NULL -7560 "pi" "int" 32 0 7568 NULL true 9 NULL -7561 "pl" "clob" 0 0 7568 NULL true 10 NULL -7562 "pu" "clob" 0 0 7568 NULL true 11 NULL -7563 "sm" "clob" 0 0 7568 NULL true 12 NULL -7570 "id" "clob" 0 0 7580 NULL false 0 NULL -7571 "file_id" "bigint" 64 0 7580 NULL false 1 NULL -7572 "pn" "clob" 0 0 7580 NULL true 2 NULL -7573 "cl" "clob" 0 0 7580 NULL true 3 NULL -7574 "pp" "clob" 0 0 7580 NULL true 4 NULL -7575 "vn" "clob" 0 0 7580 NULL true 5 NULL -7582 "qname" "clob" 0 0 7593 NULL false 0 NULL -7583 "flag" "smallint" 16 0 7593 NULL false 1 NULL -7584 "rname" "clob" 0 0 7593 NULL false 2 NULL -7585 "pos" "int" 32 0 7593 NULL false 3 NULL -7586 "mapq" "smallint" 16 0 7593 NULL false 4 NULL -7587 "cigar" "clob" 0 0 7593 NULL false 5 NULL -7588 "rnext" "clob" 0 0 7593 NULL false 6 NULL -7589 "pnext" "int" 32 0 7593 NULL false 7 NULL -7590 "tlen" "int" 32 0 7593 NULL false 8 NULL -7591 "seq" "clob" 0 0 7593 NULL false 9 NULL -7592 "qual" "clob" 0 0 7593 NULL false 10 NULL -7663 "function_id" "int" 32 0 7664 NULL true 0 NULL +5667 "id" "int" 32 0 5666 NULL true 0 NULL +5668 "name" "varchar" 1024 0 5666 NULL true 1 NULL +5669 "schema_id" "int" 32 0 5666 NULL true 2 NULL +5670 "query" "varchar" 2048 0 5666 NULL true 3 NULL +5671 "type" "smallint" 16 0 5666 NULL true 4 NULL +5672 "system" "boolean" 1 0 5666 NULL true 5 NULL +5673 "commit_action" "smallint" 16 0 5666 NULL true 6 NULL +5674 "access" "smallint" 16 0 5666 NULL true 7 NULL +5675 "temporary" "smallint" 16 0 5666 NULL true 8 NULL +5677 "id" "int" 32 0 5676 NULL true 0 NULL +5678 "name" "varchar" 1024 0 5676 NULL true 1 NULL +5679 "type" "varchar" 1024 0 5676 NULL true 2 NULL +5680 "type_digits" "int" 32 0 5676 NULL true 3 NULL +5681 "type_scale" "int" 32 0 5676 NULL true 4 NULL +5682 "table_id" "int" 32 0 5676 NULL true 5 NULL +5683 "default" "varchar" 2048 0 5676 NULL true 6 NULL +5684 "null" "boolean" 1 0 5676 NULL true 7 NULL +5685 "number" "int" 32 0 5676 NULL true 8 NULL +5686 "storage" "varchar" 2048 0 5676 NULL true 9 NULL +5693 "name" "varchar" 1024 0 5692 NULL true 0 NULL +5694 "fullname" "varchar" 2048 0 5692 NULL true 1 NULL +5695 "default_schema" "int" 9 0 5692 NULL true 2 NULL +5699 "name" "varchar" 1024 0 5698 NULL true 0 NULL +5700 "fullname" "varchar" 2024 0 5698 NULL true 1 NULL +5701 "default_schema" "int" 9 0 5698 NULL true 2 NULL +5703 "login_id" "int" 32 0 5702 NULL true 0 NULL +5704 "role_id" "int" 32 0 5702 NULL true 1 NULL +5706 "id" "int" 32 0 5705 NULL true 0 NULL +5707 "name" "varchar" 1024 0 5705 NULL true 1 NULL +5708 "grantor" "int" 32 0 5705 NULL true 2 NULL +5710 "obj_id" "int" 32 0 5709 NULL true 0 NULL +5711 "auth_id" "int" 32 0 5709 NULL true 1 NULL +5712 "privileges" "int" 32 0 5709 NULL true 2 NULL +5713 "grantor" "int" 32 0 5709 NULL true 3 NULL +5714 "grantable" "int" 32 0 5709 NULL true 4 NULL +5908 "id" "oid" 63 0 5916 NULL true 0 NULL +5909 "owner" "clob" 0 0 5916 NULL true 1 NULL +5910 "defined" "timestamp" 7 0 5916 NULL true 2 NULL _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
