feat(logic): macth scheam fields;

- Check for old non-schema fields.

Author: JVickery-TBS

ckanext/recombinant/logic.py

@@ -120,6 +120,8 @@ def recombinant_show(context: Context, data_dict: DataDict) -> Dict[str, Any]:
                 limit=0)
             datastore_correct = _datastore_match(r['fields'], ds['fields'])
             out['datastore_correct'] = datastore_correct
+            schema_correct = _schema_match(r['fields'], ds['fields'])
+            out['schema_correct'] = schema_correct
             resources_correct = resources_correct and datastore_correct
             out['datastore_rows'] = ds.get('total', 0)
             out['datastore_active'] = True
@@ -437,6 +439,17 @@ def _datastore_match(fs: List[Dict[str, Any]], fields: List[Dict[str, Any]]) ->
                if not f.get('published_resource_computed_field', False))
 
 
+def _schema_match(fs: List[Dict[str, Any]], fields: List[Dict[str, Any]]) -> bool:
+    """
+    return True if datastore column fields are all fields defined in fs.
+    """
+    # XXX: does not check types or extra columns at this time
+    existing = set(f['datastore_id'] for f in fs
+                   if not f.get('published_resource_computed_field', False))
+    return all(c['id'] in existing for c in fields
+               if c['id'] != '_id')
+
+
 @chained_action
 @side_effect_free
 def recombinant_datastore_info(up_func: Action,

ckanext/recombinant/templates/recombinant/resource_edit.html

@@ -45,7 +45,7 @@
   {% block action_panels %}
     {% if dataset %}
       {% if 'error' not in resource %}
-        {% if g.userobj.sysadmin and not resource.datastore_correct %}
+        {% if g.userobj.sysadmin and (not resource.datastore_correct or not resource.schema_correct) %}
           {# only let sysadmins refresh the recombinant record via UI #}
           <div class="module-alert alert alert-warning">
             <h3>{{ _("The Recombinant resource is out of date") }}{% snippet 'snippets/sysadmin_only.html' %}</h3>

ckanext/recombinant/views.py

@@ -611,7 +611,8 @@ def preview_table(resource_name: str,
             # check that the resource has errors
             for _r in dataset['resources']:
                 if _r['name'] == resource_name and ('error' in _r or
-                                                    not _r['datastore_correct']):
+                                                    not _r['datastore_correct'] or
+                                                    not _r['schema_correct']):
                     raise NotFound
         except NotFound:
             try: