pg_query 2.1.0 → 4.2.1

data/ext/pg_query/src_port_snprintf.c

@@ -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-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -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,13 +1021,13 @@ 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];
 
-	/* we rely on regular C library's sprintf to do the basic conversion */
-	vallen = sprintf(convert, "%p", value);
+	/* we rely on regular C library's snprintf to do the basic conversion */
+	vallen = snprintf(convert, sizeof(convert), "%p", value);
 	if (vallen < 0)
 		target->failed = true;
 	else
@@ -1037,8 +1039,8 @@ fmtint(long long value, char type, int forcesign, int leftjust,
 	   int minlen, int zpad, int precision, int pointflag,
 	   PrintfTarget *target)
 {
-	unsigned long long base;
 	unsigned long long uvalue;
+	int			base;
 	int			dosign;
 	const char *cvt = "0123456789abcdef";
 	int			signvalue = 0;
@@ -1097,12 +1099,36 @@ fmtint(long long value, char type, int forcesign, int leftjust,
 		vallen = 0;
 	else
 	{
-		/* make integer string */
-		do
+		/*
+		 * Convert integer to string.  We special-case each of the possible
+		 * base values so as to avoid general-purpose divisions.  On most
+		 * machines, division by a fixed constant can be done much more
+		 * cheaply than a general divide.
+		 */
+		if (base == 10)
+		{
+			do
+			{
+				convert[sizeof(convert) - (++vallen)] = cvt[uvalue % 10];
+				uvalue = uvalue / 10;
+			} while (uvalue);
+		}
+		else if (base == 16)
 		{
-			convert[sizeof(convert) - (++vallen)] = cvt[uvalue % base];
-			uvalue = uvalue / base;
-		} while (uvalue);
+			do
+			{
+				convert[sizeof(convert) - (++vallen)] = cvt[uvalue % 16];
+				uvalue = uvalue / 16;
+			} while (uvalue);
+		}
+		else					/* base == 8 */
+		{
+			do
+			{
+				convert[sizeof(convert) - (++vallen)] = cvt[uvalue % 8];
+				uvalue = uvalue / 8;
+			} while (uvalue);
+		}
 	}
 
 	zeropad = Max(0, precision - vallen);
@@ -1151,11 +1177,11 @@ fmtfloat(double value, char type, int forcesign, int leftjust,
 	int			padlen;			/* amount to pad with spaces */
 
 	/*
-	 * We rely on the regular C library's sprintf to do the basic conversion,
+	 * We rely on the regular C library's snprintf to do the basic conversion,
 	 * then handle padding considerations here.
 	 *
 	 * The dynamic range of "double" is about 1E+-308 for IEEE math, and not
-	 * too wildly more than that with other hardware.  In "f" format, sprintf
+	 * too wildly more than that with other hardware.  In "f" format, snprintf
 	 * could therefore generate at most 308 characters to the left of the
 	 * decimal point; while we need to allow the precision to get as high as
 	 * 308+17 to ensure that we don't truncate significant digits from very
@@ -1207,14 +1233,14 @@ fmtfloat(double value, char type, int forcesign, int leftjust,
 			fmt[2] = '*';
 			fmt[3] = type;
 			fmt[4] = '\0';
-			vallen = sprintf(convert, fmt, prec, value);
+			vallen = snprintf(convert, sizeof(convert), fmt, prec, value);
 		}
 		else
 		{
 			fmt[0] = '%';
 			fmt[1] = type;
 			fmt[2] = '\0';
-			vallen = sprintf(convert, fmt, value);
+			vallen = snprintf(convert, sizeof(convert), fmt, value);
 		}
 		if (vallen < 0)
 			goto fail;

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-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -120,14 +120,10 @@ get_errno_symbol(int errnum)
 			return "E2BIG";
 		case EACCES:
 			return "EACCES";
-#ifdef EADDRINUSE
 		case EADDRINUSE:
 			return "EADDRINUSE";
-#endif
-#ifdef EADDRNOTAVAIL
 		case EADDRNOTAVAIL:
 			return "EADDRNOTAVAIL";
-#endif
 		case EAFNOSUPPORT:
 			return "EAFNOSUPPORT";
 #ifdef EAGAIN
@@ -148,16 +144,12 @@ get_errno_symbol(int errnum)
 			return "EBUSY";
 		case ECHILD:
 			return "ECHILD";
-#ifdef ECONNABORTED
 		case ECONNABORTED:
 			return "ECONNABORTED";
-#endif
 		case ECONNREFUSED:
 			return "ECONNREFUSED";
-#ifdef ECONNRESET
 		case ECONNRESET:
 			return "ECONNRESET";
-#endif
 		case EDEADLK:
 			return "EDEADLK";
 		case EDOM:
@@ -168,10 +160,10 @@ get_errno_symbol(int errnum)
 			return "EFAULT";
 		case EFBIG:
 			return "EFBIG";
-#ifdef EHOSTUNREACH
+		case EHOSTDOWN:
+			return "EHOSTDOWN";
 		case EHOSTUNREACH:
 			return "EHOSTUNREACH";
-#endif
 		case EIDRM:
 			return "EIDRM";
 		case EINPROGRESS:
@@ -182,10 +174,8 @@ get_errno_symbol(int errnum)
 			return "EINVAL";
 		case EIO:
 			return "EIO";
-#ifdef EISCONN
 		case EISCONN:
 			return "EISCONN";
-#endif
 		case EISDIR:
 			return "EISDIR";
 #ifdef ELOOP
@@ -200,6 +190,12 @@ get_errno_symbol(int errnum)
 			return "EMSGSIZE";
 		case ENAMETOOLONG:
 			return "ENAMETOOLONG";
+		case ENETDOWN:
+			return "ENETDOWN";
+		case ENETRESET:
+			return "ENETRESET";
+		case ENETUNREACH:
+			return "ENETUNREACH";
 		case ENFILE:
 			return "ENFILE";
 		case ENOBUFS:
@@ -216,20 +212,16 @@ get_errno_symbol(int errnum)
 			return "ENOSPC";
 		case ENOSYS:
 			return "ENOSYS";
-#ifdef ENOTCONN
 		case ENOTCONN:
 			return "ENOTCONN";
-#endif
 		case ENOTDIR:
 			return "ENOTDIR";
 #if defined(ENOTEMPTY) && (ENOTEMPTY != EEXIST) /* same code on AIX */
 		case ENOTEMPTY:
 			return "ENOTEMPTY";
 #endif
-#ifdef ENOTSOCK
 		case ENOTSOCK:
 			return "ENOTSOCK";
-#endif
 #ifdef ENOTSUP
 		case ENOTSUP:
 			return "ENOTSUP";
@@ -260,10 +252,8 @@ get_errno_symbol(int errnum)
 #endif
 		case ESRCH:
 			return "ESRCH";
-#ifdef ETIMEDOUT
 		case ETIMEDOUT:
 			return "ETIMEDOUT";
-#endif
 #ifdef ETXTBSY
 		case ETXTBSY:
 			return "ETXTBSY";

data/ext/pg_query/src_port_strnlen.c

@@ -10,7 +10,7 @@
  *		Fallback implementation of strnlen().
  *
  *
- * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION

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/filter_columns.rb

@@ -42,14 +42,16 @@ module PgQuery
                   statements << item.common_table_expr.ctequery if item.node == :common_table_expr
                 end
               end
-            when :SETOP_UNION
-              statements << statement.select_stmt.larg if statement.select_stmt.larg
-              statements << statement.select_stmt.rarg if statement.select_stmt.rarg
+            when :SETOP_UNION, :SETOP_EXCEPT, :SETOP_INTERSECT
+              statements << PgQuery::Node.new(select_stmt: statement.select_stmt.larg) if statement.select_stmt.larg
+              statements << PgQuery::Node.new(select_stmt: statement.select_stmt.rarg) if statement.select_stmt.rarg
             end
           when :update_stmt
             condition_items << statement.update_stmt.where_clause if statement.update_stmt.where_clause
           when :delete_stmt
             condition_items << statement.delete_stmt.where_clause if statement.delete_stmt.where_clause
+          when :index_stmt
+            condition_items << statement.index_stmt.where_clause if statement.index_stmt.where_clause
           end
         end
 
@@ -67,7 +69,7 @@ module PgQuery
           when :row_expr
             condition_items += next_item.row_expr.args
           when :column_ref
-            column, table = next_item.column_ref.fields.map { |f| f.string.str }.reverse
+            column, table = next_item.column_ref.fields.map { |f| f.string.sval }.reverse
             filter_columns << [@aliases[table] || table, column]
           when :null_test
             condition_items << next_item.null_test.arg

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)
@@ -55,7 +60,7 @@ module PgQuery
     end
 
     def ignored_node_type?(node)
-      [A_Const, Alias, ParamRef, SetToDefault, IntList, OidList, Null].include?(node.class) ||
+      [A_Const, Alias, ParamRef, SetToDefault, IntList, OidList].include?(node.class) ||
         node.is_a?(TypeCast) && (node.arg.node == :a_const || node.arg.node == :param_ref)
     end
 
@@ -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)
@@ -111,6 +122,10 @@ module PgQuery
             fingerprint_value(:AEXPR_OP, hash, postgres_node_name, postgres_field_name, true)
             next
           end
+        # libpg_query still outputs `str` parts when print a string node. Here we override that to
+        # the expected field name of `sval`.
+        when 'sval', 'fval', 'bsval'
+          postgres_field_name = 'str' if node.is_a?(String) || node.is_a?(BitString) || node.is_a?(Float)
         end
 
         fingerprint_value(val, hash, postgres_node_name, postgres_field_name, true)

data/lib/pg_query/node.rb

@@ -20,8 +20,8 @@ module PgQuery
     end
 
     # Make it easier to initialize value nodes
-    def self.from_string(str)
-      PgQuery::Node.new(string: PgQuery::String.new(str: str))
+    def self.from_string(sval)
+      PgQuery::Node.new(string: PgQuery::String.new(sval: sval))
     end
 
     def self.from_integer(ival)

data/lib/pg_query/param_refs.rb

@@ -29,7 +29,7 @@ module PgQuery
             location = typeloc
           end
 
-          results << { 'location' => location, 'length' => length, 'typename' => t.names.map { |n| n.string.str } }
+          results << { 'location' => location, 'length' => length, 'typename' => t.names.map { |n| n.string.sval } }
         end
       end
 

data/lib/pg_query/parse.rb

@@ -3,7 +3,13 @@ module PgQuery
     result, stderr = parse_protobuf(query)
 
     begin
-      result = PgQuery::ParseResult.decode(result)
+      result = if PgQuery::ParseResult.method(:decode).arity == 1
+                 PgQuery::ParseResult.decode(result)
+               elsif PgQuery::ParseResult.method(:decode).arity == -1
+                 PgQuery::ParseResult.decode(result, recursion_limit: 1_000)
+               else
+                 raise ArgumentError, 'Unsupported protobuf Ruby API'
+               end
     rescue Google::Protobuf::ParseError => e
       raise PgQuery::ParseError.new(format('Failed to parse tree: %s', e.message), __FILE__, __LINE__, -1)
     end
@@ -89,6 +95,10 @@ module PgQuery
 
     protected
 
+    # Parses the query and finds table and function references
+    #
+    # Note we use ".to_ary" on arrays from the Protobuf library before
+    # passing them to concat, because of https://bugs.ruby-lang.org/issues/18140
     def load_objects! # rubocop:disable Metrics/CyclomaticComplexity
       @tables = [] # types: select, dml, ddl
       @cte_names = []
@@ -108,22 +118,18 @@ module PgQuery
           # The following statement types do not modify tables and are added to from_clause_items
           # (and subsequently @tables)
           when :select_stmt
-            subselect_items.concat(statement.select_stmt.target_list)
+            subselect_items.concat(statement.select_stmt.target_list.to_ary)
             subselect_items << statement.select_stmt.where_clause if statement.select_stmt.where_clause
             subselect_items.concat(statement.select_stmt.sort_clause.collect { |h| h.sort_by.node })
-            subselect_items.concat(statement.select_stmt.group_clause)
+            subselect_items.concat(statement.select_stmt.group_clause.to_ary)
             subselect_items << statement.select_stmt.having_clause if statement.select_stmt.having_clause
 
             case statement.select_stmt.op
             when :SETOP_NONE
               (statement.select_stmt.from_clause || []).each do |item|
-                if item.node == :range_subselect
-                  statements << item.range_subselect.subquery
-                else
-                  from_clause_items << { item: item, type: :select }
-                end
+                from_clause_items << { item: item, type: :select }
               end
-            when :SETOP_UNION
+            when :SETOP_UNION, :SETOP_EXCEPT, :SETOP_INTERSECT
               statements << PgQuery::Node.new(select_stmt: statement.select_stmt.larg) if statement.select_stmt.larg
               statements << PgQuery::Node.new(select_stmt: statement.select_stmt.rarg) if statement.select_stmt.rarg
             end
@@ -133,6 +139,10 @@ module PgQuery
               @cte_names.concat(cte_names)
               statements.concat(cte_statements)
             end
+
+            if statement.select_stmt.into_clause
+              from_clause_items << { item: PgQuery::Node.new(range_var: statement.select_stmt.into_clause.rel), type: :ddl }
+            end
           # The following statements modify the contents of a table
           when :insert_stmt, :update_stmt, :delete_stmt
             value = statement.public_send(statement.node)
@@ -143,12 +153,18 @@ module PgQuery
               value.from_clause.each do |item|
                 from_clause_items << { item: item, type: :select }
               end
-              subselect_items.concat(statement.update_stmt.target_list)
+              subselect_items.concat(statement.update_stmt.target_list.to_ary)
             end
 
             subselect_items << statement.update_stmt.where_clause if statement.node == :update_stmt && statement.update_stmt.where_clause
             subselect_items << statement.delete_stmt.where_clause if statement.node == :delete_stmt && statement.delete_stmt.where_clause
 
+            if statement.node == :delete_stmt
+              statement.delete_stmt.using_clause.each do |using_clause|
+                from_clause_items << { item: using_clause, type: :select }
+              end
+            end
+
             if value.with_clause
               cte_statements, cte_names = statements_and_cte_names_for_with_clause(value.with_clause)
               @cte_names.concat(cte_names)
@@ -159,7 +175,12 @@ module PgQuery
             statements << statement.copy_stmt.query
           # The following statement types are DDL (changing table structure)
           when :alter_table_stmt
-            from_clause_items << { item: PgQuery::Node.new(range_var: statement.alter_table_stmt.relation), type: :ddl }
+            case statement.alter_table_stmt.objtype
+            when :OBJECT_INDEX # Index # rubocop:disable Lint/EmptyWhen
+              # ignore `ALTER INDEX index_name`
+            else
+              from_clause_items << { item: PgQuery::Node.new(range_var: statement.alter_table_stmt.relation), type: :ddl }
+            end
           when :create_stmt
             from_clause_items << { item: PgQuery::Node.new(range_var: statement.create_stmt.relation), type: :ddl }
           when :create_table_as_stmt
@@ -174,6 +195,11 @@ module PgQuery
             statements << statement.view_stmt.query
           when :index_stmt
             from_clause_items << { item: PgQuery::Node.new(range_var: statement.index_stmt.relation), type: :ddl }
+            statement.index_stmt.index_params.each do |p|
+              next if p.index_elem.expr.nil?
+              subselect_items << p.index_elem.expr
+            end
+            subselect_items << statement.index_stmt.where_clause if statement.index_stmt.where_clause
           when :create_trig_stmt
             from_clause_items << { item: PgQuery::Node.new(range_var: statement.create_trig_stmt.relation), type: :ddl }
           when :rule_stmt
@@ -186,9 +212,9 @@ module PgQuery
             objects = statement.drop_stmt.objects.map do |obj|
               case obj.node
               when :list
-                obj.list.items.map { |obj2| obj2.string.str if obj2.node == :string }
+                obj.list.items.map { |obj2| obj2.string.sval if obj2.node == :string }
               when :string
-                obj.string.str
+                obj.string.sval
               end
             end
             case statement.drop_stmt.remove_type
@@ -199,7 +225,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.sval }.join('.'), type: :ddl }
             end
           when :grant_stmt
             objects = statement.grant_stmt.objects
@@ -218,24 +244,28 @@ 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.sval }.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.sval }.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
 
         next_item = subselect_items.shift
         if next_item
           case next_item.node
+          when :list
+            subselect_items += next_item.list.items.to_ary
           when :a_expr
             %w[lexpr rexpr].each do |side|
               elem = next_item.a_expr.public_send(side)
@@ -247,56 +277,62 @@ module PgQuery
               end
             end
           when :bool_expr
-            subselect_items.concat(next_item.bool_expr.args)
+            subselect_items.concat(next_item.bool_expr.args.to_ary)
           when :coalesce_expr
-            subselect_items.concat(next_item.coalesce_expr.args)
+            subselect_items.concat(next_item.coalesce_expr.args.to_ary)
           when :min_max_expr
-            subselect_items.concat(next_item.min_max_expr.args)
+            subselect_items.concat(next_item.min_max_expr.args.to_ary)
           when :res_target
             subselect_items << next_item.res_target.val
           when :sub_link
             statements << next_item.sub_link.subselect
           when :func_call
+            subselect_items.concat(next_item.func_call.args.to_ary)
             @functions << {
-              function: next_item.func_call.funcname[0].string.str,
+              function: next_item.func_call.funcname.map { |f| f.string.sval }.join('.'),
               type: :call
             }
+          when :case_expr
+            subselect_items.concat(next_item.case_expr.args.map { |arg| arg.case_when.expr })
+            subselect_items.concat(next_item.case_expr.args.map { |arg| arg.case_when.result })
+            subselect_items << next_item.case_expr.defresult
+          when :type_cast
+            subselect_items << next_item.type_cast.arg
           end
         end
 
-        break if subselect_items.empty? && statements.empty?
-      end
-
-      loop do
         next_item = from_clause_items.shift
-        break unless next_item && next_item[:item]
-
-        case next_item[:item].node
-        when :join_expr
-          from_clause_items << { item: next_item[:item].join_expr.larg, type: next_item[:type] }
-          from_clause_items << { item: next_item[:item].join_expr.rarg, type: next_item[:type] }
-        when :row_expr
-          from_clause_items += next_item[:item].row_expr.args.map { |a| { item: a, type: next_item[:type] } }
-        when :range_var
-          rangevar = next_item[:item].range_var
-          next if rangevar.schemaname.empty? && @cte_names.include?(rangevar.relname)
-
-          table = [rangevar.schemaname, rangevar.relname].reject { |s| s.nil? || s.empty? }.join('.')
-          @tables << {
-            name: table,
-            type: next_item[:type],
-            location: rangevar.location,
-            schemaname: (rangevar.schemaname unless rangevar.schemaname.empty?),
-            relname: rangevar.relname,
-            inh: rangevar.inh
-          }
-          @aliases[rangevar.alias.aliasname] = table if rangevar.alias
-        when :range_subselect
-          from_clause_items << { item: next_item[:item].range_subselect.subquery, type: next_item[:type] }
-        when :select_stmt
-          from_clause = next_item[:item].select_stmt.from_clause
-          from_clause_items += from_clause.map { |r| { item: r, type: next_item[:type] } } if from_clause
+        if next_item && next_item[:item]
+          case next_item[:item].node
+          when :join_expr
+            from_clause_items << { item: next_item[:item].join_expr.larg, type: next_item[:type] }
+            from_clause_items << { item: next_item[:item].join_expr.rarg, type: next_item[:type] }
+            subselect_items << next_item[:item].join_expr.quals
+          when :row_expr
+            from_clause_items += next_item[:item].row_expr.args.map { |a| { item: a, type: next_item[:type] } }
+          when :range_var
+            rangevar = next_item[:item].range_var
+            next if rangevar.schemaname.empty? && @cte_names.include?(rangevar.relname)
+
+            table = [rangevar.schemaname, rangevar.relname].reject { |s| s.nil? || s.empty? }.join('.')
+            @tables << {
+              name: table,
+              type: next_item[:type],
+              location: rangevar.location,
+              schemaname: (rangevar.schemaname unless rangevar.schemaname.empty?),
+              relname: rangevar.relname,
+              inh: rangevar.inh,
+              relpersistence: rangevar.relpersistence
+            }
+            @aliases[rangevar.alias.aliasname] = table if rangevar.alias
+          when :range_subselect
+            statements << next_item[:item].range_subselect.subquery
+          when :range_function
+            subselect_items += next_item[:item].range_function.functions
+          end
         end
+
+        break if subselect_items.empty? && statements.empty? && from_clause_items.empty?
       end
 
       @tables.uniq!