Changeset: e78b85d11f15 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/e78b85d11f15 Branch: balanced_union Log Message:
merged with default diffs (truncated from 3933 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -813,3 +813,4 @@ ce63ebe9a78c52ef0cbe8fd6f2159d2637f0387c 1efa83c6409769d13b2ee30e497d5f7ab42fa955 Jun2023_9 6f88424ebfd9d82c072cf21d89070e04321983da Jun2023_11 6f88424ebfd9d82c072cf21d89070e04321983da Jun2023_SP2_release +e6eb06773c17035954ac5d001cfe1f09ff3425cc Jun2023_13 diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -89,7 +89,7 @@ Group: Applications/Databases License: MPL-2.0 URL: https://www.monetdb.org/ BugURL: https://github.com/MonetDB/MonetDB/issues -Source: https://www.monetdb.org/downloads/sources/Jun2023-SP2/%{name}-%{version}.tar.bz2 +Source: https://www.monetdb.org/downloads/sources/Jun2023-SP3/%{name}-%{version}.tar.bz2 # The Fedora packaging document says we need systemd-rpm-macros for # the _unitdir and _tmpfilesdir macros to exist; however on RHEL 7 @@ -867,6 +867,26 @@ fi %endif %changelog +* Fri Nov 03 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.13-20231103 +- Rebuilt. +- GH#7300: Implement missing standard SQL DATE and TIMESTAMP functions +- GH#7324: string_distance('method',str1, str2) as a generic distance + function +- GH#7409: Numpy table returning UDFs with variadic arguments + +* Thu Nov 2 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.13-20231103 +- sql: Added a missing interface function sys.timestamp_to_str with + a TIMESTAMP (as opposed to TIMESTAMP WITH TIME ZONE) argument. + The missing interface caused error messages being produced when the + function was called with a TIMESTAMP argument, although it did give + the correct result. + +* Tue Oct 31 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.13-20231103 +- gdk: A bug was fixed where the administration of which bats were in use was + interpreted incorrectly during startup, causing problems later. One + symptom that has been observed was failure to startup with a message + that the catalog tables could not be loaded. + * Fri Sep 29 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.11-20230929 - Rebuilt. diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake --- a/cmake/monetdb-versions.cmake +++ b/cmake/monetdb-versions.cmake @@ -42,7 +42,7 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M # common/options and common/utils) set(GDK_VERSION_MAJOR "27") set(GDK_VERSION_MINOR "0") -set(GDK_VERSION_PATCH "4") +set(GDK_VERSION_PATCH "5") set(GDK_VERSION "${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}") # version of the MAPI library (subdirectory clients/mapilib) @@ -54,7 +54,7 @@ set(MAPI_VERSION "${MAPI_VERSION_MAJOR}. # version of the MONETDB5 library (subdirectory monetdb5, not including extras or sql) set(MONETDB5_VERSION_MAJOR "34") set(MONETDB5_VERSION_MINOR "0") -set(MONETDB5_VERSION_PATCH "3") +set(MONETDB5_VERSION_PATCH "4") set(MONETDB5_VERSION "${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_MINOR}.${MONETDB5_VERSION_PATCH}") # version of the MONETDBE library (subdirectory tools/monetdbe) @@ -72,5 +72,5 @@ set(STREAM_VERSION "${STREAM_VERSION_MAJ # version of the SQL library (subdirectory sql) set(SQL_VERSION_MAJOR "14") set(SQL_VERSION_MINOR "0") -set(SQL_VERSION_PATCH "4") +set(SQL_VERSION_PATCH "5") set(SQL_VERSION "${SQL_VERSION_MAJOR}.${SQL_VERSION_MINOR}.${SQL_VERSION_PATCH}") diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,32 @@ +monetdb (11.47.13) unstable; urgency=low + + * Rebuilt. + * GH#7300: Implement missing standard SQL DATE and TIMESTAMP functions + * GH#7324: string_distance('method',str1, str2) as a generic distance + function + * GH#7409: Numpy table returning UDFs with variadic arguments + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 03 Nov 2023 10:48:08 +0100 + +monetdb (11.47.13) unstable; urgency=low + + * sql: Added a missing interface function sys.timestamp_to_str with + a TIMESTAMP (as opposed to TIMESTAMP WITH TIME ZONE) argument. + The missing interface caused error messages being produced when the + function was called with a TIMESTAMP argument, although it did give + the correct result. + + -- Sjoerd Mullender <sjo...@acm.org> Thu, 2 Nov 2023 10:48:08 +0100 + +monetdb (11.47.13) unstable; urgency=low + + * gdk: A bug was fixed where the administration of which bats were in use was + interpreted incorrectly during startup, causing problems later. One + symptom that has been observed was failure to startup with a message + that the catalog tables could not be loaded. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 31 Oct 2023 10:48:08 +0100 + monetdb (11.47.11) unstable; urgency=low * Rebuilt. diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive --- a/gdk/ChangeLog-Archive +++ b/gdk/ChangeLog-Archive @@ -1,6 +1,12 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Tue Oct 31 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.13-20231103 +- A bug was fixed where the administration of which bats were in use was + interpreted incorrectly during startup, causing problems later. One + symptom that has been observed was failure to startup with a message + that the catalog tables could not be loaded. + * Fri Sep 22 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.7-20230925 - Fixed a number of data races (race conditions). diff --git a/gdk/ChangeLog.Jun2023 b/gdk/ChangeLog.Jun2023 --- a/gdk/ChangeLog.Jun2023 +++ b/gdk/ChangeLog.Jun2023 @@ -1,9 +1,3 @@ # ChangeLog file for GDK # This file is updated with Maddlog -* Tue Oct 31 2023 Sjoerd Mullender <sjo...@acm.org> -- A bug was fixed where the administration of which bats were in use was - interpreted incorrectly during startup, causing problems later. One - symptom that has been observed was failure to startup with a message - that the catalog tables could not be loaded. - diff --git a/misc/packages/deb/changelog b/misc/packages/deb/changelog --- a/misc/packages/deb/changelog +++ b/misc/packages/deb/changelog @@ -1,3 +1,32 @@ +monetdb (11.47.13) unstable; urgency=low + + * Rebuilt. + * GH#7300: Implement missing standard SQL DATE and TIMESTAMP functions + * GH#7324: string_distance('method',str1, str2) as a generic distance + function + * GH#7409: Numpy table returning UDFs with variadic arguments + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 03 Nov 2023 10:48:08 +0100 + +monetdb (11.47.13) unstable; urgency=low + + * sql: Added a missing interface function sys.timestamp_to_str with + a TIMESTAMP (as opposed to TIMESTAMP WITH TIME ZONE) argument. + The missing interface caused error messages being produced when the + function was called with a TIMESTAMP argument, although it did give + the correct result. + + -- Sjoerd Mullender <sjo...@acm.org> Thu, 2 Nov 2023 10:48:08 +0100 + +monetdb (11.47.13) unstable; urgency=low + + * gdk: A bug was fixed where the administration of which bats were in use was + interpreted incorrectly during startup, causing problems later. One + symptom that has been observed was failure to startup with a message + that the catalog tables could not be loaded. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 31 Oct 2023 10:48:08 +0100 + monetdb (11.47.11) unstable; urgency=low * Rebuilt. diff --git a/misc/packages/rpm/changelog b/misc/packages/rpm/changelog --- a/misc/packages/rpm/changelog +++ b/misc/packages/rpm/changelog @@ -1,3 +1,23 @@ +* Fri Nov 03 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.13-20231103 +- Rebuilt. +- GH#7300: Implement missing standard SQL DATE and TIMESTAMP functions +- GH#7324: string_distance('method',str1, str2) as a generic distance + function +- GH#7409: Numpy table returning UDFs with variadic arguments + +* Thu Nov 2 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.13-20231103 +- sql: Added a missing interface function sys.timestamp_to_str with + a TIMESTAMP (as opposed to TIMESTAMP WITH TIME ZONE) argument. + The missing interface caused error messages being produced when the + function was called with a TIMESTAMP argument, although it did give + the correct result. + +* Tue Oct 31 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.13-20231103 +- gdk: A bug was fixed where the administration of which bats were in use was + interpreted incorrectly during startup, causing problems later. One + symptom that has been observed was failure to startup with a message + that the catalog tables could not be loaded. + * Fri Sep 29 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.11-20230929 - Rebuilt. diff --git a/sql/ChangeLog-Archive b/sql/ChangeLog-Archive --- a/sql/ChangeLog-Archive +++ b/sql/ChangeLog-Archive @@ -1,6 +1,13 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Thu Nov 2 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.13-20231103 +- Added a missing interface function sys.timestamp_to_str with + a TIMESTAMP (as opposed to TIMESTAMP WITH TIME ZONE) argument. + The missing interface caused error messages being produced when the + function was called with a TIMESTAMP argument, although it did give + the correct result. + * Fri Jun 9 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.5-20230718 - An upgrade that both creates a new .snapshot user and extends the sys.db_user_info table with (among others) a password column did diff --git a/sql/ChangeLog.Jun2023 b/sql/ChangeLog.Jun2023 --- a/sql/ChangeLog.Jun2023 +++ b/sql/ChangeLog.Jun2023 @@ -1,10 +1,3 @@ # ChangeLog file for sql # This file is updated with Maddlog -* Thu Nov 2 2023 Sjoerd Mullender <sjo...@acm.org> -- Added a missing interface function sys.timestamp_to_str with - a TIMESTAMP (as opposed to TIMESTAMP WITH TIME ZONE) argument. - The missing interface caused error messages being produced when the - function was called with a TIMESTAMP argument, although it did give - the correct result. - diff --git a/sql/backends/monet5/sql_upgrades.c b/sql/backends/monet5/sql_upgrades.c --- a/sql/backends/monet5/sql_upgrades.c +++ b/sql/backends/monet5/sql_upgrades.c @@ -6301,9 +6301,9 @@ sql_update_default(Client c, mvc *sql, s " cast(NULL AS varchar(1)) AS SCOPE_NAME,\n" " cast(NULL AS int) AS MAXIMUM_CARDINALITY,\n" " cast(NULL AS int) AS DTD_IDENTIFIER,\n" - " cast(sys.\"ifthenelse\"(sys.\"locate\"('begin',f.\"func\") > 0, sys.\"ifthenelse\"(sys.\"endswith\"(f.\"func\",';'), sys.\"substring\"(f.\"func\", sys.\"locate\"('begin',f.\"func\"), sys.\"length\"(sys.\"substring\"(f.\"func\", sys.\"locate\"('begin',f.\"func\")))-1), sys.\"substring\"(f.\"func\", sys.\"locate\"('begin',f.\"func\"))), NULL) AS varchar(8196) AS ROUTINE_BODY,\n" + " cast(sys.\"ifthenelse\"(sys.\"locate\"('begin',f.\"func\") > 0, sys.\"ifthenelse\"(sys.\"endswith\"(f.\"func\",';'), sys.\"substring\"(f.\"func\", sys.\"locate\"('begin',f.\"func\"), sys.\"length\"(sys.\"substring\"(f.\"func\", sys.\"locate\"('begin',f.\"func\")))-1), sys.\"substring\"(f.\"func\", sys.\"locate\"('begin',f.\"func\"))), NULL) AS varchar(8196)) AS ROUTINE_BODY,\n" " f.\"func\" AS ROUTINE_DEFINITION,\n" - " cast(sys.\"ifthenelse\"(sys.\"locate\"('external name',f.\"func\") > 0, sys.\"ifthenelse\"(sys.\"endswith\"(f.\"func\",';'), sys.\"substring\"(f.\"func\", 14 + sys.\"locate\"('external name',f.\"func\"), sys.\"length\"(sys.\"substring\"(f.\"func\", 14 + sys.\"locate\"('external name',f.\"func\")))-1), sys.\"substring\"(f.\"func\", 14 + sys.\"locate\"('external name',f.\"func\"))), NULL) AS varchar(1024) AS EXTERNAL_NAME,\n" + " cast(sys.\"ifthenelse\"(sys.\"locate\"('external name',f.\"func\") > 0, sys.\"ifthenelse\"(sys.\"endswith\"(f.\"func\",';'), sys.\"substring\"(f.\"func\", 14 + sys.\"locate\"('external name',f.\"func\"), sys.\"length\"(sys.\"substring\"(f.\"func\", 14 + sys.\"locate\"('external name',f.\"func\")))-1), sys.\"substring\"(f.\"func\", 14 + sys.\"locate\"('external name',f.\"func\"))), NULL) AS varchar(1024)) AS EXTERNAL_NAME,\n" " fl.\"language_keyword\" AS EXTERNAL_LANGUAGE,\n" " 'GENERAL' AS PARAMETER_STYLE,\n" " 'YES' AS IS_DETERMINISTIC,\n" @@ -6374,7 +6374,7 @@ sql_update_default(Client c, mvc *sql, s " cast(NULL AS varchar(1)) AS SEQUENCE_CATALOG,\n" " s.\"name\" AS SEQUENCE_SCHEMA,\n" " sq.\"name\" AS SEQUENCE_NAME,\n" - " cast('bigint' AS varchar(16)) AS DATA_TYPE,\n" + " cast('BIGINT' AS varchar(16)) AS DATA_TYPE,\n" " cast(64 AS SMALLINT) AS NUMERIC_PRECISION,\n" " cast(2 AS SMALLINT) AS NUMERIC_PRECISION_RADIX,\n" " cast(0 AS SMALLINT) AS NUMERIC_SCALE,\n" diff --git a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 @@ -596,12 +596,12 @@ CREATE VIEW INFORMATION_SCHEMA.COLUMNS A s."name" AS TABLE_SCHEMA, t."name" AS TABLE_NAME, c."name" AS COLUMN_NAME, - cast(c."number" +1 AS int) AS ORDINAL_POSITION, + cast(1 + c."number" AS int) AS ORDINAL_POSITION, c."default" AS COLUMN_DEFAULT, cast(sys.ifthenelse(c."null", 'YES', 'NO') AS varchar(3)) AS IS_NULLABLE, - CASE c."type" WHEN 'day_interval' THEN 'interval day' WHEN 'month_interval' THEN 'interval month' WHEN 'sec_interval' THEN 'interval second' ELSE c."type" END AS DATA_TYPE, - cast(sys.ifthenelse(c."type" IN ('varchar','clob','char','json','url','xml'), c."type_digits", NULL) AS int) AS CHARACTER_MAXIMUM_LENGTH, - cast(sys.ifthenelse(c."type" IN ('varchar','clob','char','json','url','xml'), c."type_digits" * 3, NULL) AS int) AS CHARACTER_OCTET_LENGTH, + cast(sys."describe_type"(c."type", c."type_digits", c."type_scale") AS varchar(1024)) AS DATA_TYPE, + cast(sys.ifthenelse(c."type" IN ('varchar','clob','char','json','url','xml') AND c."type_digits" > 0, c."type_digits", NULL) AS int) AS CHARACTER_MAXIMUM_LENGTH, + cast(sys.ifthenelse(c."type" IN ('varchar','clob','char','json','url','xml') AND c."type_digits" > 0, c."type_digits" * 4, NULL) AS int) AS CHARACTER_OCTET_LENGTH, cast(sys.ifthenelse(c."type" IN ('int','smallint','tinyint','bigint','hugeint','float','real','double','decimal','numeric','oid'), c."type_digits", NULL) AS int) AS NUMERIC_PRECISION, cast(sys.ifthenelse(c."type" IN ('int','smallint','tinyint','bigint','hugeint','float','real','double','oid'), 2, sys.ifthenelse(c."type" IN ('decimal','numeric'), 10, NULL)) AS int) AS NUMERIC_PRECISION_RADIX, cast(sys.ifthenelse(c."type" IN ('int','smallint','tinyint','bigint','hugeint','float','real','double','decimal','numeric','oid'), c."type_scale", NULL) AS int) AS NUMERIC_SCALE, @@ -710,11 +710,116 @@ CREATE VIEW INFORMATION_SCHEMA.REFERENTI LEFT OUTER JOIN sys."schemas" uks ON uks."id" = ukt."schema_id" ORDER BY s."name", t."name", fk."name"; GRANT SELECT ON TABLE INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS TO PUBLIC WITH GRANT OPTION; +CREATE VIEW INFORMATION_SCHEMA.ROUTINES AS SELECT + cast(NULL AS varchar(1)) AS SPECIFIC_CATALOG, + s."name" AS SPECIFIC_SCHEMA, + cast(f."id" as varchar(10)) AS SPECIFIC_NAME, + cast(NULL AS varchar(1)) AS ROUTINE_CATALOG, + s."name" AS ROUTINE_SCHEMA, + f."name" AS ROUTINE_NAME, + ft."function_type_keyword" AS ROUTINE_TYPE, + cast(NULL AS varchar(1)) AS MODULE_CATALOG, + cast(NULL AS varchar(1)) AS MODULE_SCHEMA, + cast(f."mod" AS varchar(128)) AS MODULE_NAME, + cast(NULL AS varchar(1)) AS UDT_CATALOG, + cast(NULL AS varchar(1)) AS UDT_SCHEMA, + cast(NULL AS varchar(1)) AS UDT_NAME, + cast(CASE f."type" WHEN 1 THEN sys."describe_type"(a."type", a."type_digits", a."type_scale") WHEN 2 THEN NULL WHEN 5 THEN 'TABLE' WHEN 7 THEN 'TABLE' ELSE NULL END AS varchar(1024)) AS DATA_TYPE, + cast(sys.ifthenelse(a."type" IN ('varchar','clob','char','json','url','xml') AND a."type_digits" > 0, a."type_digits", NULL) AS int) AS CHARACTER_MAXIMUM_LENGTH, + cast(sys.ifthenelse(a."type" IN ('varchar','clob','char','json','url','xml') AND a."type_digits" > 0, a."type_digits" * 4, NULL) AS int) AS CHARACTER_OCTET_LENGTH, + cast(NULL AS varchar(1)) AS CHARACTER_SET_CATALOG, _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
