chore: fix errors on 2.12

Author: smotornyuk

ckanext/xloader/db.py

@@ -121,7 +121,7 @@ def get_job(job_id):
 
     # Turn the result into a dictionary representation of the job.
     result_dict = {}
-    for field in list(result.keys()):
+    for field in [c.name for c in JOBS_TABLE.c]:
         value = getattr(result, field)
         if value is None:
             result_dict[field] = value
@@ -448,14 +448,17 @@ def _get_metadata(job_id):
 
     with ENGINE.connect() as conn:
         results = conn.execute(
-            METADATA_TABLE.select().where(
+            METADATA_TABLE.select().with_only_columns(
+                METADATA_TABLE.c.key,
+                METADATA_TABLE.c.value,
+                METADATA_TABLE.c.type,
+            ).where(
                 METADATA_TABLE.c.job_id == job_id)).fetchall()
     metadata = {}
-    for row in results:
-        value = row['value']
-        if row['type'] == 'json':
+    for (key, value, value_type) in results:
+        if value_type == 'json':
             value = json.loads(value)
-        metadata[row['key']] = value
+        metadata[key] = value
     return metadata
 
 

ckanext/xloader/jobs.py

@@ -294,6 +294,7 @@ def direct_load(allow_type_guessing=False):
                 fields=fields,
                 resource_id=resource['id'],
                 logger=logger)
+
             update_resource(resource={'id': resource['id'], 'hash': resource['hash']},
                             patch_only=True)
             logger.info('File Hash updated for resource: %s', resource['hash'])

ckanext/xloader/loader.py

@@ -777,7 +777,7 @@ def _enable_fulltext_trigger(connection, resource_id):
 
 
 def _get_rows_count_of_resource(connection, table):
-    count_query = ''' SELECT count(_id) from {table} '''.format(table=table)
+    count_query = sa.text(''' SELECT count(_id) from {table} '''.format(table=table))
     results = connection.execute(count_query)
     rows_count = int(results.first()[0])
     return rows_count
@@ -830,7 +830,7 @@ def _populate_fulltext(connection, resource_id, fields, logger):
         for start in range(0, rows_count, chunks):
             try:
                 # Build SQL to update _full_text column with concatenated searchable content
-                sql = \
+                sql = sa.text(
                     '''
                     UPDATE {table}
                     SET _full_text = to_tsvector({cols}) WHERE _id BETWEEN {first} and {end};
@@ -848,7 +848,7 @@ def _populate_fulltext(connection, resource_id, fields, logger):
                         ),
                         first=start,
                         end=start + chunks
-                    )
+                    ))
                 connection.execute(sql)
                 logger.info("Indexed rows {first} to {end} of {total}".format(
                     first=start, end=min(start + chunks, rows_count), total=rows_count))

ckanext/xloader/utils.py

@@ -273,7 +273,7 @@ def set_resource_metadata(update_dict):
         for resource in solr_data_dict['resources']:
             if resource['id'] == update_dict['resource_id']:
                 resource.update(update_dict)
-                psi.index_package(solr_data_dict)
+                psi.index_package(dict(solr_data_dict, with_custom_schema=solr_data_dict))
                 break