Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clean Datastore Tables Job #196

Merged
merged 13 commits into from
Feb 3, 2024
Merged

Clean Datastore Tables Job #196

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8330310
feat(jobs): added job to delete datastore tables;
JVickery-TBS Nov 8, 2023
e6023b5
feat(dev): code improvements;
JVickery-TBS Nov 9, 2023
329e9c6
fix(dev): falsy values for datastore and variable logging;
JVickery-TBS Nov 9, 2023
f55c8d0
fix(dev): falsy for url type;
JVickery-TBS Nov 10, 2023
7f880e4
fix(dev): falsy fix, removed lower from logging;
JVickery-TBS Nov 15, 2023
8ea18f5
Merge branch 'master' into feature/remove-unsupported-datastore-tables
JVickery-TBS Jan 29, 2024
27a7e3b
fix(syntax): flake8;
JVickery-TBS Jan 31, 2024
407db19
feat(tests): added new test;
JVickery-TBS Jan 31, 2024
3470de3
fix(tests): module path;
JVickery-TBS Jan 31, 2024
da124f9
fix(tests): subrequest params;
JVickery-TBS Jan 31, 2024
42f2941
fix(tests): finalized test method;
JVickery-TBS Feb 1, 2024
0ba47fe
fix(tests): less complicated;
JVickery-TBS Feb 2, 2024
68e98b0
Merge branch 'master' into feature/remove-unsupported-datastore-tables
JVickery-TBS Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ckanext/xloader/plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,14 @@ def get_helpers(self):
def _should_remove_unsupported_resource_from_datastore(res_dict):
if not toolkit.asbool(toolkit.config.get('ckanext.xloader.clean_datastore_tables', False)):
return False
has_url_type = True
try:
has_url_type = toolkit.asbool(res_dict.get('url_type'))
except ValueError:
pass
return (not XLoaderFormats.is_it_an_xloader_format(res_dict.get('format', u''))
and (res_dict.get('url_type') == 'upload'
or res_dict.get('url_type') == '')
or not has_url_type)
JVickery-TBS marked this conversation as resolved.
Show resolved Hide resolved
and (toolkit.asbool(res_dict.get('datastore_active', False))
or toolkit.asbool(res_dict.get('extras', {}).get('datastore_active', False))))

Expand Down