From 9666bd6c8d861750e911f84b389ff0d41af52b27 Mon Sep 17 00:00:00 2001
From: Akshay Joshi <akshay.joshi@enterprisedb.com>
Date: Wed, 4 Oct 2023 17:54:56 +0530
Subject: [PATCH] 1) Added 'load_balance_hosts' connection string parameter for
 PG 16 and above. #6802 2) Added EPAS 11 support back as its EOL is in
 November.

---
 .github/workflows/run-feature-tests-epas.yml                | 2 +-
 .github/workflows/run-python-tests-epas.yml                 | 2 +-
 docs/en_US/release_notes_7_8.rst                            | 2 ++
 requirements.txt                                            | 2 +-
 .../browser/server_groups/servers/static/js/server.ui.js    | 4 ++++
 web/pgadmin/utils/constants.py                              | 6 +++---
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/run-feature-tests-epas.yml b/.github/workflows/run-feature-tests-epas.yml
index 63592fd86..f7f45d705 100644
--- a/.github/workflows/run-feature-tests-epas.yml
+++ b/.github/workflows/run-feature-tests-epas.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pgver: [12, 13, 14, 15]
+        pgver: [11, 12, 13, 14, 15]
 
     runs-on: ubuntu-latest
 
diff --git a/.github/workflows/run-python-tests-epas.yml b/.github/workflows/run-python-tests-epas.yml
index 1b9c90273..ddf118041 100644
--- a/.github/workflows/run-python-tests-epas.yml
+++ b/.github/workflows/run-python-tests-epas.yml
@@ -32,7 +32,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04, windows-latest]
-        pgver: [12, 13, 14, 15]
+        pgver: [11, 12, 13, 14, 15]
 
     runs-on: ${{ matrix.os }}
 
diff --git a/docs/en_US/release_notes_7_8.rst b/docs/en_US/release_notes_7_8.rst
index c545889ec..ee8afc29d 100644
--- a/docs/en_US/release_notes_7_8.rst
+++ b/docs/en_US/release_notes_7_8.rst
@@ -23,6 +23,7 @@ New features
   | `Issue #640 <https://github.com/pgadmin-org/pgadmin4/issues/640>`_ -    Add support for foreign table's new functionality for PG 11 and above.
   | `Issue #6373 <https://github.com/pgadmin-org/pgadmin4/issues/6373>`_ -  Add 'GENERATED ALWAYS AS..' option while creating column constraints for Foreign Table.
   | `Issue #6797 <https://github.com/pgadmin-org/pgadmin4/issues/6797>`_ -  GUI representation of the system's activity using the 'system_stats' extension.
+  | `Issue #6802 <https://github.com/pgadmin-org/pgadmin4/issues/6802>`_ -  Added 'load_balance_hosts' connection string parameter for PG 16 and above.
 
 Housekeeping
 ************
@@ -36,3 +37,4 @@ Bug fixes
   | `Issue #6674 <https://github.com/pgadmin-org/pgadmin4/issues/6674>`_ -  Fix an issue where foreign table column name becomes "none" if the user changes any column data type.
   | `Issue #6718 <https://github.com/pgadmin-org/pgadmin4/issues/6718>`_ -  Pin the cryptography version to fix PyO3 modules initialisation error.
   | `Issue #6790 <https://github.com/pgadmin-org/pgadmin4/issues/6790>`_ -  Ensure that the backup works properly for PG 16 on the latest docker image.
+  | `Issue #6799 <https://github.com/pgadmin-org/pgadmin4/issues/6799>`_ -  Fixed an issue where the user is unable to select objects on the backup dialog due to tree flickering.
diff --git a/requirements.txt b/requirements.txt
index eb72a7c91..41766ac54 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -27,7 +27,7 @@ pytz==2023.*
 speaklater3==1.*
 sqlparse==0.*
 psutil==5.9.*
-psycopg[c]==3.1.9
+psycopg[c]==3.1.12
 python-dateutil==2.*
 SQLAlchemy==2.*
 bcrypt==4.0.*
diff --git a/web/pgadmin/browser/server_groups/servers/static/js/server.ui.js b/web/pgadmin/browser/server_groups/servers/static/js/server.ui.js
index ff08f8a7b..8eb22dca2 100644
--- a/web/pgadmin/browser/server_groups/servers/static/js/server.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/static/js/server.ui.js
@@ -490,6 +490,10 @@ export default class ServerSchema extends BaseUISchema {
       'vartype': 'enum',
       'enumvals': [gettext('any'), gettext('read-write'), gettext('read-only'),
         gettext('primary'), gettext('standby'), gettext('prefer-standby')]
+    }, {
+      'value': 'load_balance_hosts', 'label': gettext('Load balance hosts'),
+      'vartype': 'enum', 'min_server_version': '16',
+      'enumvals': [gettext('disable'), gettext('random')]
     }];
   }
 }
diff --git a/web/pgadmin/utils/constants.py b/web/pgadmin/utils/constants.py
index cd3ff8d0f..13fd66b85 100644
--- a/web/pgadmin/utils/constants.py
+++ b/web/pgadmin/utils/constants.py
@@ -71,6 +71,9 @@ SUPPORTED_AUTH_SOURCES = [INTERNAL,
 
 BINARY_PATHS = {
     "as_bin_paths": [
+        {"version": "110000", "next_major_version": "120000",
+         "serverType": gettext("EDB Advanced Server 11"), "binaryPath": None,
+         "isDefault": False},
         {"version": "120000", "next_major_version": "130000",
          "serverType": gettext("EDB Advanced Server 12"), "binaryPath": None,
          "isDefault": False},
@@ -82,9 +85,6 @@ BINARY_PATHS = {
          "isDefault": False},
         {"version": "150000", "next_major_version": "160000",
          "serverType": gettext("EDB Advanced Server 15"), "binaryPath": None,
-         "isDefault": False},
-        {"version": "160000", "next_major_version": "170000",
-         "serverType": gettext("EDB Advanced Server 16"), "binaryPath": None,
          "isDefault": False}
     ],
     "pg_bin_paths": [