feat(dav): store multiple default calendar alarms as JSON - #6
Open
rich0 wants to merge 1 commit into
Open
Conversation
rich0
commented
Aug 11, 2026
rich0
commented
Aug 11, 2026
| $fields = array_map(function (string $field) { | ||
| return 'a.' . $field; | ||
| }, $this->getCalendarMergeSerializedProperties()); | ||
| }, array_column($this->propertyMap, 0)); |
Owner
Author
There was a problem hiding this comment.
we've drifted a bit from temp/old-master which was what we started with from upstream. Maybe we need to base off of that instead?
rich0
force-pushed
the
fix/drop-legacy-default-alarms
branch
from
August 11, 2026 10:13
e52bc86 to
c0f1fe7
Compare
rich0
changed the title
rich0
changed the base branch from
upstreampr/pluralcalendardefaults
to
temp/old-master
August 11, 2026 10:13
Owner
Author
|
Rebased/cleaned against
Happy to adjust further if anything still looks off. |
rich0
commented
Aug 11, 2026
| * Add JSON default-alarm columns and copy legacy single-int defaults in bulk. | ||
| * | ||
| * Conversion uses two set-based UPDATEs so large calendars tables stay fast | ||
| * (avoids per-row PHP updates). |
Owner
Author
There was a problem hiding this comment.
Shorten - we don't need to describe what we're not doing.
rich0
force-pushed
the
fix/drop-legacy-default-alarms
branch
from
August 11, 2026 10:32
32d6b8b to
de256e1
Compare
Replace singular default-alarm-* integer properties with plural default-alarms-* JSON text columns. Migrate existing int defaults with two set-based QueryBuilder UPDATEs, then drop the legacy columns. No dual-write or server-side validation; propertyMap stores/retrieves JSON strings only (NC 35+ clients). Assisted-by: Grok:grok-4.5
rich0
force-pushed
the
fix/drop-legacy-default-alarms
branch
from
August 11, 2026 11:50
de256e1 to
940dae8
Compare
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
1 participant
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.
Summary
Clean rebuild of the plural default calendar alarms feature on top of
temp/old-master(the effective upstream starting point for this work). No dual-write / legacy conversion path.Addresses upstream review on nextcloud#61832 and drift cleanup on this fork:
default-alarm-*int properties with pluraldefault-alarms-*JSON text viapropertyMaponly (same inline property-name style as neighboring entries — no special constants)DefaultCalendarAlarmshelper, dual-write, or storage-backend validationCONCATUPDATEs (not per-row PHP)default_alarm_pday/default_alarm_fdayBase
temp/old-master— intentional. Diff is only the feature relative to that base.Not in this PR
master/ upstream tip (later)nextcloud/serverby this PRAI assistance
Assisted by Grok (xAI). Human DCO sign-off still required before upstream.
Test plan
CalDavBackendTest::testDefaultAlarmsPropertiestemp/old-masteris only dav propertyMap, migrations 1040/1041, autoload, and tests