mirror of
https://github.com/ZoneMinder/zoneminder.git
synced 2026-09-15 06:37:14 -04:00
Isaac ConnorandClaude Opus 5
eae2df6b48
Upstream's schema-drift fix landed db/zm_update-1.39.25.sql and bumped version.txt to 1.39.25 while the trigger consolidation was using the same number for db/zm_update-1.39.25.sql.in. Git does not see this as a conflict -- the two files have different names in the source tree -- but configure_file generates the .sql.in into zm_update-1.39.25.sql, which is the same install target as the tracked .sql. Confirmed by staging an install off the merge: the installed zm_update-1.39.25.sql was upstream's column reconciliation and the trigger consolidation was simply absent, with no error anywhere. An upgrade would have applied one of the two and silently skipped the other. Renumbered to 1.39.26, version.txt to match, and the two zmstats.pl.in comments that name the migration updated. Upstream's 1.39.25 is untouched. Verified by staging an install again: both files are now present and hold what they should. The migration was re-run end to end at the new number against a scratch database -- drops the eight cascade triggers, leaves four, and the 29 trigger assertions pass afterwards. ai_server carries the old 1.39.25 numbering and will need the same treatment when master is next merged into it. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_015Y6FieTwEXuLhhR4e2yiax