Cache flutter

.github/actions/prepare/action.yml

@@ -14,6 +14,9 @@ runs:
       with:
         channel: stable
         flutter-version: ${{ inputs.flutter_version }}
+        cache: true
+        cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:"
+        cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:"
 
     # Setup sqlite3
     - name: Download sqlite3

.github/workflows/main.yml

@@ -26,13 +26,6 @@ jobs:
       - uses: ./.github/actions/prepare
         with:
           flutter_version: ${{ needs.setup.outputs.flutter_version }}
-      - name: Setup Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          flutter-version: 3.32
-          cache: true
-          cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:"
-          cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:"
       - name: Bootstrap Dart packages
         run: melos bootstrap --scope drift_docs,drift,app
         working-directory: .
@@ -286,9 +279,9 @@ jobs:
     needs: [setup]
     strategy:
       matrix:
-        # We currently don't support 3.27 because we depend on a WIP build version that requires Dart 3.8.
-        # Generally we attempt to support the latest two versions.
-        flutter: ["3.29"]
+        # We currently don't support <3.35.1 because we depend on melos v7, which needs Dart 3.9.0.
+        # Generally, we try to support the latest two stable Flutter releases.
+        flutter: ["3.35.1"]
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/setup.yml

@@ -53,6 +53,10 @@ jobs:
       - name: Set up Flutter
         id: setup_flutter
         uses: subosito/flutter-action@v2
+        with:
+          cache: true
+          cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:"
+          cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:"
       - uses: actions/cache@v4
         with:
           path: "${{ env.PUB_CACHE }}"

drift/lib/src/runtime/manager/manager.dart

@@ -223,7 +223,7 @@ class TableManagerState<
       withReferenceMapper: _withReferenceMapper,
       prefetchHooksCallback: _prefetchHooksCallback,
       addedColumns: addedColumns ?? this.addedColumns,
-      prefetchedData: prefetchedDataAsTypedResult ?? this._prefetchedData,
+      prefetchedData: prefetchedDataAsTypedResult ?? _prefetchedData,
       prefetchHooks: prefetchHooks ?? this.prefetchHooks,
       filter: filter ?? this.filter,
       joinBuilders: joinBuilders ?? this.joinBuilders,