Skip to content

Remove old code (restapi), clean upgrade db - #136

Merged
TheWitness merged 7 commits into
Cacti:mainfrom
xmacan:remove_old_code
Nov 3, 2026
Merged

TheWitness merged 7 commits into
Cacti:mainfrom
xmacan:remove_old_code

Conversation

@xmacan

@xmacan xmacan commented Oct 31, 2026

Copy link
Copy Markdown
Member

fix #122
close #122

@TheWitness
TheWitness self-requested a review November 2, 2026 19:28
TheWitness
TheWitness previously approved these changes Nov 2, 2026
bmfmancini
bmfmancini previously approved these changes Nov 2, 2026
TheWitness and others added 2 commits November 3, 2026 09:41
The restapi removal PR leaves plugin_servcheck_uninstall() dropping
plugin_servcheck_restapi_method, but that table no longer belongs to the
current schema (it is dropped during upgrade). ServcheckLifecycleTest now
expects it absent from the uninstall table list, so CI failed. Remove the
stale DROP so uninstall matches the current schema.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@TheWitness
TheWitness dismissed stale reviews from bmfmancini and themself via 4a38752 November 3, 2026 18:27
The restapi cleanup moved the schema migration cascade into the new
includes/database.php and trimmed includes/arrays.php. Two CI gates then
failed once the Pest suite ran:

- patch-coverage.php flagged includes/arrays.php as a changed production
  file absent from Clover. It is loaded by ServcheckLegendTest but was
  never listed in phpunit.xml's coverage source, so add it there.
- The moved servcheck_upgrade_tables() cascade counted as added lines
  with no coverage. Add ServcheckUpgradeTablesTest driving both the
  present- and absent-schema sides of the 0.3 and 0.4 cascades plus the
  reconciliation failure path, and make the db_column_exists/
  db_table_exists/db_update_table bootstrap stubs configurable (defaults
  unchanged) so those branches can be exercised without a database.

Patch coverage is back to 100%.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@sonarqubecloud

sonarqubecloud Bot commented Nov 3, 2026

Copy link
Copy Markdown

@TheWitness
TheWitness merged commit 1020e92 into Cacti:main Nov 3, 2026
5 checks passed
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.

Deprecate old upgrade paths so bespoke version-gated migrations can be retired for db_update_table

3 participants