[ckan#3816] show query errors on form

OpenGov-OpenData · Jul 5, 2018 · 1e86c42 · 1e86c42
1 parent 85b3cda
commit 1e86c42
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/ckanext/datastore/backend/postgres.py b/ckanext/datastore/backend/postgres.py
@@ -1504,11 +1504,10 @@ def _remove_explain(msg):
                        .replace('EXPLAIN ', ''))
 
         raise ValidationError({
-            'query': [_remove_explain(str(e))],
+            'sql': [_remove_explain(str(e.orig))],
             'info': {
                 'statement': [_remove_explain(e.statement)],
                 'params': [e.params],
-                'orig': [_remove_explain(str(e.orig))]
             }
         })
     except DBAPIError, e:

diff --git a/ckanext/datastore/logic/action.py b/ckanext/datastore/logic/action.py
@@ -111,10 +111,10 @@ def datastore_create(context, data_dict):
                 {'sql': materialized_view_sql, 'dry_run': True})
         except p.toolkit.ValidationError as e:
             raise p.toolkit.ValidationError(
-                {'datastore_search_sql': e.error_dict['sql']})
+                {'materialized_view_sql': e.error_dict['sql']})
         except p.toolkit.NotAuthorized as e:
             raise p.toolkit.ValidationError(
-                {'datastore_search_sql': e.message})
+                {'materialized_view_sql': e.message})
 
     if 'resource' in data_dict and 'resource_id' in data_dict:
         raise p.toolkit.ValidationError({

diff --git a/ckanext/datastore/plugin.py b/ckanext/datastore/plugin.py
@@ -280,7 +280,7 @@ def datastore_resource_query(value):
             None,
             {'sql': value, 'dry_run': True})
     except p.toolkit.ValidationError as e:
-        raise p.toolkit.Invalid(e['sql'])
+        raise p.toolkit.Invalid(e.error_dict['sql'])
     except p.toolkit.NotAuthorized as e:
         raise p.toolkit.Invalid(e.message)
     return value