pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1) Ensure that sequence should be created with Privileges. 

2) Updated the validation for blank values in Definition tab.
pull/22/head
Akshay Joshi 2019-03-25 14:29:43 +05:30
parent c4ea1a56bc
commit a0010aac31
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py
View File

@ -364,7 +364,7 @@ class SequenceView(PGChildNodeView):
return internal_server_error(errormsg=msg)
if 'relacl' in data:
data['relacl'] = parse_priv_to_db(data['relacl'], 'DATABASE')
data['relacl'] = parse_priv_to_db(data['relacl'], self.acl)
# The SQL below will execute rest DMLs because we cannot execute
# CREATE with any other

3
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.js
View File

@ -262,6 +262,9 @@ define('pgadmin.node.sequence', [
start_lt = gettext('Start value cannot be less than minimum value.'),
start_gt = gettext('Start value cannot be greater than maximum value.');
if (_.isEmpty(minimum) || _.isEmpty(maximum))
return null;
if ((minimum == 0 && maximum == 0) ||
(parseInt(minimum, 10) >= parseInt(maximum, 10))) {
this.errorModel.set('minimum', min_lt);

12
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/default/create.sql
View File

@ -1,16 +1,16 @@
CREATE SEQUENCE {{ conn|qtIdent(data.schema, data.name) }}{% if data.increment is defined and data.cycled %}
CYCLE{% endif %}{% if data.increment is defined %}
CYCLE{% endif %}{% if data.increment is defined and data.increment|int(-1) > -1 %}
INCREMENT {{data.increment|int}}{% endif %}{% if data.start is defined %}
INCREMENT {{data.increment|int}}{% endif %}{% if data.start is defined and data.start|int(-1) > -1%}
START {{data.start|int}}{% elif data.current_value is defined %}
START {{data.start|int}}{% elif data.current_value is defined and data.current_value|int(-1) > -1%}
START {{data.current_value|int}}{% endif %}{% if data.minimum is defined %}
START {{data.current_value|int}}{% endif %}{% if data.minimum is defined and data.minimum|int(-1) > -1%}
MINVALUE {{data.minimum|int}}{% endif %}{% if data.maximum is defined %}
MINVALUE {{data.minimum|int}}{% endif %}{% if data.maximum is defined and data.maximum|int(-1) > -1%}
MAXVALUE {{data.maximum|int}}{% endif %}{% if data.cache is defined %}
MAXVALUE {{data.maximum|int}}{% endif %}{% if data.cache is defined and data.cache|int(-1) > -1%}
CACHE {{data.cache|int}}{% endif %};