Merge remote-tracking branch 'origin/master' into query-stats-4

.github/workflows.src/tests.inc.yml

@@ -89,7 +89,7 @@
       id: ext-cache
       with:
         path: build/extensions
-        key: edb-ext-v5-${{ hashFiles('shared-artifacts/ext_cache_key.txt') }}
+        key: edb-ext-v6-${{ hashFiles('shared-artifacts/ext_cache_key.txt') }}
 
     - name: Handle cached PostgreSQL build
       uses: actions/cache@v4
@@ -123,7 +123,7 @@
         steps.postgres-cache.outputs.cache-hit != 'true'
       run: |
         sudo apt-get update
-        sudo apt-get install -y uuid-dev libreadline-dev bison flex
+        sudo apt-get install -y uuid-dev libreadline-dev bison flex libprotobuf-c-dev
 
     - name: Install Rust toolchain
       if: |
@@ -195,7 +195,7 @@
       if: steps.ext-cache.outputs.cache-hit != 'true'
       with:
         path: ${{ env.BUILD_TEMP }}/edb
-        key: edb-ext-build-v3-${{ hashFiles('shared-artifacts/ext_cache_key.txt') }}
+        key: edb-ext-build-v4-${{ hashFiles('shared-artifacts/ext_cache_key.txt') }}
 
     - name: Build Cython extensions
       env:
@@ -377,7 +377,7 @@
       id: ext-cache
       with:
         path: build/extensions
-        key: edb-ext-v5-${{ hashFiles('shared-artifacts/ext_cache_key.txt') }}
+        key: edb-ext-v6-${{ hashFiles('shared-artifacts/ext_cache_key.txt') }}
 
     - name: Restore compiled parsers cache
       uses: actions/cache@v4

.gitignore

@@ -3,7 +3,8 @@
 *.pyo
 *.o
 *.so
-.vscode
+.vscode/
+.zed/
 *~
 .#*
 .*.swp
@@ -37,3 +38,4 @@ docs/_build
 /.vagga
 /.dmypy.json
 /compile_commands.json
+/pyrightconfig.json

.gitmodules

@@ -7,4 +7,4 @@
 	url = https://github.com/MagicStack/py-pgproto.git
 [submodule "edb/pgsql/parser/libpg_query"]
 	path = edb/pgsql/parser/libpg_query
-	url = https://github.com/msullivan/libpg_query.git
+	url = https://github.com/edgedb/libpg_query.git