resolve conflicts

Author: juleswritescode

.github/workflows/pull_request.yml

@@ -184,6 +184,8 @@ jobs:
         uses: ./.github/actions/free-disk-space
       - name: Install toolchain
         uses: moonrepo/setup-rust@v1
+        with:
+          cache-base: main
       - name: Build main binary
         run: cargo build -p pgt_cli --release
       - name: Setup Bun
@@ -222,6 +224,10 @@ jobs:
           cache-base: main
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Ensure RustFMT on nightly toolchain
+        run: rustup component add rustfmt --toolchain nightly
+      - name: echo toolchain
+        run: rustup show
       - name: Run the analyser codegen
         run: cargo run -p xtask_codegen -- analyser
       - name: Run the configuration codegen

.sqlx/query-df57cc22f7d63847abce1d0d15675ba8951faa1be2ea6b2bf6714b1aa9127a6f.json

@@ -4,7 +4,9 @@ use crate::{
     builder::CompletionBuilder,
     context::CompletionContext,
     item::CompletionItem,
-    providers::{complete_columns, complete_functions, complete_schemas, complete_tables},
+    providers::{
+        complete_columns, complete_functions, complete_policies, complete_schemas, complete_tables,
+    },
     sanitization::SanitizedCompletionParams,
 };
 
@@ -33,6 +35,7 @@ pub fn complete(params: CompletionParams) -> Vec<CompletionItem> {
     complete_functions(&ctx, &mut builder);
     complete_columns(&ctx, &mut builder);
     complete_schemas(&ctx, &mut builder);
+    complete_policies(&ctx, &mut builder);
 
     builder.finish()
 }