Make generator run

pinchbv · Nov 22, 2020 · a25a0e3 · a25a0e3
1 parent 815a259
commit a25a0e3
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/...ib/misc/extension/foreign_key_action.dart → ...tension/foreign_key_action_extension.dart b/...ib/misc/extension/foreign_key_action.dart → ...tension/foreign_key_action_extension.dart
@@ -1,7 +1,7 @@
 import 'package:floor_annotation/floor_annotation.dart';
 import 'package:floor_generator/misc/annotations.dart';
 
-extension ToSQL on ForeignKeyAction {
+extension ForeignKeyActionExtension on ForeignKeyAction {
   @nonNull
   String toSql() {
     switch (this) {

diff --git a/floor_generator/lib/processor/entity_processor.dart b/floor_generator/lib/processor/entity_processor.dart
@@ -2,11 +2,10 @@ import 'package:analyzer/dart/constant/value.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:dartx/dartx.dart';
 import 'package:floor_annotation/floor_annotation.dart' as annotations;
-import 'package:floor_generator/misc/extension/dart_object_extension.dart';
 import 'package:floor_generator/misc/annotations.dart';
 import 'package:floor_generator/misc/constants.dart';
+import 'package:floor_generator/misc/extension/dart_object_extension.dart';
 import 'package:floor_generator/misc/extension/type_converters_extension.dart';
-import 'package:floor_generator/misc/foreign_key_action.dart';
 import 'package:floor_generator/misc/type_utils.dart';
 import 'package:floor_generator/processor/error/entity_processor_error.dart';
 import 'package:floor_generator/processor/queryable_processor.dart';

diff --git a/floor_generator/lib/value_object/foreign_key.dart b/floor_generator/lib/value_object/foreign_key.dart
@@ -1,9 +1,7 @@
 import 'package:collection/collection.dart';
 import 'package:floor_annotation/floor_annotation.dart' show ForeignKeyAction;
 import 'package:floor_generator/misc/annotations.dart';
-import 'package:floor_generator/misc/extension/foreign_key_action.dart';
-
-export 'package:floor_annotation/floor_annotation.dart' show ForeignKeyAction;
+import 'package:floor_generator/misc/extension/foreign_key_action_extension.dart';
 
 class ForeignKey {
   final String parentName;

diff --git a/...or/test/misc/foreign_key_action_test.dart → ...on/foreign_key_action_extension_test.dart b/...or/test/misc/foreign_key_action_test.dart → ...on/foreign_key_action_extension_test.dart
@@ -1,5 +1,5 @@
-import 'package:floor_generator/misc/extension/foreign_key_action.dart';
 import 'package:floor_annotation/floor_annotation.dart' as annotations;
+import 'package:floor_generator/misc/extension/foreign_key_action_extension.dart';
 import 'package:test/test.dart';
 
 void main() {

diff --git a/floor_generator/test/processor/entity_processor_test.dart b/floor_generator/test/processor/entity_processor_test.dart
@@ -1,5 +1,6 @@
 import 'package:analyzer/dart/element/element.dart';
 import 'package:build_test/build_test.dart';
+import 'package:floor_annotation/floor_annotation.dart' as annotations;
 import 'package:floor_generator/misc/constants.dart';
 import 'package:floor_generator/processor/entity_processor.dart';
 import 'package:floor_generator/processor/error/entity_processor_error.dart';
@@ -134,8 +135,8 @@ void main() {
         'Person',
         ['id'],
         ['owner_id'],
-        ForeignKeyAction.cascade,
-        ForeignKeyAction.setNull,
+        annotations.ForeignKeyAction.cascade,
+        annotations.ForeignKeyAction.setNull,
       );
       expect(actual, equals(expected));
     });
@@ -176,7 +177,7 @@ void main() {
           }
       ''');
 
-      final processor = EntityProcessor(classElements[1]);
+      final processor = EntityProcessor(classElements[1], {});
       expect(
           processor.process,
           throwsInvalidGenerationSourceError(

diff --git a/floor_generator/test/value_object/entity_test.dart b/floor_generator/test/value_object/entity_test.dart
@@ -1,5 +1,6 @@
+import 'package:floor_annotation/floor_annotation.dart' as annotations;
 import 'package:floor_generator/misc/constants.dart';
-import 'package:floor_generator/misc/extension/foreign_key_action.dart';
+import 'package:floor_generator/misc/extension/foreign_key_action_extension.dart';
 import 'package:floor_generator/value_object/entity.dart';
 import 'package:floor_generator/value_object/field.dart';
 import 'package:floor_generator/value_object/foreign_key.dart';
@@ -120,8 +121,8 @@ void main() {
         'parentName',
         ['parentColumn'],
         ['childColumn'],
-        ForeignKeyAction.cascade,
-        ForeignKeyAction.noAction,
+        annotations.ForeignKeyAction.cascade,
+        annotations.ForeignKeyAction.noAction,
       );
       final primaryKey = PrimaryKey([nullableField], true);
       final entity = Entity(

diff --git a/floor_generator/test/value_object/foreign_key_test.dart b/floor_generator/test/value_object/foreign_key_test.dart
@@ -1,3 +1,4 @@
+import 'package:floor_annotation/floor_annotation.dart' as annotations;
 import 'package:floor_generator/value_object/foreign_key.dart';
 import 'package:test/test.dart';
 
@@ -8,8 +9,8 @@ void main() {
         'Person',
         ['id'],
         ['owner_id'],
-        ForeignKeyAction.cascade,
-        ForeignKeyAction.setNull,
+        annotations.ForeignKeyAction.cascade,
+        annotations.ForeignKeyAction.setNull,
       );
 
       final actual = foreignKey.getDefinition();
@@ -26,8 +27,8 @@ void main() {
         'Person',
         ['id', 'foo'],
         ['owner_id', 'bar'],
-        ForeignKeyAction.cascade,
-        ForeignKeyAction.setNull,
+        annotations.ForeignKeyAction.cascade,
+        annotations.ForeignKeyAction.setNull,
       );
 
       final actual = foreignKey.getDefinition();