From a6bd75d7800c5d6783c3e70b93646dd9f1824d5f Mon Sep 17 00:00:00 2001
From: westito <nemeth@marcell.it>
Date: Fri, 26 Nov 2021 14:15:54 +0100
Subject: [PATCH] fix post-merge issues

---
 drift/example/main.g.dart                        | 4 ++--
 drift_dev/lib/src/analyzer/dart/view_parser.dart | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drift/example/main.g.dart b/drift/example/main.g.dart
index a91746a7..076bf5ba 100644
--- a/drift/example/main.g.dart
+++ b/drift/example/main.g.dart
@@ -467,7 +467,7 @@ class $TodoItemsTable extends TodoItems
 class TodoCategoryItemCountData extends DataClass {
   final String name;
   final int itemCount;
-  TodoCategoryItemCountData({required this.name, required this.itemCount});
+  TodoCategoryItemCountData({required this.itemCount});
   factory TodoCategoryItemCountData.fromData(Map<String, dynamic> data,
       {String? prefix}) {
     final effectivePrefix = prefix ?? '';
@@ -567,7 +567,7 @@ class $TodoCategoryItemCountView
 class TodoItemWithCategoryNameViewData extends DataClass {
   final int id;
   final String title;
-  TodoItemWithCategoryNameViewData({required this.id, required this.title});
+  TodoItemWithCategoryNameViewData({required this.title});
   factory TodoItemWithCategoryNameViewData.fromData(Map<String, dynamic> data,
       {String? prefix}) {
     final effectivePrefix = prefix ?? '';
diff --git a/drift_dev/lib/src/analyzer/dart/view_parser.dart b/drift_dev/lib/src/analyzer/dart/view_parser.dart
index 104737b8..1a0e256c 100644
--- a/drift_dev/lib/src/analyzer/dart/view_parser.dart
+++ b/drift_dev/lib/src/analyzer/dart/view_parser.dart
@@ -80,7 +80,7 @@ class ViewParser {
     final verified = existingClass == null
         ? null
         : validateExistingClass(columns, existingClass,
-            constructorInExistingClass!, generateInsertable!, base.step.errors);
+            constructorInExistingClass!, generateInsertable!, base.step);
     return _DataClassInformation(name, verified);
   }