AMT-Cheif
/
drift
mirror of https://github.com/AMT-Cheif/drift.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
Simon Binder 2019-06-27 10:01:05 +02:00
parent 6238e459d1 3c7e25a169
commit 6d54a21091
No known key found for this signature in database
GPG Key ID: 7891917E4147B8C0
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
moor/lib/src/runtime/data_class.dart
View File

@ -86,8 +86,12 @@ class _DefaultValueSerializer extends ValueSerializer {
@override @override
T fromJson<T>(json) { T fromJson<T>(json) {
if (T == DateTime) { if (T == DateTime) {
if (json == null) {
return null;
} else {
return DateTime.fromMillisecondsSinceEpoch(json as int) as T; return DateTime.fromMillisecondsSinceEpoch(json as int) as T;
} }
}
return json as T; return json as T;
} }

6
moor/test/serialization_test.dart
View File

@ -54,6 +54,12 @@ class CustomSerializer extends ValueSerializer {
} }
void main() { void main() {
test('default serializer', () {
final serializer = const ValueSerializer.defaults();
expect(serializer.toJson<DateTime>(null), null);
expect(serializer.fromJson<DateTime>(null), null);
});
group('serialization', () { group('serialization', () {
test('with defaults', () { test('with defaults', () {
expect(someTodoEntry.toJson(), equals(regularSerialized)); expect(someTodoEntry.toJson(), equals(regularSerialized));

1
moor/test/transactions_test.dart
View File

@ -19,6 +19,7 @@ void main() {
expect(() async { expect(() async {
await db.transaction((t) { await db.transaction((t) {
t.select(db.users).watch(); t.select(db.users).watch();
return Future.value(null); // analysis warning in travis otherwise
}); });
}, throwsStateError); }, throwsStateError);