IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Allow selection of SSL certificates and pgpass files in connection properties. Fixes #2649. Fixes #2650

Browse Source
This commit is contained in:
Murtuza Zabuawala
2017-09-28 10:02:33 +01:00
committed by Dave Page
parent 510bc6c974
commit f855ed88ce
14 changed files with 439 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
web/pgadmin/model/__init__.py
View File

@@ -14,8 +14,8 @@ things:
1) Increment SCHEMA_VERSION below
2) Modify setup.py to ensure that the appropriate changes are made to the
config database to upgrade it to the new version.
2) Create an Alembic migratio to ensure that the appropriate changes are
made to the config database to upgrade it to the new version.
"""
from flask_security import UserMixin, RoleMixin
@@ -29,7 +29,7 @@ from flask_sqlalchemy import SQLAlchemy
#
##########################################################################
SCHEMA_VERSION = 14
SCHEMA_VERSION = 15
##########################################################################
#
@@ -129,8 +129,15 @@ class Server(db.Model):
backref=db.backref('server', cascade="all, delete-orphan"),
lazy='joined')
db_res = db.Column(db.Text(), nullable=True)
passfile = db.Column(db.Text(), nullable=True)
sslcert = db.Column(db.Text(), nullable=True)
sslkey = db.Column(db.Text(), nullable=True)
sslrootcert = db.Column(db.Text(), nullable=True)
sslcrl = db.Column(db.Text(), nullable=True)
sslcompression =db.Column(db.Integer(),
db.CheckConstraint(
'sslcompression >= 0 AND sslcompression <= 1'
), nullable=False)
class ModulePreference(db.Model):
@@ -220,4 +227,4 @@ class Keys(db.Model):
"""Define the keys table."""
__tablename__ = 'keys'
name = db.Column(db.String(), nullable=False, primary_key=True)
value = db.Column(db.String(), nullable=False)
value = db.Column(db.String(), nullable=False)