Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade pg query and drop deprecated crates #188

Merged
merged 11 commits into from
Jan 31, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
Expand Down
73 changes: 4 additions & 69 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ enumflags2 = "0.7.10"
ignore = "0.4.23"
indexmap = { version = "2.6.0", features = ["serde"] }
line_index = { path = "./lib/line_index", version = "0.0.0" }
pg_query = "6.0.0"
proc-macro2 = "1.0.66"
quote = "1.0.33"
rayon = "1.10.0"
Expand Down Expand Up @@ -60,8 +61,6 @@ pg_diagnostics_categories = { path = "./crates/pg_diagnostics_categories", versi
pg_diagnostics_macros = { path = "./crates/pg_diagnostics_macros", version = "0.0.0" }
pg_flags = { path = "./crates/pg_flags", version = "0.0.0" }
pg_fs = { path = "./crates/pg_fs", version = "0.0.0" }
pg_hover = { path = "./crates/pg_hover", version = "0.0.0" }
pg_inlay_hints = { path = "./crates/pg_inlay_hints", version = "0.0.0" }
pg_lexer = { path = "./crates/pg_lexer", version = "0.0.0" }
pg_lexer_codegen = { path = "./crates/pg_lexer_codegen", version = "0.0.0" }
pg_lint = { path = "./crates/pg_lint", version = "0.0.0" }
Expand All @@ -73,7 +72,6 @@ pg_query_ext_codegen = { path = "./crates/pg_query_ext_codegen", version =
pg_query_proto_parser = { path = "./crates/pg_query_proto_parser", version = "0.0.0" }
pg_schema_cache = { path = "./crates/pg_schema_cache", version = "0.0.0" }
pg_statement_splitter = { path = "./crates/pg_statement_splitter", version = "0.0.0" }
pg_syntax = { path = "./crates/pg_syntax", version = "0.0.0" }
pg_text_edit = { path = "./crates/pg_text_edit", version = "0.0.0" }
pg_treesitter_queries = { path = "./crates/pg_treesitter_queries", version = "0.0.0" }
pg_type_resolver = { path = "./crates/pg_type_resolver", version = "0.0.0" }
Expand Down
27 changes: 0 additions & 27 deletions crates/pg_hover/Cargo.toml

This file was deleted.

57 changes: 0 additions & 57 deletions crates/pg_hover/src/lib.rs

This file was deleted.

123 changes: 0 additions & 123 deletions crates/pg_hover/src/resolve.rs

This file was deleted.

32 changes: 0 additions & 32 deletions crates/pg_inlay_hints/Cargo.toml

This file was deleted.

1 change: 0 additions & 1 deletion crates/pg_inlay_hints/README.md

This file was deleted.

Loading