From f8b4756c014937da268ca9ee47dc63fc9776dc7c Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Mon, 26 Aug 2024 20:47:07 +0200 Subject: [PATCH 1/5] Joomla! 4.4.8 Rc 3 --- administrator/language/en-GB/install.xml | 2 +- administrator/language/en-GB/langmetadata.xml | 2 +- administrator/manifests/files/joomla.xml | 2 +- administrator/manifests/packages/pkg_en-GB.xml | 2 +- api/language/en-GB/install.xml | 2 +- api/language/en-GB/langmetadata.xml | 2 +- installation/language/en-GB/langmetadata.xml | 2 +- language/en-GB/install.xml | 2 +- language/en-GB/langmetadata.xml | 2 +- libraries/src/Version.php | 10 +++++----- package.json | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml index b736db8304d22..a290f13571815 100644 --- a/administrator/language/en-GB/install.xml +++ b/administrator/language/en-GB/install.xml @@ -2,7 +2,7 @@ English (en-GB) en-GB - 4.4.9 + 4.4.8 2024-08 Joomla! Project admin@joomla.org diff --git a/administrator/language/en-GB/langmetadata.xml b/administrator/language/en-GB/langmetadata.xml index 9e6dd520b95bd..110135ca248d3 100644 --- a/administrator/language/en-GB/langmetadata.xml +++ b/administrator/language/en-GB/langmetadata.xml @@ -1,7 +1,7 @@ English (en-GB) - 4.4.9 + 4.4.8 2024-08 Joomla! Project admin@joomla.org diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index ca1be4f3c207a..d31e7ae6ab554 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -6,7 +6,7 @@ www.joomla.org (C) 2019 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt - 4.4.9-dev + 4.4.8-rc3 2024-08 FILES_JOOMLA_XML_DESCRIPTION diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml index 35f9447a35259..1f48de25b3ee8 100644 --- a/administrator/manifests/packages/pkg_en-GB.xml +++ b/administrator/manifests/packages/pkg_en-GB.xml @@ -2,7 +2,7 @@ English (en-GB) Language Pack en-GB - 4.4.9.1 + 4.4.8.1 2024-08 Joomla! Project admin@joomla.org diff --git a/api/language/en-GB/install.xml b/api/language/en-GB/install.xml index 2cf9dbeacd652..27c56b478aa83 100644 --- a/api/language/en-GB/install.xml +++ b/api/language/en-GB/install.xml @@ -2,7 +2,7 @@ English (en-GB) en-GB - 4.4.9 + 4.4.8 2024-08 Joomla! Project admin@joomla.org diff --git a/api/language/en-GB/langmetadata.xml b/api/language/en-GB/langmetadata.xml index 269a63567e801..c5f1f3353c56d 100644 --- a/api/language/en-GB/langmetadata.xml +++ b/api/language/en-GB/langmetadata.xml @@ -1,7 +1,7 @@ English (en-GB) - 4.4.9 + 4.4.8 2024-08 Joomla! Project admin@joomla.org diff --git a/installation/language/en-GB/langmetadata.xml b/installation/language/en-GB/langmetadata.xml index edf4e3e969dd5..cf67a70077443 100644 --- a/installation/language/en-GB/langmetadata.xml +++ b/installation/language/en-GB/langmetadata.xml @@ -1,7 +1,7 @@ English (United Kingdom) - 4.4.9 + 4.4.8 2024-08 Joomla! Project (C) 2005 Open Source Matters, Inc. diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml index 19d9dee9d22e0..7ff6209ec81da 100644 --- a/language/en-GB/install.xml +++ b/language/en-GB/install.xml @@ -2,7 +2,7 @@ English (en-GB) en-GB - 4.4.9 + 4.4.8 2024-08 Joomla! Project admin@joomla.org diff --git a/language/en-GB/langmetadata.xml b/language/en-GB/langmetadata.xml index a25523036c1d1..079949372803e 100644 --- a/language/en-GB/langmetadata.xml +++ b/language/en-GB/langmetadata.xml @@ -1,7 +1,7 @@ English (en-GB) - 4.4.9 + 4.4.8 2024-08 Joomla! Project admin@joomla.org diff --git a/libraries/src/Version.php b/libraries/src/Version.php index 97f82f3440df9..1ba435b9208fc 100644 --- a/libraries/src/Version.php +++ b/libraries/src/Version.php @@ -55,7 +55,7 @@ final class Version * @var integer * @since 3.8.0 */ - public const PATCH_VERSION = 9; + public const PATCH_VERSION = 8; /** * Extra release version info. @@ -66,7 +66,7 @@ final class Version * @var string * @since 3.8.0 */ - public const EXTRA_VERSION = 'dev'; + public const EXTRA_VERSION = 'rc3'; /** * Development status. @@ -74,7 +74,7 @@ final class Version * @var string * @since 3.5 */ - public const DEV_STATUS = 'Development'; + public const DEV_STATUS = 'Release Candidate'; /** * Code name. @@ -90,7 +90,7 @@ final class Version * @var string * @since 3.5 */ - public const RELDATE = '24-August-2024'; + public const RELDATE = '26-August-2024'; /** * Release time. @@ -98,7 +98,7 @@ final class Version * @var string * @since 3.5 */ - public const RELTIME = '08:00'; + public const RELTIME = '19:00'; /** * Release timezone. diff --git a/package.json b/package.json index 8480631d6419f..8ca7df88d7101 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "joomla", - "version": "4.4.9", + "version": "4.4.8", "description": "Joomla CMS", "license": "GPL-2.0-or-later", "repository": { From b7903e5a0ebb085be201b9a75b6ff99982bd415c Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Mon, 26 Aug 2024 21:33:34 +0200 Subject: [PATCH 2/5] Revert to dev Signed-off-by: Martin Kopp --- administrator/language/en-GB/install.xml | 2 +- administrator/language/en-GB/langmetadata.xml | 2 +- administrator/manifests/files/joomla.xml | 2 +- administrator/manifests/packages/pkg_en-GB.xml | 2 +- api/language/en-GB/install.xml | 2 +- api/language/en-GB/langmetadata.xml | 2 +- installation/language/en-GB/langmetadata.xml | 2 +- language/en-GB/install.xml | 2 +- language/en-GB/langmetadata.xml | 2 +- libraries/src/Version.php | 8 ++++---- package.json | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml index a290f13571815..b736db8304d22 100644 --- a/administrator/language/en-GB/install.xml +++ b/administrator/language/en-GB/install.xml @@ -2,7 +2,7 @@ English (en-GB) en-GB - 4.4.8 + 4.4.9 2024-08 Joomla! Project admin@joomla.org diff --git a/administrator/language/en-GB/langmetadata.xml b/administrator/language/en-GB/langmetadata.xml index 110135ca248d3..9e6dd520b95bd 100644 --- a/administrator/language/en-GB/langmetadata.xml +++ b/administrator/language/en-GB/langmetadata.xml @@ -1,7 +1,7 @@ English (en-GB) - 4.4.8 + 4.4.9 2024-08 Joomla! Project admin@joomla.org diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index d31e7ae6ab554..ca1be4f3c207a 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -6,7 +6,7 @@ www.joomla.org (C) 2019 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt - 4.4.8-rc3 + 4.4.9-dev 2024-08 FILES_JOOMLA_XML_DESCRIPTION diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml index 1f48de25b3ee8..35f9447a35259 100644 --- a/administrator/manifests/packages/pkg_en-GB.xml +++ b/administrator/manifests/packages/pkg_en-GB.xml @@ -2,7 +2,7 @@ English (en-GB) Language Pack en-GB - 4.4.8.1 + 4.4.9.1 2024-08 Joomla! Project admin@joomla.org diff --git a/api/language/en-GB/install.xml b/api/language/en-GB/install.xml index 27c56b478aa83..2cf9dbeacd652 100644 --- a/api/language/en-GB/install.xml +++ b/api/language/en-GB/install.xml @@ -2,7 +2,7 @@ English (en-GB) en-GB - 4.4.8 + 4.4.9 2024-08 Joomla! Project admin@joomla.org diff --git a/api/language/en-GB/langmetadata.xml b/api/language/en-GB/langmetadata.xml index c5f1f3353c56d..269a63567e801 100644 --- a/api/language/en-GB/langmetadata.xml +++ b/api/language/en-GB/langmetadata.xml @@ -1,7 +1,7 @@ English (en-GB) - 4.4.8 + 4.4.9 2024-08 Joomla! Project admin@joomla.org diff --git a/installation/language/en-GB/langmetadata.xml b/installation/language/en-GB/langmetadata.xml index cf67a70077443..edf4e3e969dd5 100644 --- a/installation/language/en-GB/langmetadata.xml +++ b/installation/language/en-GB/langmetadata.xml @@ -1,7 +1,7 @@ English (United Kingdom) - 4.4.8 + 4.4.9 2024-08 Joomla! Project (C) 2005 Open Source Matters, Inc. diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml index 7ff6209ec81da..19d9dee9d22e0 100644 --- a/language/en-GB/install.xml +++ b/language/en-GB/install.xml @@ -2,7 +2,7 @@ English (en-GB) en-GB - 4.4.8 + 4.4.9 2024-08 Joomla! Project admin@joomla.org diff --git a/language/en-GB/langmetadata.xml b/language/en-GB/langmetadata.xml index 079949372803e..a25523036c1d1 100644 --- a/language/en-GB/langmetadata.xml +++ b/language/en-GB/langmetadata.xml @@ -1,7 +1,7 @@ English (en-GB) - 4.4.8 + 4.4.9 2024-08 Joomla! Project admin@joomla.org diff --git a/libraries/src/Version.php b/libraries/src/Version.php index 1ba435b9208fc..aec26163fe5bc 100644 --- a/libraries/src/Version.php +++ b/libraries/src/Version.php @@ -55,7 +55,7 @@ final class Version * @var integer * @since 3.8.0 */ - public const PATCH_VERSION = 8; + public const PATCH_VERSION = 9; /** * Extra release version info. @@ -66,7 +66,7 @@ final class Version * @var string * @since 3.8.0 */ - public const EXTRA_VERSION = 'rc3'; + public const EXTRA_VERSION = 'dev'; /** * Development status. @@ -74,7 +74,7 @@ final class Version * @var string * @since 3.5 */ - public const DEV_STATUS = 'Release Candidate'; + public const DEV_STATUS = 'Development'; /** * Code name. @@ -98,7 +98,7 @@ final class Version * @var string * @since 3.5 */ - public const RELTIME = '19:00'; + public const RELTIME = '19:01'; /** * Release timezone. diff --git a/package.json b/package.json index 8ca7df88d7101..8480631d6419f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "joomla", - "version": "4.4.8", + "version": "4.4.9", "description": "Joomla CMS", "license": "GPL-2.0-or-later", "repository": { From f2b11456988ca5a6f53a08fa791ab6d38df0e588 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Tue, 27 Aug 2024 11:09:57 +0200 Subject: [PATCH 3/5] Joomla! 4.4.8 Stable --- administrator/language/en-GB/install.xml | 2 +- administrator/language/en-GB/langmetadata.xml | 2 +- administrator/manifests/files/joomla.xml | 2 +- administrator/manifests/packages/pkg_en-GB.xml | 2 +- api/language/en-GB/install.xml | 2 +- api/language/en-GB/langmetadata.xml | 2 +- installation/language/en-GB/langmetadata.xml | 2 +- language/en-GB/install.xml | 2 +- language/en-GB/langmetadata.xml | 2 +- libraries/src/Version.php | 10 +++++----- package.json | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml index b736db8304d22..a290f13571815 100644 --- a/administrator/language/en-GB/install.xml +++ b/administrator/language/en-GB/install.xml @@ -2,7 +2,7 @@ English (en-GB) en-GB - 4.4.9 + 4.4.8 2024-08 Joomla! Project admin@joomla.org diff --git a/administrator/language/en-GB/langmetadata.xml b/administrator/language/en-GB/langmetadata.xml index 9e6dd520b95bd..110135ca248d3 100644 --- a/administrator/language/en-GB/langmetadata.xml +++ b/administrator/language/en-GB/langmetadata.xml @@ -1,7 +1,7 @@ English (en-GB) - 4.4.9 + 4.4.8 2024-08 Joomla! Project admin@joomla.org diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index ca1be4f3c207a..682f4f143d784 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -6,7 +6,7 @@ www.joomla.org (C) 2019 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt - 4.4.9-dev + 4.4.8 2024-08 FILES_JOOMLA_XML_DESCRIPTION diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml index 35f9447a35259..1f48de25b3ee8 100644 --- a/administrator/manifests/packages/pkg_en-GB.xml +++ b/administrator/manifests/packages/pkg_en-GB.xml @@ -2,7 +2,7 @@ English (en-GB) Language Pack en-GB - 4.4.9.1 + 4.4.8.1 2024-08 Joomla! Project admin@joomla.org diff --git a/api/language/en-GB/install.xml b/api/language/en-GB/install.xml index 2cf9dbeacd652..27c56b478aa83 100644 --- a/api/language/en-GB/install.xml +++ b/api/language/en-GB/install.xml @@ -2,7 +2,7 @@ English (en-GB) en-GB - 4.4.9 + 4.4.8 2024-08 Joomla! Project admin@joomla.org diff --git a/api/language/en-GB/langmetadata.xml b/api/language/en-GB/langmetadata.xml index 269a63567e801..c5f1f3353c56d 100644 --- a/api/language/en-GB/langmetadata.xml +++ b/api/language/en-GB/langmetadata.xml @@ -1,7 +1,7 @@ English (en-GB) - 4.4.9 + 4.4.8 2024-08 Joomla! Project admin@joomla.org diff --git a/installation/language/en-GB/langmetadata.xml b/installation/language/en-GB/langmetadata.xml index edf4e3e969dd5..cf67a70077443 100644 --- a/installation/language/en-GB/langmetadata.xml +++ b/installation/language/en-GB/langmetadata.xml @@ -1,7 +1,7 @@ English (United Kingdom) - 4.4.9 + 4.4.8 2024-08 Joomla! Project (C) 2005 Open Source Matters, Inc. diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml index 19d9dee9d22e0..7ff6209ec81da 100644 --- a/language/en-GB/install.xml +++ b/language/en-GB/install.xml @@ -2,7 +2,7 @@ English (en-GB) en-GB - 4.4.9 + 4.4.8 2024-08 Joomla! Project admin@joomla.org diff --git a/language/en-GB/langmetadata.xml b/language/en-GB/langmetadata.xml index a25523036c1d1..079949372803e 100644 --- a/language/en-GB/langmetadata.xml +++ b/language/en-GB/langmetadata.xml @@ -1,7 +1,7 @@ English (en-GB) - 4.4.9 + 4.4.8 2024-08 Joomla! Project admin@joomla.org diff --git a/libraries/src/Version.php b/libraries/src/Version.php index aec26163fe5bc..86cce32727d8d 100644 --- a/libraries/src/Version.php +++ b/libraries/src/Version.php @@ -55,7 +55,7 @@ final class Version * @var integer * @since 3.8.0 */ - public const PATCH_VERSION = 9; + public const PATCH_VERSION = 8; /** * Extra release version info. @@ -66,7 +66,7 @@ final class Version * @var string * @since 3.8.0 */ - public const EXTRA_VERSION = 'dev'; + public const EXTRA_VERSION = ''; /** * Development status. @@ -74,7 +74,7 @@ final class Version * @var string * @since 3.5 */ - public const DEV_STATUS = 'Development'; + public const DEV_STATUS = 'Stable'; /** * Code name. @@ -90,7 +90,7 @@ final class Version * @var string * @since 3.5 */ - public const RELDATE = '26-August-2024'; + public const RELDATE = '27-August-2024'; /** * Release time. @@ -98,7 +98,7 @@ final class Version * @var string * @since 3.5 */ - public const RELTIME = '19:01'; + public const RELTIME = '16:00'; /** * Release timezone. diff --git a/package.json b/package.json index 8480631d6419f..8ca7df88d7101 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "joomla", - "version": "4.4.9", + "version": "4.4.8", "description": "Joomla CMS", "license": "GPL-2.0-or-later", "repository": { From e491457e23da90c36c16f7e5d287efc0d2d32e76 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Tue, 27 Aug 2024 18:07:25 +0200 Subject: [PATCH 4/5] Revert to dev Signed-off-by: Martin Kopp --- administrator/language/en-GB/install.xml | 2 +- administrator/language/en-GB/langmetadata.xml | 2 +- administrator/manifests/files/joomla.xml | 2 +- administrator/manifests/packages/pkg_en-GB.xml | 2 +- api/language/en-GB/install.xml | 2 +- api/language/en-GB/langmetadata.xml | 2 +- installation/language/en-GB/langmetadata.xml | 2 +- language/en-GB/install.xml | 2 +- language/en-GB/langmetadata.xml | 2 +- libraries/src/Version.php | 8 ++++---- package.json | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml index a290f13571815..b736db8304d22 100644 --- a/administrator/language/en-GB/install.xml +++ b/administrator/language/en-GB/install.xml @@ -2,7 +2,7 @@ English (en-GB) en-GB - 4.4.8 + 4.4.9 2024-08 Joomla! Project admin@joomla.org diff --git a/administrator/language/en-GB/langmetadata.xml b/administrator/language/en-GB/langmetadata.xml index 110135ca248d3..9e6dd520b95bd 100644 --- a/administrator/language/en-GB/langmetadata.xml +++ b/administrator/language/en-GB/langmetadata.xml @@ -1,7 +1,7 @@ English (en-GB) - 4.4.8 + 4.4.9 2024-08 Joomla! Project admin@joomla.org diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index 682f4f143d784..ca1be4f3c207a 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -6,7 +6,7 @@ www.joomla.org (C) 2019 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt - 4.4.8 + 4.4.9-dev 2024-08 FILES_JOOMLA_XML_DESCRIPTION diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml index 1f48de25b3ee8..35f9447a35259 100644 --- a/administrator/manifests/packages/pkg_en-GB.xml +++ b/administrator/manifests/packages/pkg_en-GB.xml @@ -2,7 +2,7 @@ English (en-GB) Language Pack en-GB - 4.4.8.1 + 4.4.9.1 2024-08 Joomla! Project admin@joomla.org diff --git a/api/language/en-GB/install.xml b/api/language/en-GB/install.xml index 27c56b478aa83..2cf9dbeacd652 100644 --- a/api/language/en-GB/install.xml +++ b/api/language/en-GB/install.xml @@ -2,7 +2,7 @@ English (en-GB) en-GB - 4.4.8 + 4.4.9 2024-08 Joomla! Project admin@joomla.org diff --git a/api/language/en-GB/langmetadata.xml b/api/language/en-GB/langmetadata.xml index c5f1f3353c56d..269a63567e801 100644 --- a/api/language/en-GB/langmetadata.xml +++ b/api/language/en-GB/langmetadata.xml @@ -1,7 +1,7 @@ English (en-GB) - 4.4.8 + 4.4.9 2024-08 Joomla! Project admin@joomla.org diff --git a/installation/language/en-GB/langmetadata.xml b/installation/language/en-GB/langmetadata.xml index cf67a70077443..edf4e3e969dd5 100644 --- a/installation/language/en-GB/langmetadata.xml +++ b/installation/language/en-GB/langmetadata.xml @@ -1,7 +1,7 @@ English (United Kingdom) - 4.4.8 + 4.4.9 2024-08 Joomla! Project (C) 2005 Open Source Matters, Inc. diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml index 7ff6209ec81da..19d9dee9d22e0 100644 --- a/language/en-GB/install.xml +++ b/language/en-GB/install.xml @@ -2,7 +2,7 @@ English (en-GB) en-GB - 4.4.8 + 4.4.9 2024-08 Joomla! Project admin@joomla.org diff --git a/language/en-GB/langmetadata.xml b/language/en-GB/langmetadata.xml index 079949372803e..a25523036c1d1 100644 --- a/language/en-GB/langmetadata.xml +++ b/language/en-GB/langmetadata.xml @@ -1,7 +1,7 @@ English (en-GB) - 4.4.8 + 4.4.9 2024-08 Joomla! Project admin@joomla.org diff --git a/libraries/src/Version.php b/libraries/src/Version.php index 86cce32727d8d..73978a3fc0854 100644 --- a/libraries/src/Version.php +++ b/libraries/src/Version.php @@ -55,7 +55,7 @@ final class Version * @var integer * @since 3.8.0 */ - public const PATCH_VERSION = 8; + public const PATCH_VERSION = 9; /** * Extra release version info. @@ -66,7 +66,7 @@ final class Version * @var string * @since 3.8.0 */ - public const EXTRA_VERSION = ''; + public const EXTRA_VERSION = 'dev'; /** * Development status. @@ -74,7 +74,7 @@ final class Version * @var string * @since 3.5 */ - public const DEV_STATUS = 'Stable'; + public const DEV_STATUS = 'Development'; /** * Code name. @@ -98,7 +98,7 @@ final class Version * @var string * @since 3.5 */ - public const RELTIME = '16:00'; + public const RELTIME = '16:01'; /** * Release timezone. diff --git a/package.json b/package.json index 8ca7df88d7101..8480631d6419f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "joomla", - "version": "4.4.8", + "version": "4.4.9", "description": "Joomla CMS", "license": "GPL-2.0-or-later", "repository": { From 53a33903eddd3ae1b1ec0d49d2f97fc2dbf1643d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Heiko=20L=C3=BCbbe?= Date: Thu, 29 Aug 2024 11:36:39 +0200 Subject: [PATCH 5/5] [cypress] PostgreSQL Connection pool for System Tests (#43924) * Use Connection pool for PostgreSQL in System Tests Sometimes single specs in the System Tests fail with: CypressError: `cy.task('queryDB')` failed with the following error: > duplicate key value violates unique constraint "cpostgresmax_users_pkey" The error happens on different specs in System Tests especially running on drone. It could be reproduced in running the System Tests tree times (first with installation, 2nd and 3rd run w/o): npx cypress run npx cypress run --spec 'tests/System/integration/administrator/**/*.cy.{js,jsx,ts,tsx},tests/System/integration/site/**/*.cy.{js,jsx,ts,tsx},tests/System/integration/api/**/*.cy.{js,jsx,ts,tsx},tests/System/integration/plugins/**/*.cy.{js,jsx,ts,tsx}' npx cypress run --spec 'tests/System/integration/administrator/**/*.cy.{js,jsx,ts,tsx},tests/System/integration/site/**/*.cy.{js,jsx,ts,tsx},tests/System/integration/api/**/*.cy.{js,jsx,ts,tsx},tests/System/integration/plugins/**/*.cy.{js,jsx,ts,tsx}' Checking the session usage in pgAdmin shows the maximum number of 100 configured sessions appears to have been reached. Therefore the usage of postgres connection pool is implemented. The session usage is reduced to max 12 and the error could no more reproduced. * Simplify implementation - Delete function as only called once - Renamed to postgresConnectionPool Contributed by @laoneo --------- Co-authored-by: Allon Moritz --- tests/System/plugins/db.mjs | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/tests/System/plugins/db.mjs b/tests/System/plugins/db.mjs index c829819eef1fc..7fbdacd972e0a 100644 --- a/tests/System/plugins/db.mjs +++ b/tests/System/plugins/db.mjs @@ -4,6 +4,10 @@ import postgres from 'postgres'; // Items cache which are added by an insert statement let insertedItems = []; +// Use of the PostgreSQL connection pool to limit the number of sessions, see +// https://github.com/porsager/postgres?tab=readme-ov-file#connection-details +let postgresConnectionPool = null; + /** * Does run the given query against the database from the configuration. It caches all inserted items. * @@ -29,17 +33,20 @@ function queryTestDB(joomlaQuery, config) { insertedItems.push(insertItem); } - // Check if the DB is from postgres + // Do we use PostgreSQL? if (config.env.db_type === 'pgsql' || config.env.db_type === 'PostgreSQL (PDO)') { - const connection = postgres({ - host: config.env.db_host, - port: config.env.db_port, - database: config.env.db_name, - username: config.env.db_user, - password: config.env.db_password, - idle_timeout: 1, - max_lifetime: 1, - }); + + if (postgresConnectionPool === null) { + // Initialisation on the first call + postgresConnectionPool = postgres({ + host: config.env.db_host, + port: config.env.db_port, + database: config.env.db_name, + username: config.env.db_user, + password: config.env.db_password, + max: 10, // Use only this (unchanged default) maximum number of connections in the pool + }); + } // Postgres delivers the data direct as result of the insert query if (insertItem) { @@ -49,7 +56,7 @@ function queryTestDB(joomlaQuery, config) { // Postgres needs double quotes query = query.replaceAll('`', '"'); - return connection.unsafe(query).then((result) => { + return postgresConnectionPool.unsafe(query).then((result) => { // Select query should always return an array if (query.indexOf('SELECT') === 0 && !Array.isArray(result)) { return [result]; @@ -64,12 +71,12 @@ function queryTestDB(joomlaQuery, config) { insertItem.rows.push(result[0].id); } - // Normalize the object + // Normalize the object and return from PostgreSQL return { insertId: result[0].id }; }); } - // Return a promise which runs the query + // Return a promise which runs the query for MariaDB / MySQL return new Promise((resolve, reject) => { // Create the connection and connect const connection = mysql.createConnection({ @@ -94,7 +101,7 @@ function queryTestDB(joomlaQuery, config) { insertItem.rows.push(results.insertId); } - // Resolve the result + // Resolve the result from MariaDB / MySQL return resolve(results); }); });