pg_query 2.0.3 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f19538f4d41c891a9b7704cd56becd762e44f5f766fba06c07f89b2e1d61b69f
-  data.tar.gz: df5a48fd5582bacd09098a5d37c21794a6f1caff82b16fe4597be2257bb0eaa1
+  metadata.gz: b7ecf94b691013f4f32e593af1a9626f26bfe148bbb6482c4d4d3d92758aadec
+  data.tar.gz: 554972dda2feecab635e154c1134d6da4fe7ce136c44ce7c3dea4c6e0b5d3a4c
 SHA512:
-  metadata.gz: 0326c810f5589b03d3a1809e98c199984c6bc013dfd93228cb6e35e5378cf39421ff0690c5dc67431f4b1501815fa80245d5e0cfcb1c75186054aa5d1300d684
-  data.tar.gz: 476514b25750f97ab9f27c55ccf6c221b6ab16687677178adc9f2ed219a85286dca983a36b25e703a3f0e9f080268ce6e82b69fbb932d4e50195bc711f434530
+  metadata.gz: 2f09d9bf624acd8e13fdfcc975871c2e9d184a10fc7630af8a060e9a97cdfffba749145d4be1b6ec75cde4be42a5629c26545bf6b1ba6617d3354228e191d7b1
+  data.tar.gz: 602ca65b8c7f700dba44a7d2ed0b13d41953cf053d101b07d1766564b9fd34db687c6321e320c6f54977ee1be21032ceae29ec69be1b5d7eb3d3cde26ead1f1a

data/CHANGELOG.md

@@ -4,6 +4,171 @@
 
 * ...
 
+## 5.1.0     2024-01-09
+
+* Update to libpg_query 16-5.1.0
+  - Add support for running on Windows
+  - Add support for compiling on 32-bit systems
+* Treewalker: Allow passing a block with a single argument to walk!
+* PgQuery::Node: Add inner and inner= helpers to get/set inner object
+
+
+## 5.0.0     2023-12-22
+
+* Upgrade to libpg_query 16-5.0.0
+  - Updates to the Postgres 16 parser
+  - Multiple deparser improvements
+
+
+## 4.2.3     2023-08-04
+
+* Update to libpg_query 15-4.2.3
+  - Fix builds when compiling with `glibc >=  2.38` [#203](https://github.com/pganalyze/libpg_query/pull/203)
+  - Deparser: Add support for COALESCE and other expressions in LIMIT clause [#199](https://github.com/pganalyze/libpg_query/pull/199)
+
+## 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     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))
+  - Fingerprinting version 3.1
+    - Fixes issue with "SELECT DISTINCT" having the same fingerprint as "SELECT"
+      (fingerprints for "SELECT DISTINCT" will change with this revision)
+    - Group additional DDL statements together that otherwise generate a lot of
+      unique fingerprints (ListenStmt, UnlistenStmt, NotifyStmt, CreateFunctionStmt,
+      FunctionParameter and DoStmt)
+  - Deparser improvements
+    - Prefix errors with "deparse", and remove some asserts
+    - Fix potential segfault when passing invalid protobuf (RawStmt without Stmt)
+  - Update to Postgres 13.8 patch release
+  - Backport Xcode 14.1 build fix from upcoming 13.9 release
+  - Normalize additional DDL statements
+  - Add support for analyzing PL/pgSQL code inside DO blocks
+  - Fix memory leak in pg_query_fingerprint error handling
+  - PL/pgSQL parser: Add support for Assert, SET, COMMIT, ROLLBACK and CALL
+  - Add support for parsing more operators that include a `?` character
+* Support deparsing deeply nested queries ([#259](https://github.com/pganalyze/pg_query/pull/259))
+
+
+## 2.1.4     2022-09-19
+
+* Truncate: Simplify VALUES(...) lists
+* Truncate: Correctly handle UPDATE and ON CONFLICT target lists
+* Support complex queries with deeply nested ASTs ([#238](https://github.com/pganalyze/pg_query/pull/238))
+* Find table references inside type casts
+* Find function calls referenced in expression indexes ([#249](https://github.com/pganalyze/pg_query/pull/249))
+* Drop `Init_pg_query` from exported symbol map ([#256](https://github.com/pganalyze/pg_query/pull/256))
+
+
+## 2.1.3     2022-01-28
+
+* Track tables in EXCEPT and INTERSECT queries ([#239](https://github.com/pganalyze/pg_query/pull/239))
+* Get filter_columns working with UNION/EXCEPT/INTERSECT ([#240](https://github.com/pganalyze/pg_query/pull/240))
+* Update google-protobuf to address CVE scanner complaints
+  - Note that none of the CVEs apply to pg_query, but this avoids unnecessary errors when
+    the google-protobuf dependency is pulled in
+
+
+## 2.1.2     2021-11-12
+
+* Find tables in using clause of delete statement ([#234](https://github.com/pganalyze/pg_query/pull/234))
+* Find tables in case statements ([#235](https://github.com/pganalyze/pg_query/pull/235))
+* Correctly find nested tables in a subselect in a join condition ([#233](https://github.com/pganalyze/pg_query/pull/233))
+* Mark Postgres methods as visibility hidden, to avoid bloating dynamic symbol table ([#232](https://github.com/pganalyze/pg_query/pull/232))
+  - This is required on ELF platforms (i.e. Linux, etc) to avoid including all global
+    symbols in the shared library's symbol table, bloating the size, and causing
+    potential conflicts with other C libraries using the same symbol names.
+
+
+## 2.1.1     2021-10-13
+
+* Update to libpg_query 13-2.1.0 ([#230](https://github.com/pganalyze/pg_query/pull/230))
+  - Normalize: add funcname error object
+  - Normalize: Match GROUP BY against target list and re-use param refs
+  - PL/pgSQL: Setup namespace items for parameters, support RECORD types
+    - This significantly improves parsing for PL/pgSQL functions, to the extent
+      that most functions should now parse successfully
+  - Normalize: Don't modify constants in TypeName typmods/arrayBounds fields
+    - This matches how pg_stat_statement behaves, and avoids causing parsing
+      errors on the normalized statement
+  - Don't fail builds on systems that have strchrnul support (FreeBSD)
+* Fix build on FreeBSD ([#222](https://github.com/pganalyze/pg_query/pull/222))
+* Add workaround for Ruby garbage collection bug ([#227](https://github.com/pganalyze/pg_query/pull/227))
+  - The Ruby interpreter has a bug in `String#concat` where the appended
+    array may be garbage collected prematurely because the compiler
+    optimized out a Ruby stack variable. We now call `to_ary` on the
+    Protobuf object to ensure the array lands on the Ruby stack so the
+    garbage collector sees it.
+  - The real fix in the interpreter is described in
+    https://bugs.ruby-lang.org/issues/18140#note-2, but most current Ruby
+    interpreters won't have this fix for some time.
+* Table/function extraction: Support subselects and LATERAL better ([#229](https://github.com/pganalyze/pg_query/pull/229))
+  - This reworks the parsing logic so we don't ignore certain kinds of
+    subselects.
+
+
+## 2.1.0     2021-07-04
+
+* Update to libpg_query 13-2.0.6
+  - Update to Postgres 13.3 patch release
+  - Normalize: Don't touch "GROUP BY 1" and "ORDER BY 1" expressions, keep original text 
+  - Fingerprint: Cache list item hashes to fingerprint complex queries faster
+  - Deparser: Emit the RangeVar catalogname if present
+  - Fix crash in pg_scan function when encountering backslash escapes
+* Support extracting functions from a parsed query ([#147](https://github.com/pganalyze/pg_query/pull/147))
+  - Adds new `functions`, `ddl_functions` and `call_functions` methods
+  - Note that functions are identified by their name only, not their full type definition,
+    since raw query parsetrees don't contain sufficient data to identify the types of
+    arguments when functions are called
+* Relax google-protobuf dependency ([#213](https://github.com/pganalyze/pg_query/pull/213))
+* Update google-protobuf to 3.17.1 ([#212](https://github.com/pganalyze/pg_query/pull/212))
+  - google-protobuf 3.15.x has a bug that causes a seg fault in Ruby under
+    certain conditions (https://github.com/protocolbuffers/protobuf/pull/8639). Use
+    google-protobuf 3.17.1 instead.
+* Use Protobuf definition for determining JSON field names
+  - Note you may see a breaking change if you were using `PgQuery::ParseResult.encode_json`
+    to map the protobuf result to JSON, since this now respects the intended JSON names
+    from the Proto3 definition (instead of the differently formatted Protobuf field names)
+* Rakefile: Fix "rake clean" by using CLEAN.include instead of CLEAN.<<
+* Find tables inside COALESCE/MIN/MAX functions, UPDATE FROM list
+* Extconf: Add library include path using $INCFLAGS, list it first
+  - This ensures any system installed libpg_query gets considered after
+    the bundled libpg_query, avoiding errors where the wrong header files
+    are used.
+
 
 ## 2.0.3     2021-04-05
 

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:0x000000012ec4e9e0
   @query="SELECT 1",
   @tree=<PgQuery::ParseResult:
-    version: 130002,
+    version: 160001,
     stmts: [
       <PgQuery::RawStmt:
         stmt: <PgQuery::Node:
@@ -41,9 +41,8 @@ PgQuery.parse("SELECT 1")
                   indirection: [],
                   val: <PgQuery::Node:
                     a_const: <PgQuery::A_Const:
-                      val: <PgQuery::Node:
-                        integer: <PgQuery::Integer: ival: 1>
-                      >,
+                      ival: <PgQuery::Integer: ival: 1>,
+                      isnull: false,
                       location: 7
                     >
                   >,
@@ -53,6 +52,7 @@ PgQuery.parse("SELECT 1")
             ],
             from_clause: [],
             group_clause: [],
+            group_distinct: false,
             window_clause: [],
             values_lists: [],
             sort_clause: [],
@@ -67,11 +67,18 @@ 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
 
+This is a simple example for `deparse`, for more complex modification, use `walk!`.
+
 ```ruby
 parsed_query = PgQuery.parse("SELECT * FROM users")
 
@@ -90,20 +97,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"]
 ```
@@ -111,7 +110,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"]]
 ```
@@ -128,25 +127,62 @@ 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"
 ```
 
-## Differences from Upstream PostgreSQL
+### Scanning a query into tokens
+
+```ruby
+PgQuery.scan('SELECT 1 --comment')
+
+=> [<PgQuery::ScanResult: version: 160001, 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>]>,
+ []]
+```
+
+### Walking the parse tree
+
+For generalized use, PgQuery provides `walk!` as a means to recursively work with the parsed query.
+
+This can be used to create a bespoke pretty printer:
+
+```ruby
+parsed_query = PgQuery.parse "SELECT * FROM tbl"
+parsed_query.walk! { |node, k, v, location| puts k }
+```
+
+More usefully, this can be used to rewrite a query. For example:
+
+```ruby
+parsed_query.walk! do |node, k, v, location|
+  next unless k.eql?(:range_var) || k.eql?(:relation)
+  next if v.relname.nil?
+  v.relname = "X_" + v.relname
+end
+
+parsed_query.deparse
+```
+
+There are some caveats, and limitations, in this example.
+
+First, some of the tree nodes are frozen. You can replace them, but you cannot modify in place.
 
-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.
+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.
 
 ## 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:
 
@@ -170,7 +206,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
 
@@ -184,8 +220,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 = '13-2.0.4'.freeze
-LIB_PG_QUERY_SHA256SUM = 'a67ef3e3b6c9cb1297f362888d6660dac165d3b020f78d23afe4293b8ceaf190'.freeze
+LIB_PG_QUERY_TAG = '16-5.1.0'.freeze
+LIB_PG_QUERY_SHA256SUM = '31f25b573da1c966bc762b0313b0a50cdd03aabdbaf666d90469eddcb1656df7'.freeze
 
 Rake::ExtensionTask.new 'pg_query' do |ext|
   ext.lib_dir = 'lib/pg_query'
@@ -21,9 +21,9 @@ task default: %i[spec lint]
 task test: :spec
 task lint: :rubocop
 
-CLEAN << 'tmp/**/*'
-CLEAN << 'ext/pg_query/*.o'
-CLEAN << 'lib/pg_query/pg_query.bundle'
+CLEAN.include 'tmp/**/*'
+CLEAN.include 'ext/pg_query/*.o'
+CLEAN.include 'lib/pg_query/pg_query.bundle'
 
 task :update_source do
   workdir = File.join(__dir__, 'tmp')
@@ -55,18 +55,17 @@ 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
 
   # Reduce everything down to one directory
   system("mkdir -p #{extdir}")
   system("cp -a #{libdir}/src/* #{extdir}/")
+  system("mv #{extdir}/postgres/include #{extdir}/include/postgres")
   system("mv #{extdir}/postgres/* #{extdir}/")
   system("rmdir #{extdir}/postgres")
   system("cp -a #{libdir}/pg_query.h #{extdir}/include")
-  # Make sure every .c file in the top-level directory is its own translation unit
-  system("mv #{extdir}/*{_conds,_defs,_helper}.c #{extdir}/include")
   # Protobuf definitions
   system("protoc --proto_path=#{libdir}/protobuf --ruby_out=#{File.join(__dir__, 'lib/pg_query')} #{libdir}/protobuf/pg_query.proto")
   system("mkdir -p #{extdir}/include/protobuf")
@@ -85,19 +84,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}")
-
-  # Generate JSON field name helper (workaround until https://github.com/protocolbuffers/protobuf/pull/8356 is merged)
-  str = "module PgQuery\n  INTERNAL_PROTO_FIELD_NAME_TO_JSON_NAME = {\n"
-  cur_type = nil
-  File.read(File.join(libdir, 'protobuf/pg_query.proto')).each_line do |line|
-    if line[/^message (\w+)/]
-      cur_type = $1
-      next
-    end
-    next unless line[/(repeated )?\w+ (\w+) = \d+( \[json_name="(\w+)"\])?;/]
-    str += format("    [%s, :%s] => '%s',\n", cur_type, $2, $4 || $2)
-  end
-  str += "  }\nend\n"
-  File.write(File.join(__dir__, 'lib/pg_query/json_field_names.rb'), str)
+  system("cp -a #{extbakdir}/pg_query_ruby{.c,.sym,_freebsd.sym} #{extbakdir}/extconf.rb #{extdir}")
 end

data/ext/pg_query/extconf.rb

@@ -7,12 +7,30 @@ require 'pathname'
 
 $objs = Dir.glob(File.join(__dir__, '*.c')).map { |f| Pathname.new(f).sub_ext('.o').to_s }
 
-$CFLAGS << " -I#{File.join(__dir__, 'include')} -O3 -Wall -fno-strict-aliasing -fwrapv -fstack-protector -Wno-unused-function -Wno-unused-variable -g"
+if RUBY_PLATFORM !~ /cygwin|mswin|mingw|bccwin|wince|emx/
+  $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-unknown-warning-option -g"
+end
+
+$INCFLAGS = "-I#{File.join(__dir__, 'include')} " + "-I#{File.join(__dir__, 'include', 'postgres')} " + $INCFLAGS
+
+if RUBY_PLATFORM =~ /cygwin|mswin|mingw|bccwin|wince|emx/
+  $INCFLAGS = "-I#{File.join(__dir__, 'include', 'postgres', 'port', 'win32')} " + $INCFLAGS
+end
+
+if RUBY_PLATFORM =~ /mswin/
+  $INCFLAGS = "-I#{File.join(__dir__, 'include', 'postgres', 'port', 'win32_msvc')} " + $INCFLAGS
+end
+
+SYMFILE =
+  if RUBY_PLATFORM =~ /freebsd/
+    File.join(__dir__, 'pg_query_ruby_freebsd.sym')
+  elsif RUBY_PLATFORM !~ /cygwin|mswin|mingw|bccwin|wince|emx/
+    File.join(__dir__, 'pg_query_ruby.sym')
+  end
 
-SYMFILE = File.join(__dir__, 'pg_query_ruby.sym')
 if RUBY_PLATFORM =~ /darwin/
   $DLDFLAGS << " -Wl,-exported_symbols_list #{SYMFILE}" unless defined?(::Rubinius)
-else
+elsif RUBY_PLATFORM !~ /cygwin|mswin|mingw|bccwin|wince|emx/
   $DLDFLAGS << " -Wl,--retain-symbols-file=#{SYMFILE}"
 end
 

data/ext/pg_query/include/pg_query.h

@@ -2,6 +2,7 @@
 #define PG_QUERY_H
 
 #include <stdint.h>
+#include <sys/types.h>
 
 typedef struct {
 	char* message; // exception message
@@ -13,7 +14,7 @@ typedef struct {
 } PgQueryError;
 
 typedef struct {
-  unsigned int len;
+  size_t len;
   char* data;
 } PgQueryProtobuf;
 
@@ -69,6 +70,27 @@ typedef struct {
   PgQueryError* error;
 } PgQueryNormalizeResult;
 
+// Postgres parser options (parse mode and GUCs that affect parsing)
+
+typedef enum
+{
+	PG_QUERY_PARSE_DEFAULT = 0,
+	PG_QUERY_PARSE_TYPE_NAME,
+	PG_QUERY_PARSE_PLPGSQL_EXPR,
+	PG_QUERY_PARSE_PLPGSQL_ASSIGN1,
+	PG_QUERY_PARSE_PLPGSQL_ASSIGN2,
+	PG_QUERY_PARSE_PLPGSQL_ASSIGN3
+} PgQueryParseMode;
+
+// We technically only need 3 bits to store parse mode, but
+// having 4 bits avoids API breaks if another one gets added.
+#define PG_QUERY_PARSE_MODE_BITS 4
+#define PG_QUERY_PARSE_MODE_BITMASK ((1 << PG_QUERY_PARSE_MODE_BITS) - 1)
+
+#define PG_QUERY_DISABLE_BACKSLASH_QUOTE 16 // backslash_quote = off (default is safe_encoding, which is effectively on)
+#define PG_QUERY_DISABLE_STANDARD_CONFORMING_STRINGS 32 // standard_conforming_strings = off (default is on)
+#define PG_QUERY_DISABLE_ESCAPE_STRING_WARNING 64 // escape_string_warning = off (default is on)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -76,10 +98,13 @@ extern "C" {
 PgQueryNormalizeResult pg_query_normalize(const char* input);
 PgQueryScanResult pg_query_scan(const char* input);
 PgQueryParseResult pg_query_parse(const char* input);
+PgQueryParseResult pg_query_parse_opts(const char* input, int parser_options);
 PgQueryProtobufParseResult pg_query_parse_protobuf(const char* input);
+PgQueryProtobufParseResult pg_query_parse_protobuf_opts(const char* input, int parser_options);
 PgQueryPlpgsqlParseResult pg_query_parse_plpgsql(const char* input);
 
 PgQueryFingerprintResult pg_query_fingerprint(const char* input);
+PgQueryFingerprintResult pg_query_fingerprint_opts(const char* input, int parser_options);
 
 // Use pg_query_split_with_scanner when you need to split statements that may
 // contain parse errors, otherwise pg_query_split_with_parser is recommended
@@ -106,9 +131,9 @@ void pg_query_free_fingerprint_result(PgQueryFingerprintResult result);
 void pg_query_exit(void);
 
 // Postgres version information
-#define PG_VERSION "13.2"
-#define PG_MAJORVERSION "13"
-#define PG_VERSION_NUM 130002
+#define PG_MAJORVERSION "16"
+#define PG_VERSION "16.1"
+#define PG_VERSION_NUM 160001
 
 // Deprecated APIs below