Skip to content

Commit

Permalink
1) Added 'load_balance_hosts' connection string parameter for PG 16 a…
Browse files Browse the repository at this point in the history
…nd above. #6802

2) Added EPAS 11 support back as its EOL is in November.
  • Loading branch information
akshay-joshi committed Oct 4, 2023
1 parent 0b3c798 commit 9666bd6
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/run-feature-tests-epas.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-python-tests-epas.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
2 changes: 2 additions & 0 deletions docs/en_US/release_notes_7_8.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
************
Expand All @@ -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.
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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')]
}];
}
}
6 changes: 3 additions & 3 deletions web/pgadmin/utils/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@

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},
Expand All @@ -82,9 +85,6 @@
"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": [
Expand Down

0 comments on commit 9666bd6

Please sign in to comment.