Merge remote-tracking branch 'upstream/v2' into store-rework-2

.github/workflows/lint-rust.yml

@@ -126,7 +126,7 @@ jobs:
   clippy:
     needs: changes
     if: ${{ needs.changes.outputs.packages != '[]' && needs.changes.outputs.packages != '' }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:

.github/workflows/test-rust.yml

@@ -168,7 +168,7 @@ jobs:
             }
           - {
               target: x86_64-unknown-linux-gnu,
-              os: ubuntu-latest,
+              os: ubuntu-22.04,
               runner: 'cargo',
               command: 'test'
             }

plugins/sql/src/lib.rs

@@ -145,7 +145,9 @@ impl Builder {
                     for db in config.preload {
                         let pool = DbPool::connect(&db, app).await?;
 
-                        if let Some(migrations) = self.migrations.as_mut().unwrap().remove(&db) {
+                        if let Some(migrations) =
+                            self.migrations.as_mut().and_then(|mm| mm.remove(&db))
+                        {
                             let migrator = Migrator::new(migrations).await?;
                             pool.migrate(&migrator).await?;
                         }