public inbox for [email protected]
help / color / mirror / Atom feedPATCH: RM#1736
2+ messages / 2 participants
[nested] [flat]
* PATCH: RM#1736
@ 2016-09-23 22:19 Ashesh Vashi <[email protected]>
2016-09-26 10:00 ` Re: PATCH: RM#1736 Dave Page <[email protected]>
0 siblings, 1 reply; 2+ messages in thread
From: Ashesh Vashi @ 2016-09-23 22:19 UTC (permalink / raw)
To: pgadmin-hackers
Hi Dave/Team,
Please find the patch for the "Cannot create a view".
When we do not select the schema name, this error comes at backend-side.
The client-side issue has been taken care by the patch for RM#1735.
--
Thanks & Regards,
Ashesh Vashi
EnterpriseDB INDIA: Enterprise PostgreSQL Company
<http://www.enterprisedb.com;
*http://www.linkedin.com/in/asheshvashi*
<http://www.linkedin.com/in/asheshvashi;
--
Sent via pgadmin-hackers mailing list ([email protected])
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgadmin-hackers
Attachments:
[application/octet-stream] RM1736.patch (6.3K, 3-RM1736.patch)
download | inline diff:
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py
index b60e462..3c14b43 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py
@@ -13,7 +13,7 @@ from functools import wraps
import pgadmin.browser.server_groups.servers.databases as databases
import simplejson as json
-from flask import render_template, request, jsonify
+from flask import render_template, request, jsonify, current_app
from flask_babel import gettext
from pgadmin.browser.server_groups.servers.databases.schemas.utils import \
SchemaChildModule, parse_rule_definition, VacuumSettings
@@ -505,7 +505,9 @@ class ViewNode(PGChildNodeView, VacuumSettings):
)
)
try:
- SQL, name = self.getSQL(gid, sid, data)
+ SQL, nameOrError = self.getSQL(gid, sid, data)
+ if SQL is None:
+ return nameOrError
SQL = SQL.strip('\n').strip(' ')
status, res = self.conn.execute_scalar(SQL)
if not status:
@@ -523,6 +525,7 @@ class ViewNode(PGChildNodeView, VacuumSettings):
)
)
except Exception as e:
+ current_app.logger.exception(e)
return internal_server_error(errormsg=str(e))
@check_precondition
@@ -534,7 +537,9 @@ class ViewNode(PGChildNodeView, VacuumSettings):
request.data, encoding='utf-8'
)
try:
- SQL, name = self.getSQL(gid, sid, data, vid)
+ SQL, nameOrError = self.getSQL(gid, sid, data, vid)
+ if SQL is None:
+ return nameOrError
SQL = SQL.strip('\n').strip(' ')
status, res = self.conn.execute_void(SQL)
if not status:
@@ -567,6 +572,7 @@ class ViewNode(PGChildNodeView, VacuumSettings):
)
)
except Exception as e:
+ current_app.logger.exception(e)
return internal_server_error(errormsg=str(e))
@check_precondition
@@ -626,6 +632,7 @@ class ViewNode(PGChildNodeView, VacuumSettings):
)
except Exception as e:
+ current_app.logger.exception(e)
return internal_server_error(errormsg=str(e))
def _get_schema(self, scid):
@@ -657,12 +664,15 @@ class ViewNode(PGChildNodeView, VacuumSettings):
except ValueError:
data[k] = v
- sql, name = self.getSQL(gid, sid, data, vid)
+ sql, nameOrError = self.getSQL(gid, sid, data, vid)
+ if sql is None:
+ return nameOrError
sql = sql.strip('\n').strip(' ')
if sql == '':
sql = "--modified SQL"
+
return make_json_response(
data=sql,
status=200
@@ -723,7 +733,7 @@ class ViewNode(PGChildNodeView, VacuumSettings):
)
status, res = self.conn.execute_dict(SQL)
if not status:
- return internal_server_error(errormsg=res)
+ return None, internal_server_error(errormsg=res)
old_data = res['rows'][0]
@@ -748,7 +758,8 @@ class ViewNode(PGChildNodeView, VacuumSettings):
[self.template_path, 'sql/update.sql']), data=data,
o_data=old_data, conn=self.conn)
except Exception as e:
- return internal_server_error(errormsg=str(e))
+ current_app.logger.exception(e)
+ return None, internal_server_error(errormsg=str(e))
else:
required_args = [
'name',
@@ -757,7 +768,10 @@ class ViewNode(PGChildNodeView, VacuumSettings):
]
for arg in required_args:
if arg not in data:
- return " -- definition incomplete"
+ return None, make_json_response(
+ data=gettext(" -- definition incomplete"),
+ status=200
+ )
# Get Schema Name from its OID.
if 'schema' in data and isinstance(data['schema'], int):
@@ -771,6 +785,7 @@ class ViewNode(PGChildNodeView, VacuumSettings):
SQL += "\n"
SQL += render_template("/".join(
[self.template_path, 'sql/grant.sql']), data=data)
+
return SQL, data['name'] if 'name' in data else old_data['name']
def get_index_column_details(self, idx, data):
@@ -1061,6 +1076,7 @@ class ViewNode(PGChildNodeView, VacuumSettings):
)
except Exception as e:
+ current_app.logger.exception(e)
return internal_server_error(errormsg=str(e))
@check_precondition
@@ -1304,7 +1320,7 @@ class MViewNode(ViewNode, VacuumSettings):
)
status, res = self.conn.execute_dict(SQL)
if not status:
- return internal_server_error(errormsg=res)
+ return None, internal_server_error(errormsg=res)
old_data = res['rows'][0]
if 'name' not in data:
@@ -1388,7 +1404,8 @@ class MViewNode(ViewNode, VacuumSettings):
[self.template_path, 'sql/update.sql']), data=data,
o_data=old_data, conn=self.conn)
except Exception as e:
- return internal_server_error(errormsg=str(e))
+ current_app.logger.exception(e)
+ return None, internal_server_error(errormsg=str(e))
else:
required_args = [
'name',
@@ -1397,7 +1414,10 @@ class MViewNode(ViewNode, VacuumSettings):
]
for arg in required_args:
if arg not in data:
- return " -- definition incomplete"
+ return None, make_json_response(
+ data=gettext(" -- definition incomplete"),
+ status=200
+ )
# Get Schema Name from its OID.
if 'schema' in data and isinstance(data['schema'], int):
@@ -1656,6 +1676,7 @@ class MViewNode(ViewNode, VacuumSettings):
)
except Exception as e:
+ current_app.logger.exception(e)
return internal_server_error(errormsg=str(e))
^ permalink raw reply [nested|flat] 2+ messages in thread
* Re: PATCH: RM#1736
2016-09-23 22:19 PATCH: RM#1736 Ashesh Vashi <[email protected]>
@ 2016-09-26 10:00 ` Dave Page <[email protected]>
0 siblings, 0 replies; 2+ messages in thread
From: Dave Page @ 2016-09-26 10:00 UTC (permalink / raw)
To: Ashesh Vashi <[email protected]>; +Cc: pgadmin-hackers
Thanks, applied.
On Fri, Sep 23, 2016 at 11:19 PM, Ashesh Vashi <
[email protected]> wrote:
> Hi Dave/Team,
>
> Please find the patch for the "Cannot create a view".
> When we do not select the schema name, this error comes at backend-side.
>
> The client-side issue has been taken care by the patch for RM#1735.
>
> --
>
> Thanks & Regards,
>
> Ashesh Vashi
> EnterpriseDB INDIA: Enterprise PostgreSQL Company
> <http://www.enterprisedb.com;
>
>
> *http://www.linkedin.com/in/asheshvashi*
> <http://www.linkedin.com/in/asheshvashi;
>
>
> --
> Sent via pgadmin-hackers mailing list ([email protected])
> To make changes to your subscription:
> http://www.postgresql.org/mailpref/pgadmin-hackers
>
>
--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake
EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
^ permalink raw reply [nested|flat] 2+ messages in thread
end of thread, other threads:[~2016-09-26 10:00 UTC | newest]
Thread overview: 2+ messages (download: mbox mbox.gz follow: Atom feed)
-- links below jump to the message on this page --
2016-09-23 22:19 PATCH: RM#1736 Ashesh Vashi <[email protected]>
2016-09-26 10:00 ` Dave Page <[email protected]>
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox