pgAdmin 4 commit: Ensure that the 'Remove Server' option should be visi

2020-09-24 Thread Akshay Joshi
Ensure that the 'Remove Server' option should be visible in the context menu. 
Fixes #5861

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=c1d04747a160a548768b4aa732f50262bc8ef4cc
Author: Pradip Parkale 

Modified Files
--
docs/en_US/release_notes_4_27.rst|  3 ++-
.../browser/server_groups/servers/static/js/server.js| 12 ++--
2 files changed, 12 insertions(+), 3 deletions(-)



pgAdmin 4 commit: Fixed an issue where schema diff is showing identical

2020-09-24 Thread Akshay Joshi
Fixed an issue where schema diff is showing identical table as different due to 
default vacuum settings. Fixes #5826

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=68588fbb4401cd7b6743f75772b1e57b155c8c64

Modified Files
--
docs/en_US/release_notes_4_27.rst |  1 +
.../servers/databases/schemas/tables/schema_diff_utils.py |  3 ++-
.../servers/databases/schemas/views/__init__.py   |  2 +-
web/pgadmin/tools/schema_diff/__init__.py |  2 ++
web/pgadmin/tools/schema_diff/compare.py  |  2 --
web/pgadmin/tools/schema_diff/directory_compare.py| 15 +++
6 files changed, 21 insertions(+), 4 deletions(-)



pgAdmin 4 commit: Added the 'PARALLEL UNSAFE' option to the missing SQL

2020-09-24 Thread Akshay Joshi
Added the 'PARALLEL UNSAFE' option to the missing SQL files.

refs #5843

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=f8611416ec99e094a71bb0ba0f3d404b68b3b580
Author: Pradip Parkale 

Modified Files
--
.../templates/functions/pg/sql/9.6_plus/create.sql |  4 +--
.../functions/pg/sql/9.6_plus/properties.sql   | 35 ++
2 files changed, 37 insertions(+), 2 deletions(-)



[pgAdmin] Fix incorrect import in setup.py

2020-09-24 Thread Azad Salahlı
Hi,

First time posting here. I've attached a fix for an incorrect import
in `setup.py`. Trying to import from `pgadmin` before adding the root
directory to the system path results in import error, when the script
is invoked in any other way than running it directly. For example

$ /path/to/venv/bin/pip install pgadmin4
$ /path/to/venv/bin/python -m pgadmin4.setup
Traceback (most recent call last):
  ...
  File "/path/to/venv/lib/python3.6/site-packages/pgadmin4/setup.py",
line 18, in 
from pgadmin.model import db, User, Version, ServerGroup, Server, \
ModuleNotFoundError: No module named 'pgadmin'

Please let me know what you think. Happy to address any feedback.

Regards,
Azad Salahlı
diff --git a/web/setup.py b/web/setup.py
index 4cd090d15..fbc7f1e04 100644
--- a/web/setup.py
+++ b/web/setup.py
@@ -15,8 +15,6 @@ import json
 import os
 import sys
 import builtins
-from pgadmin.model import db, User, Version, ServerGroup, Server, \
-SCHEMA_VERSION as CURRENT_SCHEMA_VERSION
 
 # Grab the SERVER_MODE if it's been set by the runtime
 if 'SERVER_MODE' in globals():
@@ -31,6 +29,8 @@ if sys.path[0] != root:
 sys.path.insert(0, root)
 
 from pgadmin import create_app
+from pgadmin.model import db, User, Version, ServerGroup, Server, \
+SCHEMA_VERSION as CURRENT_SCHEMA_VERSION
 
 
 def add_value(attr_dict, key, value):