From c13b0ff17f03e384ae80af2f277a3357d26912b4 Mon Sep 17 00:00:00 2001
From: yohom <382146139@qq.com>
Date: Thu, 14 Mar 2019 17:42:58 +0800
Subject: [PATCH 1/2] Add a `toJson` method for serialization.

---
 .../example/lib/database/database.g.dart         | 16 ++++++++++++++++
 .../lib/src/writer/data_class_writer.dart        | 14 ++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/moor_flutter/example/lib/database/database.g.dart b/moor_flutter/example/lib/database/database.g.dart
index 8f684ee5..ffb1b5e4 100644
--- a/moor_flutter/example/lib/database/database.g.dart
+++ b/moor_flutter/example/lib/database/database.g.dart
@@ -23,6 +23,15 @@ class TodoEntry {
       category: intType.mapFromDatabaseResponse(data['category']),
     );
   }
+  Map<String, Object> toJson() {
+    return {
+      'id': id,
+      'content': content,
+      'targetDate': targetDate,
+      'category': category,
+    };
+  }
+
   TodoEntry copyWith(
           {int id, String content, DateTime targetDate, int category}) =>
       TodoEntry(
@@ -128,6 +137,13 @@ class Category {
       description: stringType.mapFromDatabaseResponse(data['`desc`']),
     );
   }
+  Map<String, Object> toJson() {
+    return {
+      'id': id,
+      'description': description,
+    };
+  }
+
   Category copyWith({int id, String description}) => Category(
         id: id ?? this.id,
         description: description ?? this.description,
diff --git a/moor_generator/lib/src/writer/data_class_writer.dart b/moor_generator/lib/src/writer/data_class_writer.dart
index 3a002615..462448a0 100644
--- a/moor_generator/lib/src/writer/data_class_writer.dart
+++ b/moor_generator/lib/src/writer/data_class_writer.dart
@@ -26,6 +26,9 @@ class DataClassWriter {
     // Also write parsing factory
     _writeMappingConstructor(buffer);
 
+    // And a serializer method
+    _writeToJson(buffer);
+
     // And a convenience method to copy data from this class.
     _writeCopyWith(buffer);
 
@@ -94,6 +97,17 @@ class DataClassWriter {
     buffer.write(');}\n');
   }
 
+  void _writeToJson(StringBuffer buffer) {
+    buffer.write('Map<String, Object> toJson() {\n return {');
+
+    for (var column in table.columns) {
+      final getter = column.dartGetterName;
+      buffer.write('\'$getter\': $getter,');
+    }
+
+    buffer.write('};}');
+  }
+
   void _writeCopyWith(StringBuffer buffer) {
     final dataClassName = table.dartTypeName;
 

From c24f3caff2e534f0e5df6fda39ef3c1e9438c0e4 Mon Sep 17 00:00:00 2001
From: yohom <382146139@qq.com>
Date: Fri, 15 Mar 2019 08:52:54 +0800
Subject: [PATCH 2/2] `Map<String, Object>` -> `Map<String, dynamic>`

---
 moor_flutter/example/lib/database/database.g.dart    | 4 ++--
 moor_generator/lib/src/writer/data_class_writer.dart | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/moor_flutter/example/lib/database/database.g.dart b/moor_flutter/example/lib/database/database.g.dart
index ffb1b5e4..01f7478d 100644
--- a/moor_flutter/example/lib/database/database.g.dart
+++ b/moor_flutter/example/lib/database/database.g.dart
@@ -23,7 +23,7 @@ class TodoEntry {
       category: intType.mapFromDatabaseResponse(data['category']),
     );
   }
-  Map<String, Object> toJson() {
+  Map<String, dynamic> toJson() {
     return {
       'id': id,
       'content': content,
@@ -137,7 +137,7 @@ class Category {
       description: stringType.mapFromDatabaseResponse(data['`desc`']),
     );
   }
-  Map<String, Object> toJson() {
+  Map<String, dynamic> toJson() {
     return {
       'id': id,
       'description': description,
diff --git a/moor_generator/lib/src/writer/data_class_writer.dart b/moor_generator/lib/src/writer/data_class_writer.dart
index 462448a0..897c209a 100644
--- a/moor_generator/lib/src/writer/data_class_writer.dart
+++ b/moor_generator/lib/src/writer/data_class_writer.dart
@@ -1,5 +1,5 @@
-import 'package:recase/recase.dart';
 import 'package:moor_generator/src/model/specified_table.dart';
+import 'package:recase/recase.dart';
 
 class DataClassWriter {
   final SpecifiedTable table;
@@ -98,7 +98,7 @@ class DataClassWriter {
   }
 
   void _writeToJson(StringBuffer buffer) {
-    buffer.write('Map<String, Object> toJson() {\n return {');
+    buffer.write('Map<String, dynamic> toJson() {\n return {');
 
     for (var column in table.columns) {
       final getter = column.dartGetterName;