From f943576f5d79b4f0a130db0e2c57100611b90f0a Mon Sep 17 00:00:00 2001
From: Simon Binder <oss@simonbinder.eu>
Date: Tue, 9 Mar 2021 21:37:39 +0100
Subject: [PATCH] Migrate schema verification apis to null-safety

---
 moor_generator/CHANGELOG.md                      |  4 ++++
 moor_generator/lib/api/migrations.dart           |  1 -
 .../src/analyzer/moor/moor_ffi_extension.dart    |  5 +----
 .../src/services/schema/find_differences.dart    | 16 +++++++---------
 .../lib/src/services/schema/verifier_impl.dart   |  3 +--
 5 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/moor_generator/CHANGELOG.md b/moor_generator/CHANGELOG.md
index f9dc2fac..c431f1c8 100644
--- a/moor_generator/CHANGELOG.md
+++ b/moor_generator/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.2.0-dev
+
+- Migrate `package:moor_generator/api/migrations.dart` to null-safety
+
 ## 4.1.0
 
 - Stabilized support for generating null-safe code
diff --git a/moor_generator/lib/api/migrations.dart b/moor_generator/lib/api/migrations.dart
index f46eafeb..339ab817 100644
--- a/moor_generator/lib/api/migrations.dart
+++ b/moor_generator/lib/api/migrations.dart
@@ -1,4 +1,3 @@
-//@dart=2.9
 import 'package:moor/moor.dart';
 
 import 'package:moor_generator/src/services/schema/verifier_impl.dart';
diff --git a/moor_generator/lib/src/analyzer/moor/moor_ffi_extension.dart b/moor_generator/lib/src/analyzer/moor/moor_ffi_extension.dart
index bc74a258..082e2667 100644
--- a/moor_generator/lib/src/analyzer/moor/moor_ffi_extension.dart
+++ b/moor_generator/lib/src/analyzer/moor/moor_ffi_extension.dart
@@ -1,4 +1,3 @@
-//@dart=2.9
 import 'package:sqlparser/sqlparser.dart';
 
 class MoorFfiExtension implements Extension {
@@ -29,7 +28,7 @@ class _MoorFfiFunctions with ArgumentCountLinter implements FunctionHandler {
   }
 
   @override
-  int argumentCountFor(String function) {
+  int? argumentCountFor(String function) {
     if (_unaryFunctions.contains(function)) {
       return 1;
     } else if (function == 'pow') {
@@ -37,8 +36,6 @@ class _MoorFfiFunctions with ArgumentCountLinter implements FunctionHandler {
     } else if (function == 'current_time_millis') {
       return 0;
     }
-    // ignore: avoid_returning_null
-    return null;
   }
 
   @override
diff --git a/moor_generator/lib/src/services/schema/find_differences.dart b/moor_generator/lib/src/services/schema/find_differences.dart
index 5e48d349..731bc003 100644
--- a/moor_generator/lib/src/services/schema/find_differences.dart
+++ b/moor_generator/lib/src/services/schema/find_differences.dart
@@ -1,5 +1,3 @@
-//@dart=2.9
-import 'package:meta/meta.dart';
 import 'package:moor_generator/src/analyzer/moor/moor_ffi_extension.dart';
 import 'package:sqlparser/sqlparser.dart';
 // ignore: implementation_imports
@@ -48,10 +46,10 @@ class FindSchemaDifferences {
   }
 
   CompareResult _compareNamed<T>({
-    @required List<T> reference,
-    @required List<T> actual,
-    @required String Function(T) name,
-    @required CompareResult Function(T, T) compare,
+    required List<T> reference,
+    required List<T> actual,
+    required String Function(T) name,
+    required CompareResult Function(T, T) compare,
     bool validateActualInReference = true,
   }) {
     final results = <String, CompareResult>{};
@@ -69,8 +67,8 @@ class FindSchemaDifferences {
         results['comparing $inReference'] = FoundDifference(
             'The actual schema does not contain anything with this name.');
       } else {
-        referenceToActual[referenceByName[inReference]] =
-            actualByName[inReference];
+        referenceToActual[referenceByName[inReference]!] =
+            actualByName[inReference]!;
       }
     }
 
@@ -188,7 +186,7 @@ class FindSchemaDifferences {
       return const Success();
     } catch (e) {
       return FoundDifference(
-          'Not equal: `${a.span.text}` and `${b.span.text}`');
+          'Not equal: `${a.span?.text}` and `${b.span?.text}`');
     }
   }
 
diff --git a/moor_generator/lib/src/services/schema/verifier_impl.dart b/moor_generator/lib/src/services/schema/verifier_impl.dart
index 6dc41e08..946fe756 100644
--- a/moor_generator/lib/src/services/schema/verifier_impl.dart
+++ b/moor_generator/lib/src/services/schema/verifier_impl.dart
@@ -1,4 +1,3 @@
-//@dart=2.9
 import 'dart:math';
 
 import 'package:moor/ffi.dart';
@@ -98,7 +97,7 @@ extension on QueryExecutor {
 class _DelegatingUser extends QueryExecutorUser {
   @override
   final int schemaVersion;
-  final QueryExecutorUser inner;
+  final QueryExecutorUser? inner;
 
   _DelegatingUser(this.schemaVersion, [this.inner]);