pg_query 2.1.4 → 2.2.1

data/ext/pg_query/src_backend_tcop_postgres.c

@@ -55,7 +55,6 @@
 #include "catalog/pg_type.h"
 #include "commands/async.h"
 #include "commands/prepare.h"
-#include "executor/spi.h"
 #include "jit/jit.h"
 #include "libpq/libpq.h"
 #include "libpq/pqformat.h"
@@ -520,6 +519,12 @@ static void disable_statement_timeout(void);
  * If an interrupt condition is pending, and it's safe to service it,
  * then clear the flag and accept the interrupt.  Called only when
  * InterruptPending is true.
+ *
+ * Note: if INTERRUPTS_CAN_BE_PROCESSED() is true, then ProcessInterrupts
+ * is guaranteed to clear the InterruptPending flag before returning.
+ * (This is not the same as guaranteeing that it's still clear when we
+ * return; another interrupt could have arrived.  But we promise that
+ * any pre-existing one will have been serviced.)
  */
 void ProcessInterrupts(void) {}
 
@@ -568,9 +573,14 @@ ia64_get_bsp(void)
  *
  * Returns the old reference point, if any.
  */
+#ifndef HAVE__BUILTIN_FRAME_ADDRESS
+#endif
 #if defined(__ia64__) || defined(__ia64)
 #else
 #endif
+#ifdef HAVE__BUILTIN_FRAME_ADDRESS
+#else
+#endif
 #if defined(__ia64__) || defined(__ia64)
 #endif
 

data/ext/pg_query/src_backend_utils_adt_ruleutils.c

@@ -62,6 +62,7 @@
 #include "parser/parse_func.h"
 #include "parser/parse_node.h"
 #include "parser/parse_oper.h"
+#include "parser/parse_relation.h"
 #include "parser/parser.h"
 #include "parser/parsetree.h"
 #include "rewrite/rewriteHandler.h"
@@ -392,26 +393,29 @@ static void make_ruledef(StringInfo buf, HeapTuple ruletup, TupleDesc rulettc,
 static void make_viewdef(StringInfo buf, HeapTuple ruletup, TupleDesc rulettc,
 						 int prettyFlags, int wrapColumn);
 static void get_query_def(Query *query, StringInfo buf, List *parentnamespace,
-						  TupleDesc resultDesc,
+						  TupleDesc resultDesc, bool colNamesVisible,
 						  int prettyFlags, int wrapColumn, int startIndent);
 static void get_values_def(List *values_lists, deparse_context *context);
 static void get_with_clause(Query *query, deparse_context *context);
 static void get_select_query_def(Query *query, deparse_context *context,
-								 TupleDesc resultDesc);
-static void get_insert_query_def(Query *query, deparse_context *context);
-static void get_update_query_def(Query *query, deparse_context *context);
+								 TupleDesc resultDesc, bool colNamesVisible);
+static void get_insert_query_def(Query *query, deparse_context *context,
+								 bool colNamesVisible);
+static void get_update_query_def(Query *query, deparse_context *context,
+								 bool colNamesVisible);
 static void get_update_query_targetlist_def(Query *query, List *targetList,
 											deparse_context *context,
 											RangeTblEntry *rte);
-static void get_delete_query_def(Query *query, deparse_context *context);
+static void get_delete_query_def(Query *query, deparse_context *context,
+								 bool colNamesVisible);
 static void get_utility_query_def(Query *query, deparse_context *context);
 static void get_basic_select_query(Query *query, deparse_context *context,
-								   TupleDesc resultDesc);
+								   TupleDesc resultDesc, bool colNamesVisible);
 static void get_target_list(List *targetList, deparse_context *context,
-							TupleDesc resultDesc);
+							TupleDesc resultDesc, bool colNamesVisible);
 static void get_setop_query(Node *setOp, Query *query,
 							deparse_context *context,
-							TupleDesc resultDesc);
+							TupleDesc resultDesc, bool colNamesVisible);
 static Node *get_rule_sortgroupclause(Index ref, List *tlist,
 									  bool force_colno,
 									  deparse_context *context);
@@ -440,6 +444,8 @@ static void get_rule_expr(Node *node, deparse_context *context,
 						  bool showimplicit);
 static void get_rule_expr_toplevel(Node *node, deparse_context *context,
 								   bool showimplicit);
+static void get_rule_list_toplevel(List *lst, deparse_context *context,
+								   bool showimplicit);
 static void get_rule_expr_funccall(Node *node, deparse_context *context,
 								   bool showimplicit);
 static bool looks_like_function(Node *node);
@@ -1037,8 +1043,18 @@ static void get_reloptions(StringInfo buf, Datum reloptions);
 /* ----------
  * get_query_def			- Parse back one query parsetree
  *
- * If resultDesc is not NULL, then it is the output tuple descriptor for
- * the view represented by a SELECT query.
+ * query: parsetree to be displayed
+ * buf: output text is appended to buf
+ * parentnamespace: list (initially empty) of outer-level deparse_namespace's
+ * resultDesc: if not NULL, the output tuple descriptor for the view
+ *		represented by a SELECT query.  We use the column names from it
+ *		to label SELECT output columns, in preference to names in the query
+ * colNamesVisible: true if the surrounding context cares about the output
+ *		column names at all (as, for example, an EXISTS() context does not);
+ *		when false, we can suppress dummy column labels such as "?column?"
+ * prettyFlags: bitmask of PRETTYFLAG_XXX options
+ * wrapColumn: maximum line length, or -1 to disable wrapping
+ * startIndent: initial indentation amount
  * ----------
  */
 
@@ -1074,6 +1090,8 @@ static void get_reloptions(StringInfo buf, Datum reloptions);
  * get_target_list			- Parse back a SELECT target list
  *
  * This is also used for RETURNING lists in INSERT/UPDATE/DELETE.
+ *
+ * resultDesc and colNamesVisible are as for get_query_def()
  * ----------
  */
 
@@ -1291,6 +1309,16 @@ static void get_reloptions(StringInfo buf, Datum reloptions);
  */
 
 
+/*
+ * get_rule_list_toplevel		- Parse back a list of toplevel expressions
+ *
+ * Apply get_rule_expr_toplevel() to each element of a List.
+ *
+ * This adds commas between the expressions, but caller is responsible
+ * for printing surrounding decoration.
+ */
+
+
 /*
  * get_rule_expr_funccall		- Parse back a function-call expression
  *

data/ext/pg_query/src_backend_utils_misc_guc.c

@@ -49,6 +49,7 @@
 #include "catalog/storage.h"
 #include "commands/async.h"
 #include "commands/prepare.h"
+#include "commands/tablespace.h"
 #include "commands/trigger.h"
 #include "commands/user.h"
 #include "commands/vacuum.h"

data/ext/pg_query/src_common_wchar.c

@@ -1618,6 +1618,11 @@ const pg_wchar_tbl pg_wchar_table[] = {
 
 /*
  * Returns the byte length of a multibyte character.
+ *
+ * Caution: when dealing with text that is not certainly valid in the
+ * specified encoding, the result may exceed the actual remaining
+ * string length.  Callers that are not prepared to deal with that
+ * should use pg_encoding_mblen_bounded() instead.
  */
 int
 pg_encoding_mblen(int encoding, const char *mbstr)
@@ -1627,6 +1632,12 @@ pg_encoding_mblen(int encoding, const char *mbstr)
 			pg_wchar_table[PG_SQL_ASCII].mblen((const unsigned char *) mbstr));
 }
 
+/*
+ * Returns the byte length of a multibyte character; but not more than
+ * the distance to end of string.
+ */
+
+
 /*
  * Returns the display length of a multibyte character.
  */

data/ext/pg_query/src_pl_plpgsql_src_pl_comp.c

@@ -385,9 +385,11 @@ add_dummy_return(PLpgSQL_function *function)
 	/*
 	 * If the outer block has an EXCEPTION clause, we need to make a new outer
 	 * block, since the added RETURN shouldn't act like it is inside the
-	 * EXCEPTION clause.
+	 * EXCEPTION clause.  Likewise, if it has a label, wrap it in a new outer
+	 * block so that EXIT doesn't skip the RETURN.
 	 */
-	if (function->action->exceptions != NULL)
+	if (function->action->exceptions != NULL ||
+		function->action->label != NULL)
 	{
 		PLpgSQL_stmt_block *new;
 

data/ext/pg_query/src_pl_plpgsql_src_pl_gram.c

@@ -5535,7 +5535,7 @@ make_execsql_stmt(int firsttoken, int location)
 
 	check_sql_expr(expr->query, location, 0);
 
-	execsql = palloc(sizeof(PLpgSQL_stmt_execsql));
+	execsql = palloc0(sizeof(PLpgSQL_stmt_execsql));
 	execsql->cmd_type = PLPGSQL_STMT_EXECSQL;
 	execsql->lineno  = plpgsql_location_to_lineno(location);
 	execsql->stmtid  = ++plpgsql_curr_compile->nstatements;

data/ext/pg_query/src_port_pg_bitutils.c

@@ -1,13 +1,6 @@
 /*--------------------------------------------------------------------
  * Symbols referenced in this file:
  * - pg_popcount64
- * - pg_popcount64_choose
- * - pg_popcount32
- * - pg_popcount32_choose
- * - pg_popcount_available
- * - pg_popcount32_asm
- * - pg_popcount64_asm
- * - pg_popcount32_slow
  * - pg_popcount64_slow
  *--------------------------------------------------------------------
  */
@@ -92,7 +85,7 @@ static int	pg_popcount64_asm(uint64 word);
 int			(*pg_popcount32) (uint32 word) = pg_popcount32_choose;
 int			(*pg_popcount64) (uint64 word) = pg_popcount64_choose;
 #else
-int			(*pg_popcount32) (uint32 word) = pg_popcount32_slow;
+
 int			(*pg_popcount64) (uint64 word) = pg_popcount64_slow;
 #endif							/* USE_POPCNT_ASM */
 
@@ -190,23 +183,9 @@ __asm__ __volatile__(" popcntq %1,%0\n":"=q"(res):"rm"(word):"cc");
  * pg_popcount32_slow
  *		Return the number of 1 bits set in word
  */
-static int
-pg_popcount32_slow(uint32 word)
-{
 #ifdef HAVE__BUILTIN_POPCOUNT
-	return __builtin_popcount(word);
 #else							/* !HAVE__BUILTIN_POPCOUNT */
-	int			result = 0;
-
-	while (word != 0)
-	{
-		result += pg_number_of_ones[word & 255];
-		word >>= 8;
-	}
-
-	return result;
 #endif							/* HAVE__BUILTIN_POPCOUNT */
-}
 
 /*
  * pg_popcount64_slow

data/ext/pg_query/src_port_snprintf.c

@@ -344,7 +344,7 @@ static bool find_arguments(const char *format, va_list args,
 						   PrintfArgValue *argvalues);
 static void fmtstr(const char *value, int leftjust, int minlen, int maxwidth,
 				   int pointflag, PrintfTarget *target);
-static void fmtptr(void *value, PrintfTarget *target);
+static void fmtptr(const void *value, PrintfTarget *target);
 static void fmtint(long long value, char type, int forcesign,
 				   int leftjust, int minlen, int zpad, int precision, int pointflag,
 				   PrintfTarget *target);
@@ -418,7 +418,7 @@ dopr(PrintfTarget *target, const char *format, va_list args)
 	int			cvalue;
 	long long	numvalue;
 	double		fvalue;
-	char	   *strvalue;
+	const char *strvalue;
 	PrintfArgValue argvalues[PG_NL_ARGMAX + 1];
 
 	/*
@@ -463,7 +463,8 @@ dopr(PrintfTarget *target, const char *format, va_list args)
 		{
 			format++;
 			strvalue = va_arg(args, char *);
-			Assert(strvalue != NULL);
+			if (strvalue == NULL)
+				strvalue = "(null)";
 			dostr(strvalue, strlen(strvalue), target);
 			if (target->failed)
 				break;
@@ -694,8 +695,9 @@ nextch2:
 					strvalue = argvalues[fmtpos].cptr;
 				else
 					strvalue = va_arg(args, char *);
-				/* Whine if someone tries to print a NULL string */
-				Assert(strvalue != NULL);
+				/* If string is NULL, silently substitute "(null)" */
+				if (strvalue == NULL)
+					strvalue = "(null)";
 				fmtstr(strvalue, leftjust, fieldwidth, precision, pointflag,
 					   target);
 				break;
@@ -705,7 +707,7 @@ nextch2:
 					strvalue = argvalues[fmtpos].cptr;
 				else
 					strvalue = va_arg(args, char *);
-				fmtptr((void *) strvalue, target);
+				fmtptr((const void *) strvalue, target);
 				break;
 			case 'e':
 			case 'E':
@@ -1019,7 +1021,7 @@ fmtstr(const char *value, int leftjust, int minlen, int maxwidth,
 }
 
 static void
-fmtptr(void *value, PrintfTarget *target)
+fmtptr(const void *value, PrintfTarget *target)
 {
 	int			vallen;
 	char		convert[64];

data/lib/pg_query/deparse.rb

@@ -7,7 +7,13 @@ module PgQuery
 
   # Reconstruct all of the parsed queries into their original form
   def self.deparse(tree)
-    PgQuery.deparse_protobuf(PgQuery::ParseResult.encode(tree)).force_encoding('UTF-8')
+    if PgQuery::ParseResult.method(:encode).arity == 1
+      PgQuery.deparse_protobuf(PgQuery::ParseResult.encode(tree)).force_encoding('UTF-8')
+    elsif PgQuery::ParseResult.method(:encode).arity == -1
+      PgQuery.deparse_protobuf(PgQuery::ParseResult.encode(tree, recursion_limit: 1_000)).force_encoding('UTF-8')
+    else
+      raise ArgumentError, 'Unsupported protobuf Ruby API'
+    end
   end
 
   # Convenience method for deparsing a statement of a specific type

data/lib/pg_query/fingerprint.rb

@@ -39,6 +39,11 @@ module PgQuery
       subhash = FingerprintSubHash.new
 
       if val.is_a?(Google::Protobuf::RepeatedField)
+        # For lists that have exactly one untyped node, just output the parent field (if needed) and return
+        if val.length == 1 && val[0].is_a?(Node) && val[0].node.nil?
+          hash.update(parent_field_name) if need_to_write_name
+          return
+        end
         fingerprint_list(val, subhash, parent_node_name, parent_field_name)
       elsif val.is_a?(List)
         fingerprint_list(val.items, subhash, parent_node_name, parent_field_name)
@@ -90,12 +95,18 @@ module PgQuery
         when 'location'
           next
         when 'name'
-          next if [PrepareStmt, ExecuteStmt, DeallocateStmt].include?(node.class)
+          next if [PrepareStmt, ExecuteStmt, DeallocateStmt, FunctionParameter].include?(node.class)
           next if node.is_a?(ResTarget) && parent_node_name == 'SelectStmt' && parent_field_name == 'targetList'
-        when 'gid', 'options', 'savepoint_name'
+        when 'gid', 'savepoint_name'
           next if node.is_a?(TransactionStmt)
+        when 'options'
+          next if [TransactionStmt, CreateFunctionStmt].include?(node.class)
         when 'portalname'
           next if [DeclareCursorStmt, FetchStmt, ClosePortalStmt].include?(node.class)
+        when 'conditionname'
+          next if [ListenStmt, UnlistenStmt, NotifyStmt].include?(node.class)
+        when 'args'
+          next if node.is_a?(DoStmt)
         when 'relname'
           next if node.is_a?(RangeVar) && node.relpersistence == 't'
           if node.is_a?(RangeVar)

data/lib/pg_query/parse.rb

@@ -216,7 +216,7 @@ module PgQuery
             when :OBJECT_FUNCTION
               # Only one function can be dropped in a statement
               obj = statement.drop_stmt.objects[0].object_with_args
-              @functions << { function: obj.objname[0].string.str, type: :ddl }
+              @functions << { function: obj.objname.map { |f| f.string.str }.join('.'), type: :ddl }
             end
           when :grant_stmt
             objects = statement.grant_stmt.objects
@@ -235,18 +235,20 @@ module PgQuery
             statements << statement.explain_stmt.query
           when :create_function_stmt
             @functions << {
-              function: statement.create_function_stmt.funcname[0].string.str,
+              function: statement.create_function_stmt.funcname.map { |f| f.string.str }.join('.'),
               type: :ddl
             }
           when :rename_stmt
             if statement.rename_stmt.rename_type == :OBJECT_FUNCTION
-              original_name = statement.rename_stmt.object.object_with_args.objname[0].string.str
+              original_name = statement.rename_stmt.object.object_with_args.objname.map { |f| f.string.str }.join('.')
               new_name = statement.rename_stmt.newname
               @functions += [
                 { function: original_name, type: :ddl },
                 { function: new_name, type: :ddl }
               ]
             end
+          when :prepare_stmt
+            statements << statement.prepare_stmt.query
           end
         end
 

data/lib/pg_query/pg_query_pb.rb

@@ -809,6 +809,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :def, :message, 5, "pg_query.Node", json_name: "def"
       optional :behavior, :enum, 6, "pg_query.DropBehavior", json_name: "behavior"
       optional :missing_ok, :bool, 7, json_name: "missing_ok"
+      optional :recurse, :bool, 8, json_name: "recurse"
     end
     add_message "pg_query.AlterDomainStmt" do
       optional :subtype, :string, 1, json_name: "subtype"
@@ -2766,7 +2767,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       value :REASSIGN, 579
       value :RECHECK, 580
       value :RECURSIVE, 581
-      value :REF, 582
+      value :REF_P, 582
       value :REFERENCES, 583
       value :REFERENCING, 584
       value :REFRESH, 585

data/lib/pg_query/treewalker.rb

@@ -1,5 +1,11 @@
 module PgQuery
   class ParserResult
+    def walk!
+      treewalker!(@tree) do |parent_node, parent_field, node, location|
+        yield(parent_node, parent_field, node, location)
+      end
+    end
+
     private
 
     def treewalker!(tree) # rubocop:disable Metrics/CyclomaticComplexity

data/lib/pg_query/version.rb

@@ -1,3 +1,3 @@
 module PgQuery
-  VERSION = '2.1.4'.freeze
+  VERSION = '2.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_query
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.2.1
 platform: ruby
 authors:
 - Lukas Fittl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-17 00:00:00.000000000 Z
+date: 2023-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler