Merge lp://staging/~mikemc/ubuntuone-ios-files/fix-dangling-u1asset into lp://staging/ubuntuone-ios-files
Status: | Merged |
---|---|
Approved by: | Brian Curtin |
Approved revision: | 78 |
Merged at revision: | 78 |
Proposed branch: | lp://staging/~mikemc/ubuntuone-ios-files/fix-dangling-u1asset |
Merge into: | lp://staging/ubuntuone-ios-files |
Diff against target: |
44 lines (+4/-2) 2 files modified
Files.xcodeproj/project.pbxproj (+3/-1) Files/U1Files.xcdatamodeld/.xccurrentversion (+1/-1) |
To merge this branch: | bzr merge lp://staging/~mikemc/ubuntuone-ios-files/fix-dangling-u1asset |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Brian Curtin (community) | Approve | ||
dobey (community) | Approve | ||
Review via email: mp+157170@code.staging.launchpad.net |
Commit message
- change data model to set u1filenode -> u1asset relationship delete rule to 'cascade' (LP: #1164073)
Description of the change
- change data model to set u1filenode -> u1asset relationship delete rule to 'cascade' (LP: #1164073)
- change data model current version to use new model in builds
the u1asset - u1filenode relationship is two-way, but the asset->file direction is marked as 'required'.
and the file->asset direction has the delete rule set to 'nullify', which doesn't delete the asset but just leaves it with a nil field that can't be nil (because it's required).
The framework lets you do this, assuming you'll clean it up yourself, but we don't. Changing the rule avoids the problem.