From fdd5908a1b02890f0c79d5435246cebd21e7527a Mon Sep 17 00:00:00 2001 From: James B Date: Wed, 4 Oct 2023 09:12:14 +0100 Subject: [PATCH] fixed: get_records() on Event model could have SQL error due to lack of space --- CHANGELOG.md | 5 +++++ jsondataferret/models.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4635e7f..bbf7d55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] + +### Fixed + +- get_records() on Event model could have SQL error due to lack of space + ## [0.7.0] - 2022-10-26 ### Added diff --git a/jsondataferret/models.py b/jsondataferret/models.py index ba7c214..249285f 100755 --- a/jsondataferret/models.py +++ b/jsondataferret/models.py @@ -128,7 +128,7 @@ def get_records(self, limit=-1, approved_edits_only=False): + ( "WHERE jsondataferret_edit.approval_event_id = %(event_id)s " if approved_edits_only - else "WHERE jsondataferret_edit.creation_event_id = %(event_id)s OR jsondataferret_edit.refusal_event_id = %(event_id)s OR jsondataferret_edit.approval_event_id = %(event_id)s" + else "WHERE jsondataferret_edit.creation_event_id = %(event_id)s OR jsondataferret_edit.refusal_event_id = %(event_id)s OR jsondataferret_edit.approval_event_id = %(event_id)s " ) + "GROUP BY jsondataferret_record.id " + "ORDER BY max(jsondataferret_type.title) ASC, jsondataferret_record.public_id ASC"