pgadmin-org · asheshv · Apr 24, 2026 · Apr 24, 2026
diff --git a/requirements.txt b/requirements.txt
@@ -12,7 +12,8 @@
 # relevant packages.
 ###############################################################################
 
-Authlib==1.7.0
+Authlib==1.6.*; python_version <= '3.9'
+Authlib==1.7.*; python_version > '3.9'
 azure-identity==1.25.3
 azure-mgmt-rdbms==10.1.1
 azure-mgmt-resource==25.0.0
@@ -31,7 +32,8 @@ Flask-Security-Too==5.4.*; python_version <= '3.9'
 Flask-Security-Too==5.8.*; python_version > '3.9'
 Flask-SocketIO==5.6.*
 Flask-SQLAlchemy==3.1.*
-Flask-WTF==1.3.*
+Flask-WTF==1.2.*; python_version <= '3.9'
+Flask-WTF==1.3.*; python_version > '3.9'
 Flask==3.1.*
 google-api-python-client==2.*
 google-auth-oauthlib==1.3.1

diff --git a/...atabases/foreign_data_wrappers/foreign_servers/tests/pg/default/alter_comment_version.sql b/...atabases/foreign_data_wrappers/foreign_servers/tests/pg/default/alter_comment_version.sql
@@ -7,7 +7,7 @@ CREATE SERVER "FS_$%{}[]()&*^!@""'`\/#"
     FOREIGN DATA WRAPPER test_fdw_for_fs;
 
 ALTER SERVER "FS_$%{}[]()&*^!@""'`\/#"
-    OWNER TO postgres;
+    OWNER TO <OWNER>;
 
 COMMENT ON SERVER "FS_$%{}[]()&*^!@""'`\/#"
     IS 'Test comment';
diff --git a/...bases/foreign_data_wrappers/foreign_servers/tests/pg/default/alter_options_privileges.sql b/...bases/foreign_data_wrappers/foreign_servers/tests/pg/default/alter_options_privileges.sql
@@ -8,11 +8,11 @@ CREATE SERVER "FS_$%{}[]()&*^!@""'`\/#"
     OPTIONS (host '192.168.1.1', dbname 'edb', port '5450');
 
 ALTER SERVER "FS_$%{}[]()&*^!@""'`\/#"
-    OWNER TO postgres;
+    OWNER TO <OWNER>;
 
 COMMENT ON SERVER "FS_$%{}[]()&*^!@""'`\/#"
     IS 'Test comment';
 
 GRANT USAGE ON FOREIGN SERVER "FS_$%{}[]()&*^!@""'`\/#" TO PUBLIC;
-GRANT USAGE ON FOREIGN SERVER "FS_$%{}[]()&*^!@""'`\/#" TO postgres;
+GRANT USAGE ON FOREIGN SERVER "FS_$%{}[]()&*^!@""'`\/#" TO <OWNER>;
 
diff --git a/...ases/foreign_data_wrappers/foreign_servers/tests/pg/default/alter_remove_options_priv.sql b/...ases/foreign_data_wrappers/foreign_servers/tests/pg/default/alter_remove_options_priv.sql
@@ -7,9 +7,9 @@ CREATE SERVER "FS_$%{}[]()&*^!@""'`\/#"
     FOREIGN DATA WRAPPER test_fdw_for_fs;
 
 ALTER SERVER "FS_$%{}[]()&*^!@""'`\/#"
-    OWNER TO postgres;
+    OWNER TO <OWNER>;
 
 COMMENT ON SERVER "FS_$%{}[]()&*^!@""'`\/#"
     IS 'Test comment';
 
-GRANT USAGE ON FOREIGN SERVER "FS_$%{}[]()&*^!@""'`\/#" TO postgres;
+GRANT USAGE ON FOREIGN SERVER "FS_$%{}[]()&*^!@""'`\/#" TO <OWNER>;
diff --git a/...atabases/foreign_data_wrappers/foreign_servers/tests/pg/default/create_fs_all_options.sql b/...atabases/foreign_data_wrappers/foreign_servers/tests/pg/default/create_fs_all_options.sql
@@ -9,10 +9,10 @@ CREATE SERVER "FS_$%{}[]()&*^!@""'`\/#"
     OPTIONS (host '192.168.1.1', dbname 'edb', port '5450');
 
 ALTER SERVER "FS_$%{}[]()&*^!@""'`\/#"
-    OWNER TO postgres;
+    OWNER TO <OWNER>;
 
 COMMENT ON SERVER "FS_$%{}[]()&*^!@""'`\/#"
     IS 'Test comment';
 
 GRANT USAGE ON FOREIGN SERVER "FS_$%{}[]()&*^!@""'`\/#" TO PUBLIC;
-GRANT USAGE ON FOREIGN SERVER "FS_$%{}[]()&*^!@""'`\/#" TO postgres;
+GRANT USAGE ON FOREIGN SERVER "FS_$%{}[]()&*^!@""'`\/#" TO <OWNER>;
diff --git a/...ses/foreign_data_wrappers/foreign_servers/tests/pg/default/create_fs_all_options_msql.sql b/...ses/foreign_data_wrappers/foreign_servers/tests/pg/default/create_fs_all_options_msql.sql
@@ -5,7 +5,7 @@ CREATE SERVER "FS_$%{}[]()&*^!@""'`\/#"
     OPTIONS (host '192.168.1.1', dbname 'edb', port '5450');
 
 ALTER SERVER "FS_$%{}[]()&*^!@""'`\/#"
-    OWNER TO postgres;
+    OWNER TO <OWNER>;
 
 COMMENT ON SERVER "FS_$%{}[]()&*^!@""'`\/#"
     IS 'Test comment';

diff --git a/...atabases/foreign_data_wrappers/foreign_servers/tests/pg/default/test_foreign_servers.json b/...atabases/foreign_data_wrappers/foreign_servers/tests/pg/default/test_foreign_servers.json
@@ -32,11 +32,11 @@
             "fsrvoption":"port",
             "fsrvvalue":"5450"
           }],
-        "fsrvowner":"postgres",
+        "fsrvowner":"<OWNER>",
         "description":"Test comment",
         "fsrvacl":[{
           "grantee":"PUBLIC",
-          "grantor":"postgres",
+          "grantor":"<OWNER>",
           "privileges":[{
             "privilege_type":"U",
             "privilege":true,
@@ -60,7 +60,7 @@
       "sql_endpoint": "NODE-foreign_server.sql_id",
       "data": {
         "name":"FS_$%{}[]()&*^!@\"'`\\/#",
-        "fsrvowner":"postgres"
+        "fsrvowner":"<OWNER>"
       }
     }, {
       "type": "alter",
@@ -96,7 +96,7 @@
         "fsrvacl":{
           "added": [{
             "grantee":"PUBLIC",
-            "grantor":"postgres",
+            "grantor":"<OWNER>",
             "privileges":[{
               "privilege_type":"U",
               "privilege":true,
@@ -129,7 +129,7 @@
         "fsrvacl":{
           "deleted": [{
             "grantee":"PUBLIC",
-            "grantor":"postgres",
+            "grantor":"<OWNER>",
             "privileges":[{
               "privilege_type":"U",
               "privilege":true,

diff --git a/...es/foreign_data_wrappers/foreign_servers/user_mappings/tests/pg/default/alter_options.sql b/...es/foreign_data_wrappers/foreign_servers/user_mappings/tests/pg/default/alter_options.sql
@@ -1,6 +1,6 @@
--- User Mapping : postgres
+-- User Mapping : <OWNER>
 
--- DROP USER MAPPING IF EXISTS FOR postgres SERVER test_fs_for_user_mapping
+-- DROP USER MAPPING IF EXISTS FOR <OWNER> SERVER test_fs_for_user_mapping
 
-CREATE USER MAPPING FOR postgres SERVER test_fs_for_user_mapping
+CREATE USER MAPPING FOR <OWNER> SERVER test_fs_for_user_mapping
     OPTIONS ("user" 'test_user12', password 'secret123');
diff --git a/...gn_data_wrappers/foreign_servers/user_mappings/tests/pg/default/alter_options_deleted.sql b/...gn_data_wrappers/foreign_servers/user_mappings/tests/pg/default/alter_options_deleted.sql
@@ -1,5 +1,5 @@
--- User Mapping : postgres
+-- User Mapping : <OWNER>
 
--- DROP USER MAPPING IF EXISTS FOR postgres SERVER test_fs_for_user_mapping
+-- DROP USER MAPPING IF EXISTS FOR <OWNER> SERVER test_fs_for_user_mapping
 
-CREATE USER MAPPING FOR postgres SERVER test_fs_for_user_mapping;
+CREATE USER MAPPING FOR <OWNER> SERVER test_fs_for_user_mapping;
diff --git a/...ta_wrappers/foreign_servers/user_mappings/tests/pg/default/alter_options_deleted_msql.sql b/...ta_wrappers/foreign_servers/user_mappings/tests/pg/default/alter_options_deleted_msql.sql
@@ -1,2 +1,2 @@
-ALTER USER MAPPING FOR postgres SERVER test_fs_for_user_mapping
+ALTER USER MAPPING FOR <OWNER> SERVER test_fs_for_user_mapping
     OPTIONS (DROP "user", DROP password);
diff --git a/...reign_data_wrappers/foreign_servers/user_mappings/tests/pg/default/alter_options_msql.sql b/...reign_data_wrappers/foreign_servers/user_mappings/tests/pg/default/alter_options_msql.sql
@@ -1,2 +1,2 @@
-ALTER USER MAPPING FOR postgres SERVER test_fs_for_user_mapping
+ALTER USER MAPPING FOR <OWNER> SERVER test_fs_for_user_mapping
     OPTIONS (SET "user" 'test_user12', SET password 'secret123');
diff --git a/...eign_data_wrappers/foreign_servers/user_mappings/tests/pg/default/create_user_mapping.sql b/...eign_data_wrappers/foreign_servers/user_mappings/tests/pg/default/create_user_mapping.sql
@@ -1,6 +1,6 @@
--- User Mapping : postgres
+-- User Mapping : <OWNER>
 
--- DROP USER MAPPING IF EXISTS FOR postgres SERVER test_fs_for_user_mapping
+-- DROP USER MAPPING IF EXISTS FOR <OWNER> SERVER test_fs_for_user_mapping
 
-CREATE USER MAPPING FOR postgres SERVER test_fs_for_user_mapping
+CREATE USER MAPPING FOR <OWNER> SERVER test_fs_for_user_mapping
     OPTIONS ("user" 'test_user', password 'secret');
diff --git a/...data_wrappers/foreign_servers/user_mappings/tests/pg/default/create_user_mapping_msql.sql b/...data_wrappers/foreign_servers/user_mappings/tests/pg/default/create_user_mapping_msql.sql
@@ -1,2 +1,2 @@
-CREATE USER MAPPING FOR postgres SERVER test_fs_for_user_mapping
+CREATE USER MAPPING FOR <OWNER> SERVER test_fs_for_user_mapping
     OPTIONS ("user" 'test_user', password 'secret');
diff --git a/...eign_data_wrappers/foreign_servers/user_mappings/tests/pg/default/test_user_mappings.json b/...eign_data_wrappers/foreign_servers/user_mappings/tests/pg/default/test_user_mappings.json
@@ -27,7 +27,7 @@
       "sql_endpoint": "NODE-user_mapping.sql_id",
       "msql_endpoint": "NODE-user_mapping.msql",
       "data": {
-        "name": "postgres",
+        "name": "<OWNER>",
         "umoptions":[{
           "umoption":"user",
           "umvalue":"test_user"

diff --git a/..._groups/servers/databases/foreign_data_wrappers/tests/pg/default/alter_fdw_privileges.sql b/..._groups/servers/databases/foreign_data_wrappers/tests/pg/default/alter_fdw_privileges.sql
@@ -13,4 +13,4 @@ COMMENT ON FOREIGN DATA WRAPPER "Fdw2_$%{}[]()&*^!@""'`\/#"
     IS 'a comment';
 
 GRANT USAGE ON FOREIGN DATA WRAPPER "Fdw2_$%{}[]()&*^!@""'`\/#" TO PUBLIC;
-GRANT USAGE ON FOREIGN DATA WRAPPER "Fdw2_$%{}[]()&*^!@""'`\/#" TO postgres WITH GRANT OPTION;
+GRANT USAGE ON FOREIGN DATA WRAPPER "Fdw2_$%{}[]()&*^!@""'`\/#" TO <OWNER> WITH GRANT OPTION;
diff --git a/.../browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/default/test.json b/.../browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/default/test.json
@@ -103,16 +103,16 @@
         "fdwacl": {
           "added":[{
             "grantee": "PUBLIC",
-            "grantor": "postgres",
+            "grantor": "<OWNER>",
             "privileges":[
               {
                 "privilege_type": "U",
                 "privilege": true,
                 "with_grant": false
               }]
           },{
-            "grantee": "postgres",
-            "grantor": "postgres",
+            "grantee": "<OWNER>",
+            "grantor": "<OWNER>",
             "privileges":[{
               "privilege_type": "U",
               "privilege": true,

diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/language_test_data.json b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/language_test_data.json
@@ -262,7 +262,7 @@
             "lanproc": "plpgsql_call_handler",
             "lanval": null,
             "description": null,
-            "lanowner": "postgres",
+            "lanowner": "<OWNER>",
             "laninl": null,
             "seclabels": null
           }

diff --git a/...r/server_groups/servers/databases/languages/tests/pg/default/alter_comment_privileges.sql b/...r/server_groups/servers/databases/languages/tests/pg/default/alter_comment_privileges.sql
@@ -15,4 +15,4 @@ COMMENT ON LANGUAGE "Lan2_$%{}[]()&*^!@""'`\/#"
 
 GRANT USAGE ON LANGUAGE "Lan2_$%{}[]()&*^!@""'`\/#" TO PUBLIC;
 
-GRANT USAGE ON LANGUAGE "Lan2_$%{}[]()&*^!@""'`\/#" TO postgres WITH GRANT OPTION;
+GRANT USAGE ON LANGUAGE "Lan2_$%{}[]()&*^!@""'`\/#" TO <OWNER> WITH GRANT OPTION;
diff --git a/...ver_groups/servers/databases/languages/tests/pg/default/alter_comment_privileges_msql.sql b/...ver_groups/servers/databases/languages/tests/pg/default/alter_comment_privileges_msql.sql
@@ -3,4 +3,4 @@ COMMENT ON LANGUAGE "Lan2_$%{}[]()&*^!@""'`\/#"
 
 GRANT USAGE ON LANGUAGE "Lan2_$%{}[]()&*^!@""'`\/#" TO PUBLIC;
 
-GRANT USAGE ON LANGUAGE "Lan2_$%{}[]()&*^!@""'`\/#" TO postgres WITH GRANT OPTION;
+GRANT USAGE ON LANGUAGE "Lan2_$%{}[]()&*^!@""'`\/#" TO <OWNER> WITH GRANT OPTION;
diff --git a/...rver_groups/servers/databases/languages/tests/pg/default/alter_revoke_privileges_msql.sql b/...rver_groups/servers/databases/languages/tests/pg/default/alter_revoke_privileges_msql.sql
@@ -1,2 +1,2 @@
 REVOKE ALL ON LANGUAGE "Lan2_$%{}[]()&*^!@""'`\/#" FROM PUBLIC;
-REVOKE ALL ON LANGUAGE "Lan2_$%{}[]()&*^!@""'`\/#" FROM postgres;
+REVOKE ALL ON LANGUAGE "Lan2_$%{}[]()&*^!@""'`\/#" FROM <OWNER>;
diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/default/test.json b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/default/test.json
@@ -40,16 +40,16 @@
         "lanacl": {
           "added":[{
             "grantee": "PUBLIC",
-            "grantor": "postgres",
+            "grantor": "<OWNER>",
             "privileges":[
               {
                 "privilege_type": "U",
                 "privilege": true,
                 "with_grant": false
               }]
           },{
-            "grantee": "postgres",
-            "grantor": "postgres",
+            "grantee": "<OWNER>",
+            "grantor": "<OWNER>",
             "privileges":[{
               "privilege_type": "U",
               "privilege": true,
@@ -70,16 +70,16 @@
         "lanacl": {
           "deleted":[{
             "grantee": "PUBLIC",
-            "grantor": "postgres",
+            "grantor": "<OWNER>",
             "privileges":[
               {
                 "privilege_type": "U",
                 "privilege": true,
                 "with_grant": false
               }]
           },{
-            "grantee": "postgres",
-            "grantor": "postgres",
+            "grantee": "<OWNER>",
+            "grantor": "<OWNER>",
             "privileges":[{
               "privilege_type": "U",
               "privilege": true,

diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/test.json
@@ -64,7 +64,7 @@
         "evnt_update": true,
         "evnt_delete": false,
         "evnt_truncate": false,
-        "pubowner": "postgres",
+        "pubowner": "<OWNER>",
         "publish_via_partition_root": false,
         "all_table": true,
         "pubtable": ""
@@ -116,11 +116,13 @@
         "evnt_update": true,
         "evnt_delete": true,
         "evnt_truncate": true,
-        "pubowner": "postgres",
+        "pubowner": "<OWNER>",
         "publish_via_partition_root": false,
         "all_table": false,
         "only_table": false,
-        "pubtable": ["public.test_table_publication"]
+        "pubtable": [
+          "public.test_table_publication"
+        ]
       },
       "expected_sql_file": "create_publication_few_tables.sql",
       "expected_msql_file": "create_publication_few_tables_msql.sql"
@@ -132,7 +134,10 @@
       "sql_endpoint": "NODE-publication.sql_id",
       "msql_endpoint": "NODE-publication.msql_id",
       "data": {
-        "pubtable": ["public.test_table_publication", "public.test_table_publication_2"]
+        "pubtable": [
+          "public.test_table_publication",
+          "public.test_table_publication_2"
+        ]
       },
       "expected_sql_file": "alter_publication_add_tables.sql",
       "expected_msql_file": "alter_publication_add_tables_msql.sql"
@@ -144,7 +149,9 @@
       "sql_endpoint": "NODE-publication.sql_id",
       "msql_endpoint": "NODE-publication.msql_id",
       "data": {
-        "pubtable": ["public.test_table_publication_2"]
+        "pubtable": [
+          "public.test_table_publication_2"
+        ]
       },
       "expected_sql_file": "alter_publication_drop_tables.sql",
       "expected_msql_file": "alter_publication_drop_tables_msql.sql"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,4 +15,4 @@ COMMENT ON LANGUAGE "Lan2_$%{}[]()&*^!@""'`\/#"

		GRANT USAGE ON LANGUAGE "Lan2_$%{}[]()&*^!@""'`\/#" TO PUBLIC;

		GRANT USAGE ON LANGUAGE "Lan2_$%{}[]()&*^!@""'`\/#" TO postgres WITH GRANT OPTION;
		GRANT USAGE ON LANGUAGE "Lan2_$%{}[]()&*^!@""'`\/#" TO <OWNER> WITH GRANT OPTION;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,4 @@ COMMENT ON LANGUAGE "Lan2_$%{}[]()&*^!@""'`\/#"

		GRANT USAGE ON LANGUAGE "Lan2_$%{}[]()&*^!@""'`\/#" TO PUBLIC;

		GRANT USAGE ON LANGUAGE "Lan2_$%{}[]()&*^!@""'`\/#" TO postgres WITH GRANT OPTION;
		GRANT USAGE ON LANGUAGE "Lan2_$%{}[]()&*^!@""'`\/#" TO <OWNER> WITH GRANT OPTION;