pg_query 6.0.0 → 6.2.1

data/lib/pg_query/scan.rb

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

data/lib/pg_query/split.rb

@@ -0,0 +1,20 @@
+module PgQuery
+  class SplitError < ArgumentError
+    attr_reader :location
+
+    def initialize(message, source_file, source_line, location)
+      super("#{message} (#{source_file}:#{source_line})")
+      @location = location
+    end
+  end
+
+  def self.split_with_parser(query)
+    result, stderr = _raw_split_with_parser(query)
+
+    raise SplitError.new(stderr, 'stderr', '', '') unless stderr.empty?
+
+    result.map do |location, len|
+      query[location..location + len]
+    end
+  end
+end

data/lib/pg_query/treewalker.rb

@@ -11,13 +11,18 @@ module PgQuery
     # multiple parser runs, assuming the same pg_query release and no modifications to the parse tree.
     def walk!(&block)
       if block.arity == 1
-        treewalker!(@tree) do |node|
-          yield(node)
-        end
+        treewalker!(@tree, &block)
       else
-        treewalker_with_location!(@tree) do |parent_node, parent_field, node, location|
-          yield(parent_node, parent_field, node, location)
-        end
+        treewalker_with_location!(@tree, &block)
+      end
+    end
+
+    # Traverses the tree to find the node at the given location and yields
+    # its parent node, the parent field, and the node itself.
+    def find_tree_location(tree, searched_location)
+      treewalker_with_location! tree do |parent_node, parent_field, node, location|
+        next unless location == searched_location
+        yield(parent_node, parent_field, node)
       end
     end
 
@@ -77,12 +82,5 @@ module PgQuery
         break if nodes.empty?
       end
     end
-
-    def find_tree_location(tree, searched_location)
-      treewalker_with_location! tree do |parent_node, parent_field, node, location|
-        next unless location == searched_location
-        yield(parent_node, parent_field, node)
-      end
-    end
   end
 end

data/lib/pg_query/truncate.rb

@@ -1,7 +1,6 @@
-
 module PgQuery
   class ParserResult
-    PossibleTruncation = Struct.new(:location, :node_type, :length, :is_array)
+    PossibleTruncation = Struct.new(:location, :node_type, :len, :is_array)
 
     # Truncates the query string to be below the specified length, first trying to
     # omit less important parts of the query, and only then cutting off the end.
@@ -14,11 +13,11 @@ module PgQuery
       truncations = find_possible_truncations
 
       # Truncate the deepest possible truncation that is the longest first
-      truncations.sort_by! { |t| [-t.location.size, -t.length] }
+      truncations.sort_by! { |t| [-t.location.size, -t.len] }
 
       tree = dup_tree
       truncations.each do |truncation|
-        next if truncation.length < 3
+        next if truncation.len < 3
 
         find_tree_location(tree, truncation.location) do |node, _k|
           dummy_column_ref = PgQuery::Node.new(column_ref: PgQuery::ColumnRef.new(fields: [PgQuery::Node.new(string: PgQuery::String.new(sval: '…'))]))
@@ -64,30 +63,29 @@ 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 = 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)
+          len = 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, len, 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)
+          len = PgQuery.deparse_expr(v).size
+          truncations << PossibleTruncation.new(location, :where_clause, len, false)
         when :values_lists
-          length = select_values_lists_len(v)
-          truncations << PossibleTruncation.new(location, :values_lists, length, false)
+          len = select_values_lists_len(v)
+          truncations << PossibleTruncation.new(location, :values_lists, len, 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)
+          len = PgQuery.deparse_stmt(v[v.node.to_s]).size
+          truncations << PossibleTruncation.new(location, :ctequery, len, false)
         when :cols
           next unless node.is_a?(PgQuery::InsertStmt)
-          length = cols_len(v)
-          truncations << PossibleTruncation.new(location, :cols, length, true)
+          len = cols_len(v)
+          truncations << PossibleTruncation.new(location, :cols, len, true)
         end
       end
 

data/lib/pg_query/version.rb

@@ -1,3 +1,3 @@
 module PgQuery
-  VERSION = '6.0.0'.freeze
+  VERSION = '6.2.1'.freeze
 end

data/lib/pg_query.rb

@@ -16,3 +16,4 @@ require 'pg_query/deparse'
 require 'pg_query/truncate'
 
 require 'pg_query/scan'
+require 'pg_query/split'

metadata

@@ -1,85 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pg_query
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.2.1
 platform: ruby
 authors:
 - Lukas Fittl
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-02 00:00:00.000000000 Z
+date: 2026-01-21 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.49.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.49.1
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.15.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.15.1
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: google-protobuf
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +37,12 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- ext/pg_query/ext_symbols.sym
+- ext/pg_query/ext_symbols_freebsd.sym
+- ext/pg_query/ext_symbols_freebsd_with_ruby_abi_version.sym
+- ext/pg_query/ext_symbols_openbsd.sym
+- ext/pg_query/ext_symbols_openbsd_with_ruby_abi_version.sym
+- ext/pg_query/ext_symbols_with_ruby_abi_version.sym
 - ext/pg_query/extconf.rb
 - ext/pg_query/include/pg_query.h
 - ext/pg_query/include/pg_query_enum_defs.c
@@ -537,6 +473,7 @@ files:
 - ext/pg_query/include/postgres/utils/wait_event_types.h
 - ext/pg_query/include/postgres/utils/xml.h
 - ext/pg_query/include/postgres/varatt.h
+- ext/pg_query/include/postgres_deparse.h
 - ext/pg_query/include/protobuf-c.h
 - ext/pg_query/include/protobuf-c/protobuf-c.h
 - ext/pg_query/include/protobuf/pg_query.pb-c.h
@@ -549,6 +486,7 @@ files:
 - ext/pg_query/pg_query_fingerprint.c
 - ext/pg_query/pg_query_fingerprint.h
 - ext/pg_query/pg_query_internal.h
+- ext/pg_query/pg_query_is_utility_stmt.c
 - ext/pg_query/pg_query_json_plpgsql.c
 - ext/pg_query/pg_query_json_plpgsql.h
 - ext/pg_query/pg_query_normalize.c
@@ -557,15 +495,17 @@ files:
 - ext/pg_query/pg_query_outfuncs_protobuf.c
 - ext/pg_query/pg_query_parse.c
 - ext/pg_query/pg_query_parse_plpgsql.c
+- ext/pg_query/pg_query_raw_tree_walker_supports.c
 - ext/pg_query/pg_query_readfuncs.h
 - 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/pg_query_summary.c
+- ext/pg_query/pg_query_summary.h
+- ext/pg_query/pg_query_summary_statement_type.c
+- ext/pg_query/pg_query_summary_truncate.c
 - ext/pg_query/postgres_deparse.c
-- ext/pg_query/postgres_deparse.h
 - ext/pg_query/protobuf-c.c
 - ext/pg_query/src_backend_catalog_namespace.c
 - ext/pg_query/src_backend_catalog_pg_proc.c
@@ -635,14 +575,16 @@ files:
 - lib/pg_query/parse_error.rb
 - lib/pg_query/pg_query_pb.rb
 - lib/pg_query/scan.rb
+- lib/pg_query/split.rb
 - lib/pg_query/treewalker.rb
 - lib/pg_query/truncate.rb
 - lib/pg_query/version.rb
 homepage: https://github.com/pganalyze/pg_query
 licenses:
 - BSD-3-Clause
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -654,15 +596,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: PostgreSQL query parsing and normalization library
 test_files: []

data/ext/pg_query/postgres_deparse.h

@@ -1,9 +0,0 @@
-#ifndef POSTGRES_DEPARSE_H
-#define POSTGRES_DEPARSE_H
-
-#include "lib/stringinfo.h"
-#include "nodes/parsenodes.h"
-
-extern void deparseRawStmt(StringInfo str, RawStmt *raw_stmt);
-
-#endif