Commit 5a6b0095 authored by Stan Hu's avatar Stan Hu

Switch back to pg_query

v2.1.0 incorporates the fixes in our fork and fixed a few other bugs.
See https://github.com/pganalyze/pg_query/blob/main/CHANGELOG.md for
more details.

Changelog: changed
parent 33b5009b
...@@ -305,11 +305,7 @@ gem 'sentry-raven', '~> 3.1' ...@@ -305,11 +305,7 @@ gem 'sentry-raven', '~> 3.1'
# PostgreSQL query parsing # PostgreSQL query parsing
# #
# We need this fork until https://github.com/pganalyze/pg_query/pull/212 gem 'pg_query', '~> 2.1'
# and https://github.com/pganalyze/pg_query/pull/213 are
# released. gitlab-labkit will need to be updated to use the pg_query
# version.
gem 'gitlab-pg_query', '~> 2.0.4', require: 'pg_query'
gem 'premailer-rails', '~> 1.10.3' gem 'premailer-rails', '~> 1.10.3'
......
...@@ -921,6 +921,8 @@ GEM ...@@ -921,6 +921,8 @@ GEM
peek (1.1.0) peek (1.1.0)
railties (>= 4.0.0) railties (>= 4.0.0)
pg (1.2.3) pg (1.2.3)
pg_query (2.1.0)
google-protobuf (>= 3.17.1)
plist (3.6.0) plist (3.6.0)
png_quantizator (0.2.1) png_quantizator (0.2.1)
po_to_json (1.0.1) po_to_json (1.0.1)
...@@ -1495,7 +1497,6 @@ DEPENDENCIES ...@@ -1495,7 +1497,6 @@ DEPENDENCIES
gitlab-markup (~> 1.7.1) gitlab-markup (~> 1.7.1)
gitlab-net-dns (~> 0.9.1) gitlab-net-dns (~> 0.9.1)
gitlab-omniauth-openid-connect (~> 0.4.0) gitlab-omniauth-openid-connect (~> 0.4.0)
gitlab-pg_query (~> 2.0.4)
gitlab-rdoc (~> 6.3.2) gitlab-rdoc (~> 6.3.2)
gitlab-sidekiq-fetcher (= 0.5.6) gitlab-sidekiq-fetcher (= 0.5.6)
gitlab-styles (~> 6.2.0) gitlab-styles (~> 6.2.0)
...@@ -1585,6 +1586,7 @@ DEPENDENCIES ...@@ -1585,6 +1586,7 @@ DEPENDENCIES
parslet (~> 1.8) parslet (~> 1.8)
peek (~> 1.1) peek (~> 1.1)
pg (~> 1.1) pg (~> 1.1)
pg_query (~> 2.1)
png_quantizator (~> 0.2.1) png_quantizator (~> 0.2.1)
premailer-rails (~> 1.10.3) premailer-rails (~> 1.10.3)
prometheus-client-mmap (~> 0.12.0) prometheus-client-mmap (~> 0.12.0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment