Merge pull request #2581 from nikitadol/develop

fix code generation for `enum` with generics
simolus3 · Aug 27, 2023 · 18b11d7 · 18b11d7
2 parents 84e2511 + f408991
commit 18b11d7
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/drift_dev/lib/src/analysis/resolver/shared/dart_types.dart b/drift_dev/lib/src/analysis/resolver/shared/dart_types.dart
@@ -357,9 +357,9 @@ AppliedTypeConverter readEnumConverter(
     }
     builder
       ..addText('<')
-      ..addDartType(dartEnumType)
+      ..addTopLevelElement(dartEnumType.element!)
       ..addText('>(')
-      ..addDartType(dartEnumType)
+      ..addTopLevelElement(dartEnumType.element!)
       ..addText('.values)');
   });
 

diff --git a/drift_dev/test/analysis/resolver/dart/enum_columns_test.dart b/drift_dev/test/analysis/resolver/dart/enum_columns_test.dart
@@ -17,10 +17,15 @@ void main() {
           apple, orange, banana
         }
 
+        enum FruitsWithGeneric<T> {
+          apple, orange, banana
+        }
+
         class NotAnEnum {}
 
         class ValidUsage extends Table {
           IntColumn get intFruit => intEnum<Fruits>()();
+          IntColumn get intFruitsWithGeneric => intEnum<FruitsWithGeneric>()();
           TextColumn get textFruit => textEnum<Fruits>()();
         }
 

diff --git a/drift_dev/test/analysis/resolver/drift/table_test.dart b/drift_dev/test/analysis/resolver/drift/table_test.dart
@@ -89,6 +89,7 @@ CREATE TABLE b (
 
          CREATE TABLE foo (
            fruitIndex ENUM(Fruits) NOT NULL,
+           fruitWithGenericIndex ENUM(FruitsWithGeneric) NOT NULL,
            fruitName ENUMNAME(Fruits) NOT NULL,
            anotherIndex ENUM(DoesNotExist) NOT NULL,
            anotherName ENUMNAME(DoesNotExist) NOT NULL
@@ -98,6 +99,10 @@ CREATE TABLE b (
         enum Fruits {
           apple, orange, banana
         }
+
+        enum FruitsWithGeneric<T> {
+          apple, orange, banana
+        }
       ''',
     });
 
@@ -118,6 +123,22 @@ CREATE TABLE b (
           .having((e) => e.dartType.getDisplayString(withNullability: true),
               'dartType', 'Fruits'),
     );
+
+    final withGenericIndexColumn = table.columns
+        .singleWhere((c) => c.nameInSql == 'fruitWithGenericIndex');
+    expect(withGenericIndexColumn.sqlType, DriftSqlType.int);
+    expect(
+      withGenericIndexColumn.typeConverter,
+      isA<AppliedTypeConverter>()
+          .having(
+            (e) => e.expression.toString(),
+            'expression',
+            contains('EnumIndexConverter<FruitsWithGeneric>'),
+          )
+          .having(
+              (e) => e.dartType.element!.name, 'dartType', 'FruitsWithGeneric'),
+    );
+
     final nameColumn =
         table.columns.singleWhere((c) => c.nameInSql == 'fruitName');