diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 37595ea..39f2156 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -5,20 +5,24 @@ on:
     branches:
       - main
       - "[0-9].x"
+      - windows-support
 
 name: Continuous integration
 
 jobs:
   ci:
     env:
-      RUSTFLAGS: ${{ matrix.rust == 'nightly' && '-Z sanitizer=leak' || '' }}
-    runs-on: ubuntu-latest
+      RUSTFLAGS: ${{ matrix.rust == 'nightly' && matrix.os == 'ubuntu-latest' && '-Z sanitizer=leak' || '' }}
     strategy:
       fail-fast: false
       matrix:
         rust:
           - stable
           - nightly
+        os:
+          - ubuntu-latest
+          - windows-latest
+    runs-on: ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v2
diff --git a/libpg_query b/libpg_query
index 2a00188..31ee266 160000
--- a/libpg_query
+++ b/libpg_query
@@ -1 +1 @@
-Subproject commit 2a0018867c20011fc7166767083c05965241140b
+Subproject commit 31ee2669a23663bd72158123db2b1b3691fceb97