Merge branch 'chore/upgrade-pg-query' into feat/release-pipeline

Author: juleswritescode

.github/workflows/pull_request.yml

@@ -122,7 +122,7 @@ jobs:
       matrix:
         include:
           # reactive once we upgrade to the latest version of pg_query that is windows-compatible
-          # - os: windows-latest
+          - os: windows-latest
           - os: ubuntu-latest
     steps:
       - name: Checkout PR branch

.gitmodules

@@ -1,6 +1,7 @@
 [submodule "libpg_query"]
 	path = libpg_query
 	url = https://github.com/pganalyze/libpg_query.git
+    branch = 17-latest
 [submodule "crates/tree_sitter_sql/tree-sitter-sql"]
 	path = lib/tree_sitter_sql/tree-sitter-sql
 	url = https://github.com/DerekStride/tree-sitter-sql

Cargo.lock

@@ -15,7 +15,7 @@ version              = "0.0.0"
 regex = "1.9.1"
 
 pg_lexer_codegen.workspace = true
-pg_query                   = "0.8"
+pg_query                   = "6.0.0"
 
 cstree              = { version = "0.12.0", features = ["derive"] }
 text-size.workspace = true

crates/pg_lexer/Cargo.toml

@@ -60,7 +60,7 @@ pub static WHITESPACE_TOKENS: &[SyntaxKind] = &[
 ];
 
 static PATTERN_LEXER: LazyLock<Regex> =
-    LazyLock::new(|| Regex::new(r"(?P<whitespace> +)|(?P<newline>\n+)|(?P<tab>\t+)").unwrap());
+    LazyLock::new(|| Regex::new(r"(?P<whitespace> +)|(?P<newline>\r?\n+)|(?P<tab>\t+)").unwrap());
 
 fn whitespace_tokens(input: &str) -> VecDeque<Token> {
     let mut tokens = VecDeque::new();

crates/pg_lexer/src/lib.rs

@@ -13,7 +13,7 @@ version              = "0.0.0"
 
 [dependencies]
 petgraph = "0.6.4"
-pg_query = "0.8"
+pg_query = "6.0.0"
 
 pg_diagnostics.workspace       = true
 pg_lexer.workspace             = true

crates/pg_query_ext/Cargo.toml

@@ -17,4 +17,4 @@ text-size.workspace = true
 
 [dev-dependencies]
 ntest    = "0.9.3"
-pg_query = "0.8"
+pg_query = "6.0.0"

crates/pg_statement_splitter/Cargo.toml

@@ -22,4 +22,4 @@ pg_query_ext.workspace = true
 
 [dev-dependencies]
 insta    = "1.31.0"
-pg_query = "0.8"
+pg_query = "6.0.0"