Skip to content

Fix CKAN 2.10/2.11 compatibility for Activity model imports and database initialization #18

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

Closed
Copilot wants to merge 3 commits into from
Closed

Fix CKAN 2.10/2.11 compatibility for Activity model imports and database initialization #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1adb68c
Initial plan
Copilot Dec 8, 2025
19f4e4a
Improve database initialization error handling in tables_exist()
Copilot Dec 8, 2025
fa6f5aa
Fix Activity import for CKAN 2.10+ by catching ModuleNotFoundError
Copilot Dec 8, 2025
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
4 changes: 2 additions & 2 deletions ckanext/versions/logic/action.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@

from ckanext.versions.model import Version

# CKAN 2.10+ moved Activity to a separate module
# CKAN 2.10+ Activity is in core_model, older versions in separate module
try:
from ckan.model.activity import Activity
except ImportError:
except (ImportError, ModuleNotFoundError):
Activity = core_model.Activity

log = logging.getLogger(__name__)
Expand Down
4 changes: 2 additions & 2 deletions ckanext/versions/logic/dataset_version_action.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
from ckanext.versions.logic.action import version_show
from ckanext.versions.model import Version

# CKAN 2.10+ moved Activity to a separate module
# CKAN 2.10+ Activity is in core_model, older versions in separate module
try:
from ckan.model.activity import Activity
except ImportError:
except (ImportError, ModuleNotFoundError):
Activity = core_model.Activity

log = logging.getLogger(__name__)
Expand Down
4 changes: 3 additions & 1 deletion ckanext/versions/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,7 @@ def tables_exist():
if engine is None:
return False
return Version.__table__.exists(bind=engine)
except (AttributeError, TypeError):
except Exception:
# Catch all exceptions during database initialization
# This can happen when CKAN core tables don't exist yet
return False