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

Changed the logic to identify the PostgreSQL server variant, when we

Browse Source 
connect to the database server. Also, added modified the way, we do
check the node is supported by the server.

Instead of creating separate blueprint for the server types, they will
be independently works. In order to add different variant of the
PostgreSQL, we need to extend the ServerType class, and override the
'instanceOf' function for identification using version string. Please
take a look at the ppas.py for the example.

During checking the back-end support for the node, we will also check
the server type (variant) along with the version within the range of
maximum and minimum version for the node. And, the same support added
for the schema attributes in front-end (JavaScript).

Really thankful to Khushboo Vashi for her initial work in front-end. I
took it further from there.
This commit is contained in:
Ashesh Vashi
2015-11-19 23:15:48 +05:30
parent 3323543b5a
commit 77834ccdda
19 changed files with 306 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
web/pgadmin/browser/collection.py
View File

@@ -13,7 +13,7 @@ from flask import url_for, render_template
from flask.ext.babel import gettext
from pgadmin.browser.utils import PgAdminModule, PGChildModule
from pgadmin.browser import BrowserPluginModule
from pgadmin.browser.utils import NodeView, PGChildNodeView
from pgadmin.browser.utils import NodeView, PGChildNode, PGChildNodeView
@six.add_metaclass(ABCMeta)
class CollectionNodeModule(PgAdminModule, PGChildModule):
@@ -53,7 +53,7 @@ class CollectionNodeModule(PgAdminModule, PGChildModule):
return scripts
def generate_browser_node(
self, node_id, parents, label, icon, **kwargs
self, node_id, label, icon, **kwargs
):
obj = {
"id": "%s/%s" % (self.node_type, node_id),
@@ -62,14 +62,13 @@ class CollectionNodeModule(PgAdminModule, PGChildModule):
"inode": self.node_inode,
"_type": self.node_type,
"_id": node_id,
"refid": parents,
"module": 'pgadmin.node.%s' % self.node_type
}
for key in kwargs:
obj.setdefault(key, kwargs[key])
return obj
def generate_browser_collection_node(self, sid, parents, **kwargs):
def generate_browser_collection_node(self, sid, **kwargs):
obj = {
"id": "coll-%s/%d" % (self.node_type, sid),
"label": self.collection_label,
@@ -77,7 +76,6 @@ class CollectionNodeModule(PgAdminModule, PGChildModule):
"inode": True,
"_type": 'coll-%s' % (self.node_type),
"_id": sid,
"refid": parents,
"module": 'pgadmin.node.%s' % self.node_type
}
@@ -173,7 +171,7 @@ class CollectionNodeModule(PgAdminModule, PGChildModule):
return []
class CollectionNodeView(NodeView, PGChildNodeView):
class CollectionNodeView(NodeView, PGChildNode):
"""
A PostgreSQL Collection node has specific functions needs to address
i.e.