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

2023 10 04 #37

Merged
merged 2 commits into from
Oct 4, 2023
Merged

2023 10 04 #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17de332
tests: Upgade Postgres
odscjames Oct 4, 2023
fdd5908
fixed: get_records() on Event model could have SQL error due to lack …
odscjames Oct 4, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
django-version: [">=3.2,<4", ">=4,<5"]
services:
postgres:
image: postgres:11
image: postgres:16
env:
POSTGRES_PASSWORD: postgres
options: >-
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion jsondataferret/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading