-
Notifications
You must be signed in to change notification settings - Fork 40
Fix type declaration in group_concat and blank_nulls #7457
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.
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
base: main
Are you sure you want to change the base?
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
-
Through the Specify Taxon Tree UI, merge two taxon nodes (e.g., 'Palaeoniscidae (in Palaeonisciformes)' into 'Palaeoniscidae (in Palaeoniscoidea)'). See that the taxon merge occurred without errors.
-
Try merging two other random taxon nodes in three to make sure no errors occur.
'Palaeoniscidae' in the tree was not found to merge, otherwise i was able to perform random taxon merges.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- Through the Specify Taxon Tree UI, merge two taxon nodes (e.g., 'Palaeoniscidae (in Palaeonisciformes)' into 'Palaeoniscidae (in Palaeoniscoidea)'). See that the taxon merge occurred without errors
- Try merging two other random taxon nodes in three to make sure no errors occur.
Could not recreate the issue in main but it seems to be working on this branch
Triggered by c3887cf on branch refs/heads/issue-7423
Fixes #7423
Resolve sqlalchemy compiling issues related to the
group_concat
andblank_nulls
by making their definitions more friendly to sqlachlemy 1.4. The main way to do this is my settingtype = String()
, which gives the expression a real TypeEngine, so the compiler/comparator path won’t hit None/NullType.Checklist
self-explanatory (or properly documented)
UX Testing instructions
Running the merge:

Taxon Tree after merge:

Development Testing instructions
Query the database with:
See that it returns a count of
0
Run the
renumber_tree('taxon')
function directly via the Django Python shell.The command
renumber_tree('taxon')
ran without errors.Query the database with:
The query should return 0.
Through the Specify Taxon Tree UI, merge two taxon nodes (e.g., 'Palaeoniscidae (in Palaeonisciformes)' into 'Palaeoniscidae (in Palaeoniscoidea)'). See that the taxon merge occurred without errors.
Go back to the python shell and run the
validate_tree_numbering('taxon')
commandvalidate_tree_numbering('taxon')
command ran without errors