pg_query 2.1.2 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a4724c7ac9b16756c258b015aa4576da20258c0b3beff05d65fcead44b9ba63
-  data.tar.gz: 8513d20ca3bfc1f14301b3d7e473b45f5d3234e3ddb03a06213c040b74b236cb
+  metadata.gz: fe9be3677078ec8a4990a53c9e0aa74c21f2a66672fe3a0990b23c00a6da34af
+  data.tar.gz: 31e3bbcdfac0cd27a1553ac0f0d33f7cbd7e36ce8c5080f29a314da67adcc76a
 SHA512:
-  metadata.gz: 1be0d5b046bc54c26c223d2114371f93ff7fdb12376518c109cebee009d1a61a4883ef12e07e7692c20668b000db2ece079f9c76204edf497a476b3f83271854
-  data.tar.gz: 024e2a9cb8be13b5f4885dbae15a6c2481d0fde469de0d82ca8040dc951fa58ef2780a0b849fc8092faf608fa5404886576af5c2759b03b86f92069d7d4d230b
+  metadata.gz: 7a8e0ef4b389446f952988903aa6b5772c6caabaea80d97e4f40affdf0830227285e60af0848a2786fcdab98232e96a5a75d3b5f73b24378b9ef67e9d24d9bf8
+  data.tar.gz: ffd90f7bdf9a155cb7a014eaf9c8bfbf06d0905e70bc5dadc739015c4d11695ead10ae1960e1bcee44e3d81d3c8a5b7d47b6705a32ef93daa8d909b328ee9602

data/CHANGELOG.md

@@ -4,6 +4,23 @@
 
 * ...
 
+## 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
 

data/ext/pg_query/extconf.rb

@@ -11,7 +11,13 @@ $CFLAGS << " -fvisibility=hidden -O3 -Wall -fno-strict-aliasing -fwrapv -fstack-
 
 $INCFLAGS = "-I#{File.join(__dir__, 'include')} " + $INCFLAGS
 
-SYMFILE = File.join(__dir__, 'pg_query_ruby.sym')
+SYMFILE =
+  if RUBY_PLATFORM =~ /freebsd/
+    File.join(__dir__, 'pg_query_ruby_freebsd.sym')
+  else
+    File.join(__dir__, 'pg_query_ruby.sym')
+  end
+
 if RUBY_PLATFORM =~ /darwin/
   $DLDFLAGS << " -Wl,-exported_symbols_list #{SYMFILE}" unless defined?(::Rubinius)
 else

data/ext/pg_query/pg_query_ruby.sym

@@ -1,2 +1 @@
 _Init_pg_query
-Init_pg_query

data/ext/pg_query/pg_query_ruby_freebsd.sym

@@ -0,0 +1,2 @@
+_Init_pg_query
+Init_pg_query

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
 

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
@@ -123,7 +129,7 @@ module PgQuery
               (statement.select_stmt.from_clause || []).each do |item|
                 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
@@ -180,6 +186,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
@@ -274,6 +285,8 @@ module PgQuery
             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
 

data/lib/pg_query/truncate.rb

@@ -32,6 +32,12 @@ module PgQuery
             )
           when :where_clause
             node.where_clause = dummy_column_ref
+          when :values_lists
+            node.values_lists.replace(
+              [
+                PgQuery::Node.new(list: PgQuery::List.new(items: [dummy_column_ref]))
+              ]
+            )
           when :ctequery
             node.ctequery = PgQuery::Node.new(select_stmt: PgQuery::SelectStmt.new(where_clause: dummy_column_ref, op: :SETOP_NONE))
           when :cols
@@ -58,7 +64,11 @@ module PgQuery
         case k
         when :target_list
           next unless node.is_a?(PgQuery::SelectStmt) || node.is_a?(PgQuery::UpdateStmt) || node.is_a?(PgQuery::OnConflictClause)
-          length = PgQuery.deparse_stmt(PgQuery::SelectStmt.new(k => v.to_a, op: :SETOP_NONE)).size - 7 # 'SELECT '.size
+          length = if node.is_a?(PgQuery::SelectStmt)
+                     select_target_list_len(v)
+                   else # UpdateStmt / OnConflictClause
+                     update_target_list_len(v)
+                   end
           truncations << PossibleTruncation.new(location, :target_list, length, true)
         when :where_clause
           next unless node.is_a?(PgQuery::SelectStmt) || node.is_a?(PgQuery::UpdateStmt) || node.is_a?(PgQuery::DeleteStmt) ||
@@ -67,23 +77,59 @@ module PgQuery
 
           length = PgQuery.deparse_expr(v).size
           truncations << PossibleTruncation.new(location, :where_clause, length, false)
+        when :values_lists
+          length = select_values_lists_len(v)
+          truncations << PossibleTruncation.new(location, :values_lists, length, false)
         when :ctequery
           next unless node.is_a?(PgQuery::CommonTableExpr)
           length = PgQuery.deparse_stmt(v[v.node.to_s]).size
           truncations << PossibleTruncation.new(location, :ctequery, length, false)
         when :cols
           next unless node.is_a?(PgQuery::InsertStmt)
-          length = PgQuery.deparse_stmt(
-            PgQuery::InsertStmt.new(
-              relation: PgQuery::RangeVar.new(relname: 'x', inh: true),
-              cols: v.to_a
-            )
-          ).size - 31 # "INSERT INTO x () DEFAULT VALUES".size
+          length = cols_len(v)
           truncations << PossibleTruncation.new(location, :cols, length, true)
         end
       end
 
       truncations
     end
+
+    def select_target_list_len(target_list)
+      deparsed_len = PgQuery.deparse_stmt(
+        PgQuery::SelectStmt.new(
+          target_list: target_list.to_a, op: :SETOP_NONE
+        )
+      ).size
+      deparsed_len - 7 # 'SELECT '.size
+    end
+
+    def select_values_lists_len(values_lists)
+      deparsed_len = PgQuery.deparse_stmt(
+        PgQuery::SelectStmt.new(
+          values_lists: values_lists.to_a, op: :SETOP_NONE
+        )
+      ).size
+      deparsed_len - 7 # 'SELECT '.size
+    end
+
+    def update_target_list_len(target_list)
+      deparsed_len = PgQuery.deparse_stmt(
+        PgQuery::UpdateStmt.new(
+          target_list: target_list.to_a,
+          relation: PgQuery::RangeVar.new(relname: 'x', inh: true)
+        )
+      ).size
+      deparsed_len - 13 # 'UPDATE x SET '.size
+    end
+
+    def cols_len(cols)
+      deparsed_len = PgQuery.deparse_stmt(
+        PgQuery::InsertStmt.new(
+          relation: PgQuery::RangeVar.new(relname: 'x', inh: true),
+          cols: cols.to_a
+        )
+      ).size
+      deparsed_len - 31 # "INSERT INTO x () DEFAULT VALUES".size
+    end
   end
 end

data/lib/pg_query/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_query
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.4
 platform: ruby
 authors:
 - Lukas Fittl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-12 00:00:00.000000000 Z
+date: 2022-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.17.1
+        version: 3.19.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.17.1
+        version: 3.19.2
 description: Parses SQL queries using a copy of the PostgreSQL server query parser
 email: lukas@fittl.com
 executables: []
@@ -484,6 +484,7 @@ files:
 - ext/pg_query/pg_query_readfuncs_protobuf.c
 - ext/pg_query/pg_query_ruby.c
 - ext/pg_query/pg_query_ruby.sym
+- ext/pg_query/pg_query_ruby_freebsd.sym
 - ext/pg_query/pg_query_scan.c
 - ext/pg_query/pg_query_split.c
 - ext/pg_query/protobuf-c.c