pg_query 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 710ab71b06be359f6072242754970015712cdad8839c1811470292fad47c880e
-  data.tar.gz: 1c16c458bdc5f32798dc74839a9d6721bbfa56b754768a64a8bbcbd3b63f13c8
+  metadata.gz: f19538f4d41c891a9b7704cd56becd762e44f5f766fba06c07f89b2e1d61b69f
+  data.tar.gz: df5a48fd5582bacd09098a5d37c21794a6f1caff82b16fe4597be2257bb0eaa1
 SHA512:
-  metadata.gz: 4263eebc1add9d84d008d9405e6188dcccc01beec592ed915c80ae6edaaf18a452bb947a18b1af0279d7c5be7e68e871e727cb50d2f36c831694825774fa74de
-  data.tar.gz: 6e4b4ed4202cf46562cd2dc2281cec07c487e19db79f1df14b3797dba512182daedcccb9299cd0374d4b3163c5400579b71aa18800280e75f9fa499eec997a9a
+  metadata.gz: 0326c810f5589b03d3a1809e98c199984c6bc013dfd93228cb6e35e5378cf39421ff0690c5dc67431f4b1501815fa80245d5e0cfcb1c75186054aa5d1300d684
+  data.tar.gz: 476514b25750f97ab9f27c55ccf6c221b6ab16687677178adc9f2ed219a85286dca983a36b25e703a3f0e9f080268ce6e82b69fbb932d4e50195bc711f434530

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## Unreleased
 
+* ...
+
+
+## 2.0.3     2021-04-05
+
+* Update to libpg_query 13-2.0.4
+  - Normalize: Fix handling of two subsequent DefElem elements (avoids crash)
+  - Deparser: Fix crash in CopyStmt with HEADER or FREEZE inside WITH parens
+
 
 ## 2.0.2     2021-03-31
 

data/Rakefile

@@ -5,8 +5,8 @@ require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 require 'open-uri'
 
-LIB_PG_QUERY_TAG = '13-2.0.2'.freeze
-LIB_PG_QUERY_SHA256SUM = 'fe485f48bb51dcc5ed146b1c9929da417357ae8844c2f0c8fe1e235fa1d14257'.freeze
+LIB_PG_QUERY_TAG = '13-2.0.4'.freeze
+LIB_PG_QUERY_SHA256SUM = 'a67ef3e3b6c9cb1297f362888d6660dac165d3b020f78d23afe4293b8ceaf190'.freeze
 
 Rake::ExtensionTask.new 'pg_query' do |ext|
   ext.lib_dir = 'lib/pg_query'

data/ext/pg_query/pg_query_deparse.c

@@ -6678,9 +6678,11 @@ static void deparseCopyStmt(StringInfo str, CopyStmt *copy_stmt)
 				else
 					Assert(false);
 			}
-			else if (strcmp(def_elem->defname, "freeze") == 0 && intVal(def_elem->arg) == 1)
+			else if (strcmp(def_elem->defname, "freeze") == 0 && (def_elem->arg == NULL || intVal(def_elem->arg) == 1))
 			{
-				appendStringInfoString(str, "FREEZE 1");
+				appendStringInfoString(str, "FREEZE");
+				if (def_elem->arg != NULL && intVal(def_elem->arg) == 1)
+					appendStringInfoString(str, " 1");
 			}
 			else if (strcmp(def_elem->defname, "delimiter") == 0)
 			{
@@ -6692,9 +6694,11 @@ static void deparseCopyStmt(StringInfo str, CopyStmt *copy_stmt)
 				appendStringInfoString(str, "NULL ");
 				deparseStringLiteral(str, strVal(def_elem->arg));
 			}
-			else if (strcmp(def_elem->defname, "header") == 0 && intVal(def_elem->arg) == 1)
+			else if (strcmp(def_elem->defname, "header") == 0 && (def_elem->arg == NULL || intVal(def_elem->arg) == 1))
 			{
-				appendStringInfoString(str, "HEADER 1");
+				appendStringInfoString(str, "HEADER");
+				if (def_elem->arg != NULL && intVal(def_elem->arg) == 1)
+					appendStringInfoString(str, " 1");
 			}
 			else if (strcmp(def_elem->defname, "quote") == 0)
 			{

data/ext/pg_query/pg_query_normalize.c

@@ -318,8 +318,10 @@ static bool const_record_walker(Node *node, pgssConstLocations *jstate)
 		DefElem * defElem = (DefElem *) node;
 		if (defElem->arg != NULL && IsA(defElem->arg, String)) {
 			for (int i = defElem->location; i < jstate->query_len; i++) {
-				if (jstate->query[i] == '\'')
+				if (jstate->query[i] == '\'') {
 					RecordConstLocation(jstate, i);
+					break;
+			  }
 			}
 		}
 		return const_record_walker((Node *) ((DefElem *) node)->arg, jstate);

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.2'.freeze
+  VERSION = '2.0.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_query
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Lukas Fittl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-31 00:00:00.000000000 Z
+date: 2021-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler