pg_query 2.0.1 → 2.1.1

data/lib/pg_query/truncate.rb

@@ -24,9 +24,10 @@ module PgQuery
           dummy_column_ref = PgQuery::Node.new(column_ref: PgQuery::ColumnRef.new(fields: [PgQuery::Node.new(string: PgQuery::String.new(str: '…'))]))
           case truncation.node_type
           when :target_list
+            res_target_name = '…' if node.is_a?(PgQuery::UpdateStmt) || node.is_a?(PgQuery::OnConflictClause)
             node.target_list.replace(
               [
-                PgQuery::Node.new(res_target: PgQuery::ResTarget.new(val: dummy_column_ref))
+                PgQuery::Node.new(res_target: PgQuery::ResTarget.new(name: res_target_name, val: dummy_column_ref))
               ]
             )
           when :where_clause
@@ -34,7 +35,7 @@ module PgQuery
           when :ctequery
             node.ctequery = PgQuery::Node.new(select_stmt: PgQuery::SelectStmt.new(where_clause: dummy_column_ref, op: :SETOP_NONE))
           when :cols
-            node.cols.replace([PgQuery::Node.from(PgQuery::ResTarget.new(name: '…'))])
+            node.cols.replace([PgQuery::Node.from(PgQuery::ResTarget.new(name: '…'))]) if node.is_a?(PgQuery::InsertStmt)
           else
             raise ArgumentError, format('Unexpected truncation node type: %s', truncation.node_type)
           end
@@ -50,21 +51,28 @@ module PgQuery
 
     private
 
-    def find_possible_truncations
+    def find_possible_truncations # rubocop:disable Metrics/CyclomaticComplexity
       truncations = []
 
-      treewalker! @tree do |_expr, k, v, location|
+      treewalker! @tree do |node, k, v, location|
         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
           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) ||
+                      node.is_a?(PgQuery::CopyStmt) || node.is_a?(PgQuery::IndexStmt) || node.is_a?(PgQuery::RuleStmt) ||
+                      node.is_a?(PgQuery::InferClause) || node.is_a?(PgQuery::OnConflictClause)
+
           length = PgQuery.deparse_expr(v).size
           truncations << PossibleTruncation.new(location, :where_clause, 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),

data/lib/pg_query/version.rb

@@ -1,3 +1,3 @@
 module PgQuery
-  VERSION = '2.0.1'.freeze
+  VERSION = '2.1.1'.freeze
 end

data/lib/pg_query.rb

@@ -10,7 +10,6 @@ require 'pg_query/parse'
 require 'pg_query/treewalker'
 
 require 'pg_query/filter_columns'
-require 'pg_query/json_field_names'
 require 'pg_query/fingerprint'
 require 'pg_query/param_refs'
 require 'pg_query/deparse'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_query
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.1
 platform: ruby
 authors:
 - Lukas Fittl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-18 00:00:00.000000000 Z
+date: 2021-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -70,16 +70,16 @@ dependencies:
   name: google-protobuf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.15.5
+        version: 3.17.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.15.5
+        version: 3.17.1
 description: Parses SQL queries using a copy of the PostgreSQL server query parser
 email: lukas@fittl.com
 executables: []
@@ -522,6 +522,7 @@ files:
 - ext/pg_query/src_backend_utils_mmgr_aset.c
 - ext/pg_query/src_backend_utils_mmgr_mcxt.c
 - ext/pg_query/src_common_encnames.c
+- ext/pg_query/src_common_hashfn.c
 - ext/pg_query/src_common_keywords.c
 - ext/pg_query/src_common_kwlist_d.h
 - ext/pg_query/src_common_kwlookup.c
@@ -551,7 +552,6 @@ files:
 - lib/pg_query/deparse.rb
 - lib/pg_query/filter_columns.rb
 - lib/pg_query/fingerprint.rb
-- lib/pg_query/json_field_names.rb
 - lib/pg_query/node.rb
 - lib/pg_query/param_refs.rb
 - lib/pg_query/parse.rb
@@ -561,7 +561,7 @@ files:
 - lib/pg_query/treewalker.rb
 - lib/pg_query/truncate.rb
 - lib/pg_query/version.rb
-homepage: http://github.com/pganalyze/pg_query
+homepage: https://github.com/pganalyze/pg_query
 licenses:
 - BSD-3-Clause
 metadata: {}