Fixes for Date Manipulations #668
Merged
Conversation
This file contains 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
added 3 commits
October 4, 2016 16:40
date(byAdding:to:options:) was always trying to add the components to CFAbsoluteTime 0.0, rather than the passed-in date.
- DateComponent should only return isLeapMonth if the underlying leapMonthSet variable is true. Previously, DateComponent was setting isLeapMonth to false in situations where there is no concept of isLeapMonth. - _convert was using 'L' for isLeapMonth, when the corresponding UCalendarDateFields enum value for isLeapMonth is 'l'. This was causing _CFCalendarAddComponentsV to return error status.
|
@swift-ci Please smoke test |
parkera
reviewed
Oct 4, 2016
| @@ -89,6 +90,18 @@ class TestNSCalendar: XCTestCase { | |||
| XCTAssertEqual(copy.firstWeekday, 2) | |||
| XCTAssertEqual(copy.minimumDaysInFirstWeek, 2) | |||
| } | |||
|
|
|||
| func test_addingDates() { | |||
| let calendar = Calendar.current | |||
There was a problem hiding this comment.
Let's use the gregorian calendar specifically here, to avoid assuming anything about the environment.
There was a problem hiding this comment.
Updated in latest commit, thanks!
|
@swift-ci please test |
|
Thanks very much, @parkera and @lifeissweetgood, for quickly merging this PR. Do either of you know if this patch will make it into Swift 3.0.1 preview 2? Our team is in somewhat dire need of this patch, as it's preventing us from doing date manipulations on our Swift-based server. |
|
@UberJason Can you put up a PR against the |
UberJason
pushed a commit
to UberJason/swift-corelibs-foundation
that referenced
this pull request
Oct 6, 2016
Fixes for Date Manipulations
|
@parkera Done! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR has fixes for DateComponents and Calendar which were causing date manipulations to fail, resolving SR-2846:
_convert()is fixed for the character set for isLeapMonth to align with expected value fromUCalendarDateFields('l' instead of 'L').date(byAdding:to:options:)is fixed to do math on the passed-in date, rather than the reference time 0.0.A test for this is included.