feat: SQLAlchemy v2 support

ckan · Sep 7, 2024 · 9fb7aa1 · 9fb7aa1
1 parent 8a00a2b
commit 9fb7aa1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ckanext/spatial/harvesters/base.py b/ckanext/spatial/harvesters/base.py
@@ -16,6 +16,7 @@
 
 from owslib import wms
 import requests
+import sqlalchemy as sa
 from lxml import etree
 
 from ckan import plugins as p
@@ -667,7 +668,9 @@ def import_stage(self, harvest_object):
             # Defer constraints and flush so the dataset can be indexed with
             # the harvest object id (on the after_show hook from the harvester
             # plugin)
-            model.Session.execute('SET CONSTRAINTS harvest_object_package_id_fkey DEFERRED')
+            model.Session.execute(
+                sa.text('SET CONSTRAINTS harvest_object_package_id_fkey DEFERRED')
+            )
             model.Session.flush()
 
             try:

diff --git a/ckanext/spatial/util.py b/ckanext/spatial/util.py
@@ -12,7 +12,6 @@
 from pprint import pprint
 
 from ckan import model
-from ckan.model.package_extra import PackageExtra
 
 try:
     from ckanext.spatial.lib.reports import validation_report