Fix defining indices on expressions (#2643)

simolus3 · Sep 27, 2023 · 2edd75a · 2edd75a
1 parent d0a3fee
commit 2edd75a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 17 deletions.
diff --git a/drift_dev/CHANGELOG.md b/drift_dev/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 2.12.1-dev
 
 - Fix invalid types listed in `views` crashing the generator.
+- Fix indices in drift files crashing the generator when they index expressions.
 
 ## 2.12.0
 

diff --git a/drift_dev/lib/src/analysis/resolver/drift/index.dart b/drift_dev/lib/src/analysis/resolver/drift/index.dart
@@ -20,28 +20,18 @@ class DriftIndexResolver extends DriftElementResolver<DiscoveredDriftIndex> {
 
     final onTable = stmt.on.resolved;
     DriftTable? target;
-    List<DriftColumn> indexedColumns = [];
 
     if (onTable is Table) {
       target = references
           .whereType<DriftTable>()
           .firstWhere((e) => e.schemaName == onTable.name);
-
-      for (final indexedColumn in stmt.columns) {
-        final name = (indexedColumn.expression as Reference).columnName;
-        final tableColumn = target.columnBySqlName[name];
-
-        if (tableColumn != null) {
-          indexedColumns.add(tableColumn);
-        }
-      }
     }
 
     return DriftIndex(
       discovered.ownId,
       DriftDeclaration.driftFile(stmt, file.ownUri),
       table: target,
-      indexedColumns: indexedColumns,
+      indexedColumns: [],
       unique: stmt.unique,
       createStmt: source.substring(stmt.firstPosition, stmt.lastPosition),
     );

diff --git a/drift_dev/lib/src/analysis/results/index.dart b/drift_dev/lib/src/analysis/results/index.dart
@@ -13,6 +13,10 @@ class DriftIndex extends DriftSchemaElement {
   DriftTable? table;
 
   /// Columns of [table] that have been indexed.
+  ///
+  /// This list is empty for indices created in SQL because it can't represent
+  /// all expressions being indexed. It is useful for Dart-defined indices to
+  /// implement [createStatementForDartDefinition].
   List<DriftColumn> indexedColumns;
 
   /// Whethet the index has been declared to be unique.

diff --git a/drift_dev/test/backends/build/build_integration_test.dart b/drift_dev/test/backends/build/build_integration_test.dart
@@ -22,14 +22,15 @@ class MyDatabase {}
       'a|lib/a.drift': '''
 import 'b.drift';
 
-CREATE INDEX b_idx /* comment should be stripped */ ON b (foo);
+CREATE INDEX b_idx /* comment should be stripped */ ON b (foo, upper(foo));
 ''',
       'a|lib/b.drift': 'CREATE TABLE b (foo TEXT);',
     });
 
     checkOutputs({
       'a|lib/main.drift.dart': decodedMatches(contains(
-          "late final Index bIdx = Index('b_idx', 'CREATE INDEX b_idx ON b (foo)')")),
+          'late final Index bIdx =\n'
+          "      Index('b_idx', 'CREATE INDEX b_idx ON b (foo, upper(foo))')")),
     }, result.dartOutputs, result.writer);
   });
 

diff --git a/drift_dev/test/cli/schema/dump_test.dart b/drift_dev/test/cli/schema/dump_test.dart
@@ -127,7 +127,7 @@ void main() {
         "name": "idx",
         "sql": "CREATE INDEX idx ON users (name);",
         "unique": false,
-        "columns": ["name"]
+        "columns": []
       }
     }
   ]

diff --git a/drift_dev/test/services/schema/writer_test.dart b/drift_dev/test/services/schema/writer_test.dart
@@ -40,7 +40,7 @@ CREATE TRIGGER delete_empty_groups AFTER DELETE ON group_members BEGIN
     WHERE NOT EXISTS (SELECT * FROM group_members WHERE "group" = "groups".id);
 END;
 
-CREATE INDEX groups_name ON "groups"(name);
+CREATE INDEX groups_name ON "groups"(name, upper(name));
 
 CREATE VIEW my_view WITH MyViewRow AS SELECT id FROM "groups";
 
@@ -368,9 +368,9 @@ const expected = r'''
             "data": {
                 "on": 0,
                 "name": "groups_name",
-                "sql": "CREATE INDEX groups_name ON \"groups\"(name);",
+                "sql": "CREATE INDEX groups_name ON \"groups\"(name, upper(name));",
                 "unique": false,
-                "columns": ["name"]
+                "columns": []
             }
         },
         {