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.

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

3.2 db patch adjustments #2031

Draft
wants to merge 3 commits into
base: Development
Choose a base branch
from
Draft

3.2 db patch adjustments #2031

wants to merge 3 commits into from

Conversation

egbot
Copy link
Member

@egbot egbot commented Jan 7, 2025

  • Adjust trigger to only update data within omoccurpoints if decimal lat/long values have been modified within omoccurrences record. Otherwise, the omoccurpoints record is updated to the same value when non-coordinate points are updated, which significantly slows batch updates.

Pull Request Checklist:

Pre-Approval

  • There is a description section in the pull request that details what the proposed changes do. It can be very brief if need be, but it ought to exist.
  • Hotfixes should be branched off of the master branch and PR'd using the merge option (not squashed) into the hotfix branch.
  • Features and backlog bugs should be merged into the Development branch, NOT master
  • All new text is preferably internationalized (i.e., no end-user-visible text is hard-coded on the PHP pages), and the spreadsheet tracking internationalizations has been updated either with a new row or with checkmarks to existing rows.
  • There are no linter errors
  • New features have responsive design (i.e., look aesthetically pleasing both full screen and with small or mobile screens)
  • Symbiota coding standards have been followed
  • If any files have been reformatted (e.g., by an autoformatter), the reformat is its own, separate commit in the PR
  • Comment which GitHub issue(s), if any does this PR address
  • If this PR makes any changes that would require additional configuration of any Symbiota portals outside of the files tracked in this repository, make sure that those changes are detailed in this document.

Post-Approval

  • It is the code author's responsibility to merge their own pull request after it has been approved
  • If this PR represents a merge into the Development branch, remember to use the squash & merge option
  • If this PR represents a merge into the hotfix branch, remember to use the merge option (i.e., no squash).
  • If this PR represents a merge from the Development branch into the master branch, remember to use the merge option
  • If this PR represents a merge from the hotfix branch into the master branch use the squash & merge option
    • a subsequent PR from master into Development should be made with the merge option (i.e., no squash).
    • Immediately delete the hotfix branch and create a new hotfix branch
    • increment the Symbiota version number in the symbase.php file and commit to the hotfix branch.
  • If the dev team has agreed that this PR represents the last PR going into the Development branch before a tagged release (i.e., before an imminent merge into the master branch), make sure to notify the team and lock the Development branch to prevent accidental merges while QA takes place. Follow the release protocol here.
  • Don't forget to delete your feature branch upon merge. Ignore this step as required.

Thanks for contributing and keeping it clean!

egbot added 3 commits January 7, 2025 09:53
Update branch with latest Developments
- Adjust trigger to only update data within omoccurpoints if decimal lat/long values have been modified within omoccurrences record. Otherwise, the omoccurpoints record is updated to the same value when non-coordinate points are updated, which significantly slows batch updates.
@egbot egbot requested a review from MuchQuak January 7, 2025 17:06
@egbot
Copy link
Member Author

egbot commented Jan 7, 2025

@MuchQuak If you prefer to address this within another PR that you are actively working on, let me know and I'll close this PR without merging.

@egbot egbot removed the request for review from MuchQuak January 8, 2025 20:29
@egbot egbot marked this pull request as draft January 8, 2025 20:31
MuchQuak
MuchQuak approved these changes Jan 16, 2025
@MuchQuak MuchQuak self-requested a review January 16, 2025 17:48
IF OLD.`decimalLatitude` IS NULL OR (NEW.`decimalLatitude` != OLD.`decimalLatitude` AND NEW.`decimalLongitude` != OLD.`decimalLongitude`) THEN
IF EXISTS (SELECT `occid` FROM omoccurpoints WHERE `occid`=NEW.`occid`) THEN
UPDATE omoccurpoints
SET `point` = Point(NEW.`decimalLatitude`, NEW.`decimalLongitude`)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would just add this to update set section

, `lngLatPoint` = Point(NEW.`decimalLongitude`, NEW.`decimalLatitude`)

And Alter the insert to look like

INSERT INTO omoccurpoints (`occid`,`point`, `latLngPoint`) 
	VALUES (NEW.`occid`,Point(NEW.`decimalLatitude`, NEW.`decimalLongitude`), Point(NEW.`decimalLatitude`, NEW.`decimalLongitude`));

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants