Rewrite one_or_none() calls for older SA support

frictionlessdata · Oct 25, 2017 · 030cd75 · 030cd75
1 parent 082caaa
commit 030cd75
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/ckanext/validation/jobs.py b/ckanext/validation/jobs.py
@@ -5,6 +5,7 @@
 import json
 import re
 
+from sqlalchemy.orm.exc import NoResultFound
 from goodtables import validate
 
 from ckan.model import Session
@@ -22,8 +23,11 @@ def run_validation_job(resource):
 
     log.debug(u'Validating resource {}'.format(resource['id']))
 
-    validation = Session.query(Validation).filter(
-        Validation.resource_id == resource['id']).one_or_none()
+    try:
+        validation = Session.query(Validation).filter(
+            Validation.resource_id == resource['id']).one()
+    except NoResultFound:
+        validation = None
 
     if not validation:
         validation = Validation(resource_id=resource['id'])

diff --git a/ckanext/validation/logic.py b/ckanext/validation/logic.py
@@ -3,6 +3,8 @@
 import datetime
 import logging
 
+from sqlalchemy.orm.exc import NoResultFound
+
 import ckan.plugins as plugins
 import ckan.lib.uploader as uploader
 
@@ -90,8 +92,11 @@ def resource_validation_run(context, data_dict):
 
     Session = context['model'].Session
 
-    validation = Session.query(Validation).filter(
-        Validation.resource_id == data_dict['resource_id']).one_or_none()
+    try:
+        validation = Session.query(Validation).filter(
+            Validation.resource_id == data_dict['resource_id']).one()
+    except NoResultFound:
+        validation = None
 
     if validation:
         # Reset values
@@ -141,8 +146,11 @@ def resource_validation_show(context, data_dict):
 
     Session = context['model'].Session
 
-    validation = Session.query(Validation).filter(
-        Validation.resource_id == data_dict['resource_id']).one_or_none()
+    try:
+        validation = Session.query(Validation).filter(
+            Validation.resource_id == data_dict['resource_id']).one()
+    except NoResultFound:
+        validation = None
 
     if not validation:
         raise t.ObjectNotFound(
@@ -170,8 +178,11 @@ def resource_validation_delete(context, data_dict):
 
     Session = context['model'].Session
 
-    validation = Session.query(Validation).filter(
-        Validation.resource_id == data_dict['resource_id']).one_or_none()
+    try:
+        validation = Session.query(Validation).filter(
+            Validation.resource_id == data_dict['resource_id']).one()
+    except NoResultFound:
+        validation = None
 
     if not validation:
         raise t.ObjectNotFound(