Correct Location Delete with new Geometry table. - #201
Open
MikeNeilson wants to merge 6 commits into
Open
Conversation
MikeNeilson
requested review from
a team and
katfeingold
and removed request for
a team
July 17, 2026 20:58
MikeNeilson
changed the title
Contributor
Author
|
NOTE: still need to add test for deleting sublocations, but otherwise gives the sense of what needs to happen. E.G. at_location_geometry should be treated as "part of the location" for delete and not need _all or _cascade to be specified. If the location is deleted, the geometry just dies. |
1 task
Contributor
Author
Tests and fixes were added. |
ktarbet
reviewed
Jul 21, 2026
| <exec executable="utplsql" resultproperty="utreturn"> | ||
| <arg value="run"/> | ||
| <arg value="-p=${oracle.cwms.user}.test_cwms_rating,${oracle.cwms.user}.test_cwms_text,${oracle.cwms.user}.test_lrts_updates,${oracle.cwms.user}.test_probability_parameter,${oracle.cwms.user}.test_cwms_loc,${oracle.cwms.user}.test_cwms_ts,${oracle.cwms.user}.test_cwms_util,${oracle.cwms.user}.test_cwms_err,${oracle.cwms.user}.test_versioned_time_series,${oracle.cwms.user}.test_update_ts_extents,${oracle.cwms.user}.test_cwms_pool,${oracle.cwms.user}.test_timeseries_snapping,${oracle.cwms.user}.test_cwms_cat,${oracle.cwms.user}.test_cwms_msg,${oracle.cwms.user}.test_cwms_level,${oracle.cwms.user}.test_cwms_water_supply,${oracle.cwms.user}.test_cwms_display,${oracle.cwms.user}.test_cwms_data_dissem,${oracle.cwms.user}.test_cwms_stream,${oracle.cwms.user}.test_cwms_measurements,${oracle.cwms.user}.test_cwms_fcst,${oracle.cwms.user}.test_cwms_forecast,${oracle.cwms.user}.test_cwms_xchg,${oracle.cwms.user}.test_cwms_cache"/> | ||
| <!-- <arg value="-p=${oracle.cwms.user}.test_cwms_rating,${oracle.cwms.user}.test_cwms_text,${oracle.cwms.user}.test_lrts_updates,${oracle.cwms.user}.test_probability_parameter,${oracle.cwms.user}.test_cwms_loc,${oracle.cwms.user}.test_cwms_ts,${oracle.cwms.user}.test_cwms_util,${oracle.cwms.user}.test_cwms_err,${oracle.cwms.user}.test_versioned_time_series,${oracle.cwms.user}.test_update_ts_extents,${oracle.cwms.user}.test_cwms_pool,${oracle.cwms.user}.test_timeseries_snapping,${oracle.cwms.user}.test_cwms_cat,${oracle.cwms.user}.test_cwms_msg,${oracle.cwms.user}.test_cwms_level,${oracle.cwms.user}.test_cwms_water_supply,${oracle.cwms.user}.test_cwms_display,${oracle.cwms.user}.test_cwms_data_dissem,${oracle.cwms.user}.test_cwms_stream,${oracle.cwms.user}.test_cwms_measurements,${oracle.cwms.user}.test_cwms_fcst,${oracle.cwms.user}.test_cwms_forecast,${oracle.cwms.user}.test_cwms_xchg,${oracle.cwms.user}.test_cwms_cache"/> --> |
Contributor
There was a problem hiding this comment.
consider deleting if not needed.
Contributor
Author
There was a problem hiding this comment.
... oops, that change wasn't supposed to get in, that was to make the tests run faster locally.
| if [ $? -ne 0 ]; then echo "Failed to stop db?"; exit 6; fi | ||
|
|
||
| # ant docker.push -Dteamcity.branch=${BRANCH}_${AGENT} -Denv.USER=$AGENT -Denv.BUILD_NUMBER=1 -Ddryrun=true -Ddocker.registry=testregistry $* | ||
| # ant docker.push -Dteamcity.branch=${BRANCH}_${AGENT} -Denv.USER=$AGENT -Denv.BUILD_NUMBER=1 -Ddryrun=true -Ddocker.registry=testregistry -Doracle.image=$ORACLE_IMAGE $* |
Contributor
Author
There was a problem hiding this comment.
This one is intentionally for when that needs to be tested, but since it's an external operation I didn't want it active by default.
MikeNeilson
commented
Jul 21, 2026
MikeNeilson
left a comment
MikeNeilson
left a comment
Contributor
Author
There was a problem hiding this comment.
Someone feel free to take this over, at least for the build.xml reset anyways, while I'm gone, otherwise I'll get back to it Friday.
| <exec executable="utplsql" resultproperty="utreturn"> | ||
| <arg value="run"/> | ||
| <arg value="-p=${oracle.cwms.user}.test_cwms_rating,${oracle.cwms.user}.test_cwms_text,${oracle.cwms.user}.test_lrts_updates,${oracle.cwms.user}.test_probability_parameter,${oracle.cwms.user}.test_cwms_loc,${oracle.cwms.user}.test_cwms_ts,${oracle.cwms.user}.test_cwms_util,${oracle.cwms.user}.test_cwms_err,${oracle.cwms.user}.test_versioned_time_series,${oracle.cwms.user}.test_update_ts_extents,${oracle.cwms.user}.test_cwms_pool,${oracle.cwms.user}.test_timeseries_snapping,${oracle.cwms.user}.test_cwms_cat,${oracle.cwms.user}.test_cwms_msg,${oracle.cwms.user}.test_cwms_level,${oracle.cwms.user}.test_cwms_water_supply,${oracle.cwms.user}.test_cwms_display,${oracle.cwms.user}.test_cwms_data_dissem,${oracle.cwms.user}.test_cwms_stream,${oracle.cwms.user}.test_cwms_measurements,${oracle.cwms.user}.test_cwms_fcst,${oracle.cwms.user}.test_cwms_forecast,${oracle.cwms.user}.test_cwms_xchg,${oracle.cwms.user}.test_cwms_cache"/> | ||
| <!-- <arg value="-p=${oracle.cwms.user}.test_cwms_rating,${oracle.cwms.user}.test_cwms_text,${oracle.cwms.user}.test_lrts_updates,${oracle.cwms.user}.test_probability_parameter,${oracle.cwms.user}.test_cwms_loc,${oracle.cwms.user}.test_cwms_ts,${oracle.cwms.user}.test_cwms_util,${oracle.cwms.user}.test_cwms_err,${oracle.cwms.user}.test_versioned_time_series,${oracle.cwms.user}.test_update_ts_extents,${oracle.cwms.user}.test_cwms_pool,${oracle.cwms.user}.test_timeseries_snapping,${oracle.cwms.user}.test_cwms_cat,${oracle.cwms.user}.test_cwms_msg,${oracle.cwms.user}.test_cwms_level,${oracle.cwms.user}.test_cwms_water_supply,${oracle.cwms.user}.test_cwms_display,${oracle.cwms.user}.test_cwms_data_dissem,${oracle.cwms.user}.test_cwms_stream,${oracle.cwms.user}.test_cwms_measurements,${oracle.cwms.user}.test_cwms_fcst,${oracle.cwms.user}.test_cwms_forecast,${oracle.cwms.user}.test_cwms_xchg,${oracle.cwms.user}.test_cwms_cache"/> --> |
Contributor
Author
There was a problem hiding this comment.
... oops, that change wasn't supposed to get in, that was to make the tests run faster locally.
| if [ $? -ne 0 ]; then echo "Failed to stop db?"; exit 6; fi | ||
|
|
||
| # ant docker.push -Dteamcity.branch=${BRANCH}_${AGENT} -Denv.USER=$AGENT -Denv.BUILD_NUMBER=1 -Ddryrun=true -Ddocker.registry=testregistry $* | ||
| # ant docker.push -Dteamcity.branch=${BRANCH}_${AGENT} -Denv.USER=$AGENT -Denv.BUILD_NUMBER=1 -Ddryrun=true -Ddocker.registry=testregistry -Doracle.image=$ORACLE_IMAGE $* |
Contributor
Author
There was a problem hiding this comment.
This one is intentionally for when that needs to be tested, but since it's an external operation I didn't want it active by default.
MikeNeilson
force-pushed
the
bugfix/200-delete-loc-with-geometry
branch
from
July 28, 2026 13:39
085d194 to
07dfa03
Compare
This was referenced Jul 28, 2026
Open
Closed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Will implement fix later. Commentary certainly welcome.
Pretty sure it just needs the addition of "delete_loc" in the check for delete at_location_geometry.
But also need to expand test to include sub locations.