pg_query 4.2.0 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f3ea528544d70b22864e56f006dffce6c849d51eedb1de5d8644eb9f4d1b0ad
-  data.tar.gz: 7b2793ea012fcd4dd88a42703da627f6794c6f032ccd39fc9addb2f0bbc40208
+  metadata.gz: ea8fb56217063eac1d411d1939edb4e0aa1319657a72d359ce09b76cc6c3e7cd
+  data.tar.gz: 783e06aa36da1192a14500ccdefcba25e179fff0178be18b8724eca51d23ebbf
 SHA512:
-  metadata.gz: 23d2fae9e57c9c4f8b35856b42748ba8ff061ba5aa92ff4c679ebf5bce562ad7ddafa452183104318f19f09fb089f31108f922c39b057bccbbf028e50412b2fa
-  data.tar.gz: 3c64bf6d9eb662f348296ebc79ba8671a5be8e9053b873a4a7e0be8065229ab89ba0d28d5cea2ed3aea48a7dc2ee6053470adbe45b46bd93e5a2ca2ffb041128
+  metadata.gz: d4cc8dcdc572277b2c667f4b7df253a0ba123b3fbac1eb82be8ab3cacd419875393d6ca1d4a7cc74dde2d9f8d45c42e3e453f36a35622d67e3b57ebc95af248e
+  data.tar.gz: 020ec80cfc1e9f22a679db3298e8cb719cf52acd50a9692f76771c7039c258ebe9b0b5574742d974e82c8ce61a509387a4a89727807ce9cdd44ddddf62f0d225

data/CHANGELOG.md

@@ -4,17 +4,42 @@
 
 * ...
 
-## 4.2.0     2022-02-08
+
+## 4.2.2     2023-07-07
+
+* Update to libpg_query 15-4.2.2
+  - Deparser: Add support for multi-statement CREATE PROCEDURE definitions
+  - Deparser: Correctly quote identifier in ALTER TABLE ... ADD CONSTRAINT [x]
+  - Deparser: Add support for index fillfactor within CREATE TABLE, fix SHOW ALL
+* Fix builds on FreeBSD ([#292](https://github.com/pganalyze/pg_query/pull/292))
+  - This was broken since 4.2.0, due to pg_query_ruby_freebsd.sym being removed by accident
+
+
+## 4.2.1     2023-05-19
+
+* Parse: Fix `ALTER INDEX my_index_name` to return `tables=[]` ([#285](https://github.com/pganalyze/pg_query/pull/285))
+* Parse: Detect tables in a SELECT INTO clause as DDL tables ([#281](https://github.com/pganalyze/pg_query/pull/281))
+* Add support for Ruby 3.2 ([#283](https://github.com/pganalyze/pg_query/pull/283))
+* Bump up `google-protobuf` dependency to `>= 3.22.3`
+  - 3.22.0 or newer is required for Ruby 3.2 support
+* Update to libpg_query 15-4.2.1
+  - Deparser: Handle INTERVAL correctly when used in SET statements
+  - Deparser: Ensure index names are quoted as identifiers
+
+
+## 4.2.0     2023-02-08
 
 * Update to libpg_query 15-4.2.0
   - Update to PostgreSQL 15.1
 
-## 2.2.1     2022-01-20
+
+## 2.2.1     2023-01-20
 
 * Detect tables used in the query of a PREPARE statement ([#273](https://github.com/pganalyze/pg_query/pull/273))
 * Expose recursive walk functionality via walk! ([#268](https://github.com/pganalyze/pg_query/pull/268))
 * Retain schema in name when parsing out functions ([#272](https://github.com/pganalyze/pg_query/pull/272))
 
+
 ## 2.2.0     2022-11-02
 
 * Update to libpg_query 13-2.2.0 ([#264](https://github.com/pganalyze/pg_query/pull/264))

data/README.md

@@ -2,11 +2,11 @@
 
 This Ruby extension uses the actual PostgreSQL server source to parse SQL queries and return the internal PostgreSQL parsetree.
 
-In addition the extension allows you to normalize queries (replacing constant values with ?) and parse these normalized queries into a parsetree again.
+In addition the extension allows you to normalize queries (replacing constant values with $n) and parse these normalized queries into a parsetree again.
 
 When you build this extension, it builds parts of the PostgreSQL server source (see [libpg_query](https://github.com/pganalyze/libpg_query)), and then statically links it into this extension.
 
-This is slightly crazy, but is the only reliable way of parsing all valid PostgreSQL queries.
+This may seem like a lot of complexity, but is the only reliable way of parsing all valid PostgreSQL queries.
 
 You can find further examples and a longer rationale here: https://pganalyze.com/blog/parse-postgresql-queries-in-ruby.html
 
@@ -25,10 +25,10 @@ Due to compiling parts of PostgreSQL, installation might take a while on slower
 ```ruby
 PgQuery.parse("SELECT 1")
 
-=> #<PgQuery::ParserResult:0x00007fb69a958820
+=> #<PgQuery::ParserResult:0x000000012000c438
   @query="SELECT 1",
   @tree=<PgQuery::ParseResult:
-    version: 130002,
+    version: 150001,
     stmts: [
       <PgQuery::RawStmt:
         stmt: <PgQuery::Node:
@@ -41,10 +41,11 @@ PgQuery.parse("SELECT 1")
                   indirection: [],
                   val: <PgQuery::Node:
                     a_const: <PgQuery::A_Const:
-                      val: <PgQuery::Node:
-                        integer: <PgQuery::Integer: ival: 1>
-                      >,
-                      location: 7
+                      isnull: false,
+                      location: 7,
+                      ival: <PgQuery::Integer:
+                        ival: 1
+                      >
                     >
                   >,
                   location: 7
@@ -53,6 +54,7 @@ PgQuery.parse("SELECT 1")
             ],
             from_clause: [],
             group_clause: [],
+            group_distinct: false,
             window_clause: [],
             values_lists: [],
             sort_clause: [],
@@ -67,7 +69,12 @@ PgQuery.parse("SELECT 1")
       >
     ]
   >,
-  @warnings=[]>
+  @warnings=[],
+  @tables=nil,
+  @aliases=nil,
+  @cte_names=nil,
+  @functions=nil
+>
 ```
 
 ### Modifying a parsed query and turning it into SQL again
@@ -92,20 +99,12 @@ parsed_query.deparse
 PgQuery.normalize("SELECT 1 FROM x WHERE y = 'foo'")
 
 => "SELECT $1 FROM x WHERE y = $2"
-
-# Parsing a normalized query (pre-Postgres 10 style)
-PgQuery.parse("SELECT ? FROM x WHERE y = ?")
-
-=> #<PgQuery::ParserResult:0x00007fb69a97a5d8
-  @query="SELECT ? FROM x WHERE y = ?",
-  @tree=<PgQuery::ParseResult: ...>,
-  @warnings=[]>
 ```
 
 ### Extracting tables from a query
 
 ```ruby
-PgQuery.parse("SELECT ? FROM x JOIN y USING (id) WHERE z = ?").tables
+PgQuery.parse("SELECT $1 FROM x JOIN y USING (id) WHERE z = $2").tables
 
 => ["x", "y"]
 ```
@@ -113,7 +112,7 @@ PgQuery.parse("SELECT ? FROM x JOIN y USING (id) WHERE z = ?").tables
 ### Extracting columns from a query
 
 ```ruby
-PgQuery.parse("SELECT ? FROM x WHERE x.y = ? AND z = ?").filter_columns
+PgQuery.parse("SELECT $1 FROM x WHERE x.y = $2 AND z = $3").filter_columns
 
 => [["x", "y"], [nil, "z"]]
 ```
@@ -130,7 +129,7 @@ PgQuery.parse("SELECT 2; --- comment").fingerprint
 => "50fde20626009aba"
 
 # Faster fingerprint method that is implemented inside the native C library
-PgQuery.fingerprint("SELECT ?")
+PgQuery.fingerprint("SELECT $1")
 
 => "50fde20626009aba"
 ```
@@ -140,7 +139,7 @@ PgQuery.fingerprint("SELECT ?")
 ```ruby
 PgQuery.scan('SELECT 1 --comment')
 
-=> [<PgQuery::ScanResult: version: 130002, tokens: [
+=> [<PgQuery::ScanResult: version: 150001, tokens: [
 <PgQuery::ScanToken: start: 0, end: 6, token: :SELECT, keyword_kind: :RESERVED_KEYWORD>,
 <PgQuery::ScanToken: start: 7, end: 8, token: :ICONST, keyword_kind: :NO_KEYWORD>,
 <PgQuery::ScanToken: start: 9, end: 18, token: :SQL_COMMENT, keyword_kind: :NO_KEYWORD>]>,
@@ -177,20 +176,15 @@ First, some of the tree nodes are frozen. You can replace them, but you cannot m
 Second, table rewriting is a bit more nuanced than this example. While this will rewrite the table names, it will
 not correctly handle all CTEs, or rewrite columns with explicit table names.
 
-## Differences from Upstream PostgreSQL
-
-This gem is based on [libpg_query](https://github.com/pganalyze/libpg_query),
-which uses the latest stable PostgreSQL version, but with a patch applied
-to support parsing normalized queries containing `?` replacement characters.
-
 ## Supported Ruby Versions
 
 Currently tested and officially supported Ruby versions:
 
-* CRuby 2.5
 * CRuby 2.6
 * CRuby 2.7
 * CRuby 3.0
+* CRuby 3.1
+* CRuby 3.2
 
 Not supported:
 
@@ -214,7 +208,7 @@ Once that is done, follow the following steps:
 
 ## Resources
 
-See [libpg_query](https://github.com/pganalyze/libpg_query/blob/13-latest/README.md#resources) for pg_query in other languages, as well as products/tools built on pg_query.
+See [libpg_query](https://github.com/pganalyze/libpg_query/blob/15-latest/README.md#resources) for pg_query in other languages, as well as products/tools built on pg_query.
 
 ## Original Author
 
@@ -228,8 +222,10 @@ See [libpg_query](https://github.com/pganalyze/libpg_query/blob/13-latest/README
 
 ## License
 
-Copyright (c) 2015, pganalyze Team <team@pganalyze.com><br>
-pg_query is licensed under the 3-clause BSD license, see LICENSE file for details.
+PostgreSQL server source code, used under the [PostgreSQL license](https://www.postgresql.org/about/licence/).<br>
+Portions Copyright (c) 1996-2023, The PostgreSQL Global Development Group<br>
+Portions Copyright (c) 1994, The Regents of the University of California
 
-Query normalization code:<br>
-Copyright (c) 2008-2015, PostgreSQL Global Development Group
+All other parts are licensed under the 3-clause BSD license, see LICENSE file for details.<br>
+Copyright (c) 2015, Lukas Fittl <lukas@fittl.com><br>
+Copyright (c) 2016-2023, Duboce Labs, Inc. (pganalyze) <team@pganalyze.com>

data/Rakefile

@@ -5,8 +5,8 @@ require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 require 'open-uri'
 
-LIB_PG_QUERY_TAG = '15-4.2.0'.freeze
-LIB_PG_QUERY_SHA256SUM = '573b7b0d3b04702ec9e541e0a504632de17bd90b948c5658e72c1cf9dfc3a05d'.freeze
+LIB_PG_QUERY_TAG = '15-4.2.2'.freeze
+LIB_PG_QUERY_SHA256SUM = '03d6631b4a5ea9cc26cb2569e0303b9cce2bc1c6b6e1488f5ab9d63e6bd5346d'.freeze
 
 Rake::ExtensionTask.new 'pg_query' do |ext|
   ext.lib_dir = 'lib/pg_query'
@@ -55,7 +55,7 @@ task :update_source do
   # Backup important files from ext dir
   system("rm -fr #{extbakdir}")
   system("mkdir -p #{extbakdir}")
-  system("cp -a #{extdir}/pg_query_ruby.{c,sym} #{extdir}/extconf.rb #{extbakdir}")
+  system("cp -a #{extdir}/pg_query_ruby{.c,.sym,_freebsd.sym} #{extdir}/extconf.rb #{extbakdir}")
 
   FileUtils.rm_rf extdir
 
@@ -85,5 +85,5 @@ task :update_source do
   # Other support files
   system("cp -a #{libdir}/testdata/* #{testfilesdir}")
   # Copy back the custom ext files
-  system("cp -a #{extbakdir}/pg_query_ruby.{c,sym} #{extbakdir}/extconf.rb #{extdir}")
+  system("cp -a #{extbakdir}/pg_query_ruby{.c,.sym,_freebsd.sym} #{extbakdir}/extconf.rb #{extdir}")
 end

data/ext/pg_query/extconf.rb

@@ -7,7 +7,9 @@ require 'pathname'
 
 $objs = Dir.glob(File.join(__dir__, '*.c')).map { |f| Pathname.new(f).sub_ext('.o').to_s }
 
-$CFLAGS << " -fvisibility=hidden -O3 -Wall -fno-strict-aliasing -fwrapv -fstack-protector -Wno-unused-function -Wno-unused-variable -Wno-clobbered -Wno-sign-compare -Wno-discarded-qualifiers -g"
+# -Wno-deprecated-non-prototype avoids warnings on Clang 15.0+, this can be removed in Postgres 16:
+# https://git.postgresql.org/gitweb/?p=postgresql.git;a=commit;h=1c27d16e6e5c1f463bbe1e9ece88dda811235165
+$CFLAGS << " -fvisibility=hidden -O3 -Wall -fno-strict-aliasing -fwrapv -fstack-protector -Wno-unused-function -Wno-unused-variable -Wno-clobbered -Wno-sign-compare -Wno-discarded-qualifiers  -Wno-deprecated-non-prototype -Wno-unknown-warning-option -g"
 
 $INCFLAGS = "-I#{File.join(__dir__, 'include')} " + $INCFLAGS