pg_query 4.2.1 → 6.1.0

data/ext/pg_query/src_port_snprintf.c

@@ -1,11 +1,11 @@
 /*--------------------------------------------------------------------
  * Symbols referenced in this file:
- * - pg_vfprintf
+ * - pg_vsnprintf
  * - dopr
  * - pg_snprintf
- * - pg_vsnprintf
- * - strchrnul
+ * - pg_strchrnul
  * - dostr
+ * - flushbuffer
  * - find_arguments
  * - fmtint
  * - adjust_sign
@@ -18,8 +18,8 @@
  * - fmtptr
  * - fmtfloat
  * - dopr_outch
- * - flushbuffer
  * - pg_fprintf
+ * - pg_vfprintf
  * - pg_sprintf
  * - pg_vsprintf
  * - pg_printf
@@ -30,7 +30,7 @@
  * Copyright (c) 1983, 1995, 1996 Eric P. Allman
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
- * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -362,13 +362,22 @@ static void leading_pad(int zpad, int signvalue, int *padlen,
 static void trailing_pad(int padlen, PrintfTarget *target);
 
 /*
- * If strchrnul exists (it's a glibc-ism), it's a good bit faster than the
- * equivalent manual loop.  If it doesn't exist, provide a replacement.
+ * If strchrnul exists (it's a glibc-ism, but since adopted by some other
+ * platforms), it's a good bit faster than the equivalent manual loop.
+ * Use it if possible, and if it doesn't exist, use this replacement.
  *
  * Note: glibc declares this as returning "char *", but that would require
  * casting away const internally, so we don't follow that detail.
+ *
+ * Note: macOS has this too as of Sequoia 15.4, but it's hidden behind
+ * a deployment-target check that causes compile errors if the deployment
+ * target isn't high enough.  So !HAVE_DECL_STRCHRNUL may mean "yes it's
+ * declared, but it doesn't compile".  To avoid failing in that scenario,
+ * use a macro to avoid matching <string.h>'s name.
  */
-#ifndef HAVE_STRCHRNUL
+#if !HAVE_DECL_STRCHRNUL
+
+#define strchrnul pg_strchrnul
 
 static inline const char *
 strchrnul(const char *s, int c)
@@ -378,19 +387,7 @@ strchrnul(const char *s, int c)
 	return s;
 }
 
-#else
-
-/*
- * glibc's <string.h> declares strchrnul only if _GNU_SOURCE is defined.
- * While we typically use that on glibc platforms, configure will set
- * HAVE_STRCHRNUL whether it's used or not.  Fill in the missing declaration
- * so that this file will compile cleanly with or without _GNU_SOURCE.
- */
-#ifndef _GNU_SOURCE
-extern char *strchrnul(const char *s, int c);
-#endif
-
-#endif							/* HAVE_STRCHRNUL */
+#endif							/* !HAVE_DECL_STRCHRNUL */
 
 
 /*
@@ -780,12 +777,8 @@ find_arguments(const char *format, va_list args,
 	int			longflag;
 	int			fmtpos;
 	int			i;
-	int			last_dollar;
-	PrintfArgType argtypes[PG_NL_ARGMAX + 1];
-
-	/* Initialize to "no dollar arguments known" */
-	last_dollar = 0;
-	MemSet(argtypes, 0, sizeof(argtypes));
+	int			last_dollar = 0;	/* Init to "no dollar arguments known" */
+	PrintfArgType argtypes[PG_NL_ARGMAX + 1] = {0};
 
 	/*
 	 * This loop must accept the same format strings as the one in dopr().

data/ext/pg_query/src_port_strerror.c

@@ -11,7 +11,7 @@
  * strerror.c
  *	  Replacements for standard strerror() and strerror_r() functions
  *
- * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -216,10 +216,8 @@ get_errno_symbol(int errnum)
 			return "ENOTCONN";
 		case ENOTDIR:
 			return "ENOTDIR";
-#if defined(ENOTEMPTY) && (ENOTEMPTY != EEXIST) /* same code on AIX */
 		case ENOTEMPTY:
 			return "ENOTEMPTY";
-#endif
 		case ENOTSOCK:
 			return "ENOTSOCK";
 #ifdef ENOTSUP

data/ext/pg_query/src_port_strlcpy.c

@@ -0,0 +1,79 @@
+/*--------------------------------------------------------------------
+ * Symbols referenced in this file:
+ * - strlcpy
+ *--------------------------------------------------------------------
+ */
+
+/*-------------------------------------------------------------------------
+ *
+ * strlcpy.c
+ *	  strncpy done right
+ *
+ * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  src/port/strlcpy.c
+ *
+ * This file was taken from OpenBSD and is used on platforms that don't
+ * provide strlcpy().  The OpenBSD copyright terms follow.
+ *-------------------------------------------------------------------------
+ */
+
+/*	$OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $	*/
+
+/*
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "c.h"
+#if HAVE_DECL_STRLCPY == 0
+
+
+/*
+ * Copy src to string dst of size siz.  At most siz-1 characters
+ * will be copied.  Always NUL terminates (unless siz == 0).
+ * Returns strlen(src); if retval >= siz, truncation occurred.
+ * Function creation history:  http://www.gratisoft.us/todd/papers/strlcpy.html
+ */
+size_t
+strlcpy(char *dst, const char *src, size_t siz)
+{
+	char	   *d = dst;
+	const char *s = src;
+	size_t		n = siz;
+
+	/* Copy as many bytes as will fit */
+	if (n != 0)
+	{
+		while (--n != 0)
+		{
+			if ((*d++ = *s++) == '\0')
+				break;
+		}
+	}
+
+	/* Not enough room in dst, add NUL and traverse rest of src */
+	if (n == 0)
+	{
+		if (siz != 0)
+			*d = '\0';			/* NUL-terminate dst */
+		while (*s++)
+			;
+	}
+
+	return (s - src - 1);		/* count does not include NUL */
+}
+#endif // HAVE_DECL_STRLCPY == 0

data/lib/pg_query/fingerprint.rb

@@ -61,7 +61,7 @@ module PgQuery
 
     def ignored_node_type?(node)
       [A_Const, Alias, ParamRef, SetToDefault, IntList, OidList].include?(node.class) ||
-        node.is_a?(TypeCast) && (node.arg.node == :a_const || node.arg.node == :param_ref)
+        (node.is_a?(TypeCast) && %i[a_const param_ref].include?(node.arg.node))
     end
 
     def node_protobuf_field_name_to_json_name(node_class, field)
@@ -72,9 +72,8 @@ module PgQuery
       return if ignored_node_type?(node)
 
       if node.is_a?(Node)
-        return if node.node.nil?
-        node_val = node[node.node.to_s]
-        unless ignored_node_type?(node_val)
+        node_val = node.inner
+        unless node_val.nil? || ignored_node_type?(node_val)
           unless node_val.is_a?(List)
             postgres_node_name = node_protobuf_field_name_to_json_name(node.class, node.node)
             hash.update(postgres_node_name)
@@ -113,12 +112,10 @@ module PgQuery
             fingerprint_value(val.gsub(/\d{2,}/, ''), hash, postgres_node_name, postgres_field_name, true)
             next
           end
-        when 'stmt_len'
-          next if node.is_a?(RawStmt)
-        when 'stmt_location'
+        when 'stmt_len', 'stmt_location'
           next if node.is_a?(RawStmt)
         when 'kind'
-          if node.is_a?(A_Expr) && (val == :AEXPR_OP_ANY || val == :AEXPR_IN)
+          if node.is_a?(A_Expr) && %i[AEXPR_OP_ANY AEXPR_IN].include?(val)
             fingerprint_value(:AEXPR_OP, hash, postgres_node_name, postgres_field_name, true)
             next
           end

data/lib/pg_query/node.rb

@@ -1,22 +1,27 @@
 module PgQuery
   # Patch the auto-generated generic node type with additional convenience functions
   class Node
+    def self.inner_class_to_name(klass)
+      @inner_class_to_name ||= descriptor.lookup_oneof('node').to_h { |f| [f.subtype.msgclass, f.name.to_sym] }
+      @inner_class_to_name[klass]
+    end
+
+    def inner
+      self[node.to_s]
+    end
+
+    def inner=(submsg)
+      name = self.class.inner_class_to_name(submsg.class)
+      public_send("#{name}=", submsg)
+    end
+
     def inspect
-      node ? format('<PgQuery::Node: %s: %s>', node, public_send(node).inspect) : '<PgQuery::Node>'
+      node ? format('<PgQuery::Node: %s: %s>', node, inner.inspect) : '<PgQuery::Node>'
     end
 
     # Make it easier to initialize nodes from a given node child object
     def self.from(node_field_val)
-      # This needs to match libpg_query naming for the Node message field names
-      # (see "underscore" method in libpg_query's scripts/generate_protobuf_and_funcs.rb)
-      node_field_name = node_field_val.class.name.split('::').last
-      node_field_name.gsub!(/^([A-Z\d])([A-Z][a-z])/, '\1__\2')
-      node_field_name.gsub!(/([A-Z\d]+[a-z]+)([A-Z][a-z])/, '\1_\2')
-      node_field_name.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
-      node_field_name.tr!('-', '_')
-      node_field_name.downcase!
-
-      PgQuery::Node.new(node_field_name => node_field_val)
+      PgQuery::Node.new(inner_class_to_name(node_field_val.class) => node_field_val)
     end
 
     # Make it easier to initialize value nodes

data/lib/pg_query/param_refs.rb

@@ -3,11 +3,11 @@ module PgQuery
     def param_refs # rubocop:disable Metrics/CyclomaticComplexity
       results = []
 
-      treewalker! @tree do |_, _, node, location|
+      treewalker_with_location! @tree do |_, _, node, location|
         case node
         when PgQuery::ParamRef
           # Ignore param refs inside type casts, as these are already handled
-          next if location[-3..-1] == %i[type_cast arg param_ref]
+          next if location[-3..] == %i[type_cast arg param_ref]
 
           results << { 'location' => node.location,
                        'length' => param_ref_length(node) }

data/lib/pg_query/parse.rb

@@ -24,9 +24,7 @@ module PgQuery
   end
 
   class ParserResult
-    attr_reader :query
-    attr_reader :tree
-    attr_reader :warnings
+    attr_reader :query, :tree, :warnings
 
     def initialize(query, tree, warnings = [])
       @query = query
@@ -145,7 +143,7 @@ module PgQuery
             end
           # The following statements modify the contents of a table
           when :insert_stmt, :update_stmt, :delete_stmt
-            value = statement.public_send(statement.node)
+            value = statement.inner
             from_clause_items << { item: PgQuery::Node.new(range_var: value.relation), type: :dml }
             statements << value.select_stmt if statement.node == :insert_stmt && value.select_stmt
 
@@ -176,7 +174,7 @@ module PgQuery
           # The following statement types are DDL (changing table structure)
           when :alter_table_stmt
             case statement.alter_table_stmt.objtype
-            when :OBJECT_INDEX # Index # rubocop:disable Lint/EmptyWhen
+            when :OBJECT_INDEX # Index
               # ignore `ALTER INDEX index_name`
             else
               from_clause_items << { item: PgQuery::Node.new(range_var: statement.alter_table_stmt.relation), type: :ddl }
@@ -230,11 +228,11 @@ module PgQuery
           when :grant_stmt
             objects = statement.grant_stmt.objects
             case statement.grant_stmt.objtype
-            when :OBJECT_COLUMN # Column # rubocop:disable Lint/EmptyWhen
+            when :OBJECT_COLUMN # Column
               # FIXME
             when :OBJECT_TABLE # Table
               from_clause_items += objects.map { |o| { item: o, type: :ddl } }
-            when :OBJECT_SEQUENCE # Sequence # rubocop:disable Lint/EmptyWhen
+            when :OBJECT_SEQUENCE # Sequence
               # FIXME
             end
           when :lock_stmt
@@ -339,7 +337,7 @@ module PgQuery
       @cte_names.uniq!
     end
 
-    def statements_and_cte_names_for_with_clause(with_clause) # FIXME
+    def statements_and_cte_names_for_with_clause(with_clause)
       statements = []
       cte_names = []
 

data/lib/pg_query/parse_error.rb

@@ -1,6 +1,7 @@
 module PgQuery
   class ParseError < ArgumentError
     attr_reader :location
+
     def initialize(message, source_file, source_line, location)
       super("#{message} (#{source_file}:#{source_line})")
       @location = location