status-im
/
realm-js
mirror of https://github.com/status-im/realm-js.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #454 from realm/al-negative-dates 

Fix for negative timestamps
This commit is contained in:
Ari Lazier 2016-05-24 10:37:30 -07:00
parent 8bb0fe75e7 47a279cc67
commit ab69a4f910
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,4 +1,4 @@
x.x.x Release notes (yyyy-MM-dd) 0.13.1 Release notes (yyyy-MM-dd)
============================================================= =============================================================
### Breaking changes ### Breaking changes
* None * None
@ -7,7 +7,7 @@ x.x.x Release notes (yyyy-MM-dd)
* Added `isValid()` method to `List` and `Results` to check for deleleted or invalidated objects * Added `isValid()` method to `List` and `Results` to check for deleleted or invalidated objects
### Bugfixes ### Bugfixes
* None * Fix for crash when inserting dates from before the epoch
0.13.0 Release notes (2016-5-19) 0.13.0 Release notes (2016-5-19)
============================================================= =============================================================

4
src/js_object_accessor.hpp
View File

@ -88,8 +88,8 @@ struct NativeAccessor {
static Timestamp to_timestamp(ContextType ctx, ValueType &value) { static Timestamp to_timestamp(ContextType ctx, ValueType &value) {
ObjectType date = Value::validated_to_date(ctx, value, "Property"); ObjectType date = Value::validated_to_date(ctx, value, "Property");
double milliseconds = Value::to_number(ctx, date); double milliseconds = Value::to_number(ctx, date);
u_int64_t seconds = milliseconds / 1000; int64_t seconds = milliseconds / 1000;
u_int32_t nanoseconds = ((u_int64_t)milliseconds % 1000) * 1000000; int32_t nanoseconds = ((int64_t)milliseconds % 1000) * 1000000;
return Timestamp(seconds, nanoseconds); return Timestamp(seconds, nanoseconds);
} }
static ValueType from_timestamp(ContextType ctx, Timestamp ts) { static ValueType from_timestamp(ContextType ctx, Timestamp ts) {

17
tests/js/object-tests.js
View File

@ -474,15 +474,30 @@ module.exports = BaseTest.extend({
TestCase.assertEqual(obj.ignored, true); TestCase.assertEqual(obj.ignored, true);
}, },
testCurrentDate: function() { testDates: function() {
Realm.copyBundledRealmFiles(); Realm.copyBundledRealmFiles();
// test file format upgrade
var realm_v3 = new Realm({path: 'dates-v3.realm', schema: [schemas.DateObject]}); var realm_v3 = new Realm({path: 'dates-v3.realm', schema: [schemas.DateObject]});
TestCase.assertEqual(realm_v3.objects('Date').length, 1); TestCase.assertEqual(realm_v3.objects('Date').length, 1);
TestCase.assertEqual(realm_v3.objects('Date')[0].currentDate.getTime(), 1462500087955); TestCase.assertEqual(realm_v3.objects('Date')[0].currentDate.getTime(), 1462500087955);
// get new file format is not upgraded
var realm_v5 = new Realm({path: 'dates-v5.realm', schema: [schemas.DateObject]}); var realm_v5 = new Realm({path: 'dates-v5.realm', schema: [schemas.DateObject]});
TestCase.assertEqual(realm_v5.objects('Date').length, 1); TestCase.assertEqual(realm_v5.objects('Date').length, 1);
TestCase.assertEqual(realm_v5.objects('Date')[0].currentDate.getTime(), 1462500087955); TestCase.assertEqual(realm_v5.objects('Date')[0].currentDate.getTime(), 1462500087955);
// test different dates
var realm = new Realm({schema: [schemas.DateObject]});
realm.write(function() {
realm.create('Date', { currentDate: new Date(10000) });
realm.create('Date', { currentDate: new Date(-10000) });
realm.create('Date', { currentDate: new Date(1000000000000) });
realm.create('Date', { currentDate: new Date(-1000000000000) });
});
TestCase.assertEqual(realm.objects('Date')[0].currentDate.getTime(), 10000);
TestCase.assertEqual(realm.objects('Date')[1].currentDate.getTime(), -10000);
TestCase.assertEqual(realm.objects('Date')[2].currentDate.getTime(), 1000000000000);
TestCase.assertEqual(realm.objects('Date')[3].currentDate.getTime(), -1000000000000);
} }
}); });