pg_query 0.11.5 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bfd32c9b29042f52d66ca4bd5786a5e4ca36a47
-  data.tar.gz: f908506157865a90c0612f2fbde3a94b83cfd33e
+  metadata.gz: 61359adbe400bc68cb1dc1d922483daf361eb143
+  data.tar.gz: b9af1134fffbcb19935c16ee0ce9c3571a27d6ce
 SHA512:
-  metadata.gz: 3c3da7f705f3fedd8413abdb45fe136b5618fb5e3096396f2cebe3210ae4d33100591a3c5106dce88b6ac1ee518e219a7c32440feaf21b48fee919a6afb065d7
-  data.tar.gz: 4305e63f41e304194434317457e032ca9d258dc2fb43b7dd7379622edae9c60ead3ca58fbeb7ca8155ca51ea060443847ce971047eff3fc4a9f29a2f401469cf
+  metadata.gz: fe42b2f8e3ccf33bbebca91340f9f1cc22439064a7ada8b8d3fac2ad8ea7e22f3d4ced2afd27c35b730a835b2b18b798c0e12e66a0a246edcd4fe04e661690cf
+  data.tar.gz: 12b4a53a3496c59ff0f275fc6a6e6829035593d360f098ecebf5d276aeb9324360d0f11dd3a836fa80eaa38b8822fa37ea54462b1df54d48204481305dea0b22

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.12.0    2017-07-29
+
+* Update libpg_query to 9.5-1.6.0
+  * BREAKING CHANGE in PgQuery.normalize(..) output
+  * This matches the change in the upcoming Postgres 10, and makes it easier to
+    migrate applications to the new normalization format using $1..$N instead of ?
+
+
 ## 0.11.5    2017-07-09
 
 * Deparse coldeflist [#64](https://github.com/lfittl/pg_query/pull/64) [@jcsjcs](https://github.com/jcsjcs)

data/Rakefile

@@ -12,7 +12,7 @@ RuboCop::RakeTask.new
 
 task spec: :compile
 
-task default: [:lint, :spec]
+task default: %i[lint spec]
 task test: :spec
 task lint: :rubocop
 

data/ext/pg_query/extconf.rb

@@ -3,7 +3,7 @@
 require 'mkmf'
 require 'open-uri'
 
-LIB_PG_QUERY_TAG = '9.5-1.4.2'
+LIB_PG_QUERY_TAG = '9.5-1.6.0'.freeze
 
 workdir = Dir.pwd
 libdir = File.join(workdir, 'libpg_query-' + LIB_PG_QUERY_TAG)
@@ -19,7 +19,7 @@ unless File.exist?("#{workdir}/libpg_query.tar.gz")
 end
 
 unless Dir.exist?(libdir)
-  system("tar -xf #{workdir}/libpg_query.tar.gz") || fail('ERROR')
+  system("tar -xf #{workdir}/libpg_query.tar.gz") || raise('ERROR')
 end
 
 unless Dir.exist?(libfile)

data/lib/pg_query/deparse.rb

@@ -43,7 +43,7 @@ class PgQuery
         when AEXPR_NULLIF
           deparse_aexpr_nullif(node)
         else
-          fail format("Can't deparse: %s: %s", type, node.inspect)
+          raise format("Can't deparse: %s: %s", type, node.inspect)
         end
       when ALIAS
         deparse_alias(node)
@@ -161,7 +161,7 @@ class PgQuery
       when NULL
         'NULL'
       else
-        fail format("Can't deparse: %s: %s", type, node.inspect)
+        raise format("Can't deparse: %s: %s", type, node.inspect)
       end
     end
 
@@ -171,7 +171,10 @@ class PgQuery
 
     def deparse_rangevar(node)
       output = []
-      output << 'ONLY' if node['inhOpt'] == 0
+      case node['inhOpt']
+      when 0
+        output << 'ONLY'
+      end
       output << '"' + node['relname'] + '"'
       output << deparse_item(node['alias']) if node['alias']
       output.join(' ')
@@ -180,13 +183,14 @@ class PgQuery
     def deparse_renamestmt(node)
       output = []
 
-      if node['renameType'] == OBJECT_TYPE_TABLE
+      case node['renameType']
+      when OBJECT_TYPE_TABLE
         output << 'ALTER TABLE'
         output << deparse_item(node['relation'])
         output << 'RENAME TO'
         output << node['newname']
       else
-        fail format("Can't deparse: %s", node.inspect)
+        raise format("Can't deparse: %s", node.inspect)
       end
 
       output.join(' ')
@@ -276,7 +280,7 @@ class PgQuery
       elsif node['val'].nil?
         node['name']
       else
-        fail format("Can't deparse %s in context %s", node.inspect, context)
+        raise format("Can't deparse %s in context %s", node.inspect, context)
       end
     end
 
@@ -423,8 +427,12 @@ class PgQuery
     def deparse_joinexpr(node)
       output = []
       output << deparse_item(node['larg'])
-      output << 'LEFT' if node['jointype'] == 1
-      output << 'CROSS' if node['jointype'] == 0 && node['quals'].nil?
+      case node['jointype']
+      when 0
+        output << 'CROSS' if node['quals'].nil?
+      when 1
+        output << 'LEFT'
+      end
       output << 'JOIN'
       output << deparse_item(node['rarg'])
 
@@ -441,7 +449,7 @@ class PgQuery
       LCS_FORSHARE => 'FOR SHARE',
       LCS_FORNOKEYUPDATE => 'FOR NO KEY UPDATE',
       LCS_FORUPDATE => 'FOR UPDATE'
-    }
+    }.freeze
     def deparse_lockingclause(node)
       output = []
       output << LOCK_CLAUSE_STRENGTH[node['strength']]
@@ -632,11 +640,11 @@ class PgQuery
 
     def deparse_sublink(node)
       if node['subLinkType'] == SUBLINK_TYPE_ANY
-        return format('%s IN (%s)', deparse_item(node['testexpr']), deparse_item(node['subselect']))
+        format('%s IN (%s)', deparse_item(node['testexpr']), deparse_item(node['subselect']))
       elsif node['subLinkType'] == SUBLINK_TYPE_EXISTS
-        return format('EXISTS(%s)', deparse_item(node['subselect']))
+        format('EXISTS(%s)', deparse_item(node['subselect']))
       else
-        return format('(%s)', deparse_item(node['subselect']))
+        format('(%s)', deparse_item(node['subselect']))
       end
     end
 
@@ -791,7 +799,7 @@ class PgQuery
 
       # Intervals are tricky and should be handled in a separate method because
       # they require performing some bitmask operations.
-      return deparse_interval_type(node) if names == %w(pg_catalog interval)
+      return deparse_interval_type(node) if names == %w[pg_catalog interval]
 
       output = []
       output << 'SETOF' if node['setof']
@@ -844,7 +852,7 @@ class PgQuery
       when 'timestamptz'
         'timestamp with time zone'
       else
-        fail format("Can't deparse type: %s", type)
+        raise format("Can't deparse type: %s", type)
       end
     end
 
@@ -870,9 +878,10 @@ class PgQuery
 
     def deparse_nulltest(node)
       output = [deparse_item(node['arg'])]
-      if node['nulltesttype'] == 0
+      case node['nulltesttype']
+      when 0
         output << 'IS NULL'
-      elsif node['nulltesttype'] == 1
+      when 1
         output << 'IS NOT NULL'
       end
       output.join(' ')
@@ -885,10 +894,10 @@ class PgQuery
       TRANS_STMT_SAVEPOINT => 'SAVEPOINT',
       TRANS_STMT_RELEASE => 'RELEASE',
       TRANS_STMT_ROLLBACK_TO => 'ROLLBACK TO SAVEPOINT'
-    }
+    }.freeze
     def deparse_transaction(node)
       output = []
-      output << TRANSACTION_CMDS[node['kind']] || fail(format("Can't deparse TRANSACTION %s", node.inspect))
+      output << TRANSACTION_CMDS[node['kind']] || raise(format("Can't deparse TRANSACTION %s", node.inspect))
 
       if node['options']
         output += node['options'].map { |item| deparse_item(item) }

data/lib/pg_query/deparse/alter_table.rb

@@ -15,7 +15,7 @@ class PgQuery
       #   ALTER COLUMN {column_name} DROP NOT NULL
       #
       def self.commands(node)
-        action = ALTER_TABLE_TYPES_MAPPING[node['subtype']] || fail(format("Can't deparse: %s", node.inspect))
+        action = ALTER_TABLE_TYPES_MAPPING[node['subtype']] || raise(format("Can't deparse: %s", node.inspect))
         PgQuery::Deparse.instance_exec(node, &action)
       end
 

data/lib/pg_query/deparse/interval.rb

@@ -57,7 +57,7 @@ class PgQuery
         26 => 'CENTURY',
         27 => 'MILLENNIUM',
         28 => 'DTZMOD'
-      }
+      }.freeze
       KEYS = MASKS.invert
 
       # Postgres stores the interval 'day second' as 'day hour minute second' so
@@ -75,31 +75,31 @@ class PgQuery
       #      { 6 => 'year to month' }
       #
       SQL_BY_MASK = {
-        (1 << KEYS['YEAR'])     => %w(year),
-        (1 << KEYS['MONTH'])    => %w(month),
-        (1 << KEYS['DAY'])      => %w(day),
-        (1 << KEYS['HOUR'])     => %w(hour),
-        (1 << KEYS['MINUTE'])   => %w(minute),
-        (1 << KEYS['SECOND'])   => %w(second),
+        (1 << KEYS['YEAR'])     => %w[year],
+        (1 << KEYS['MONTH'])    => %w[month],
+        (1 << KEYS['DAY'])      => %w[day],
+        (1 << KEYS['HOUR'])     => %w[hour],
+        (1 << KEYS['MINUTE'])   => %w[minute],
+        (1 << KEYS['SECOND'])   => %w[second],
         (1 << KEYS['YEAR'] |
-           1 << KEYS['MONTH'])  => %w(year month),
+           1 << KEYS['MONTH'])  => %w[year month],
         (1 << KEYS['DAY'] |
-           1 << KEYS['HOUR'])   => %w(day hour),
+           1 << KEYS['HOUR'])   => %w[day hour],
         (1 << KEYS['DAY'] |
            1 << KEYS['HOUR'] |
-           1 << KEYS['MINUTE']) => %w(day minute),
+           1 << KEYS['MINUTE']) => %w[day minute],
         (1 << KEYS['DAY'] |
            1 << KEYS['HOUR'] |
            1 << KEYS['MINUTE'] |
-           1 << KEYS['SECOND']) => %w(day second),
+           1 << KEYS['SECOND']) => %w[day second],
         (1 << KEYS['HOUR'] |
-           1 << KEYS['MINUTE']) => %w(hour minute),
+           1 << KEYS['MINUTE']) => %w[hour minute],
         (1 << KEYS['HOUR'] |
            1 << KEYS['MINUTE'] |
-           1 << KEYS['SECOND']) => %w(hour second),
+           1 << KEYS['SECOND']) => %w[hour second],
         (1 << KEYS['MINUTE'] |
-           1 << KEYS['SECOND']) => %w(minute second)
-      }
+           1 << KEYS['SECOND']) => %w[minute second]
+      }.freeze
     end
   end
 end

data/lib/pg_query/filter_columns.rb

@@ -14,7 +14,8 @@ class PgQuery
       statement = statements.shift
       if statement
         if statement[SELECT_STMT]
-          if statement[SELECT_STMT]['op'] == 0
+          case statement[SELECT_STMT]['op']
+          when 0
             if statement[SELECT_STMT][FROM_CLAUSE_FIELD]
               # FROM subselects
               statement[SELECT_STMT][FROM_CLAUSE_FIELD].each do |item|
@@ -35,7 +36,7 @@ class PgQuery
                 statements << item['CommonTableExpr']['ctequery'] if item['CommonTableExpr']
               end
             end
-          elsif statement[SELECT_STMT]['op'] == 1
+          when 1
             statements << statement[SELECT_STMT]['larg'] if statement[SELECT_STMT]['larg']
             statements << statement[SELECT_STMT]['rarg'] if statement[SELECT_STMT]['rarg']
           end
@@ -50,7 +51,7 @@ class PgQuery
       next_item = condition_items.shift
       if next_item
         if next_item[A_EXPR]
-          %w(lexpr rexpr).each do |side|
+          %w[lexpr rexpr].each do |side|
             expr = next_item.values[0][side]
             next unless expr && expr.is_a?(Hash)
             condition_items << expr
@@ -93,7 +94,7 @@ class PgQuery
         next_item = joinexpr_items.shift
         break unless next_item
         condition_items << next_item['quals'] if next_item['quals']
-        %w(larg rarg).each do |side|
+        %w[larg rarg].each do |side|
           next unless next_item[side][JOIN_EXPR]
           joinexpr_items << next_item[side][JOIN_EXPR]
         end

data/lib/pg_query/param_refs.rb

@@ -36,7 +36,7 @@ class PgQuery
   private
 
   def param_ref_length(paramref_node)
-    if paramref_node['number'] == 0
+    if paramref_node['number'] == 0 # rubocop:disable Style/NumericPredicate
       1 # Actually a ? replacement character
     else
       ('$' + paramref_node['number'].to_s).size

data/lib/pg_query/parse.rb

@@ -60,7 +60,8 @@ class PgQuery
       if statement
         case statement.keys[0]
         when SELECT_STMT
-          if statement[SELECT_STMT]['op'] == 0
+          case statement[SELECT_STMT]['op']
+          when 0
             (statement[SELECT_STMT][FROM_CLAUSE_FIELD] || []).each do |item|
               if item[RANGE_SUBSELECT]
                 statements << item[RANGE_SUBSELECT]['subquery']
@@ -78,7 +79,7 @@ class PgQuery
                 statements << item[COMMON_TABLE_EXPR]['ctequery']
               end
             end
-          elsif statement[SELECT_STMT]['op'] == 1
+          when 1
             statements << statement[SELECT_STMT]['larg'] if statement[SELECT_STMT]['larg']
             statements << statement[SELECT_STMT]['rarg'] if statement[SELECT_STMT]['rarg']
           end
@@ -100,11 +101,11 @@ class PgQuery
         when GRANT_STMT
           objects = statement[GRANT_STMT]['objects']
           case statement[GRANT_STMT]['objtype']
-          when 0 # Column
+          when 0 # Column # rubocop:disable Lint/EmptyWhen
             # FIXME
           when 1 # Table
             from_clause_items += objects
-          when 2 # Sequence
+          when 2 # Sequence # rubocop:disable Lint/EmptyWhen
             # FIXME
           end
         when DROP_STMT
@@ -131,7 +132,7 @@ class PgQuery
       if next_item
         case next_item.keys[0]
         when A_EXPR
-          %w(lexpr rexpr).each do |side|
+          %w[lexpr rexpr].each do |side|
             elem = next_item.values[0][side]
             next unless elem
             if elem.is_a?(Array)
@@ -158,7 +159,7 @@ class PgQuery
 
       case next_item.keys[0]
       when JOIN_EXPR
-        %w(larg rarg).each do |side|
+        %w[larg rarg].each do |side|
           from_clause_items << next_item[JOIN_EXPR][side]
         end
       when ROW_EXPR

data/lib/pg_query/treewalker.rb

@@ -1,7 +1,7 @@
 class PgQuery
   private
 
-  def treewalker!(normalized_parsetree, &block)
+  def treewalker!(normalized_parsetree)
     exprs = normalized_parsetree.dup.map { |e| [e, []] }
 
     loop do
@@ -11,7 +11,7 @@ class PgQuery
         expr.each do |k, v|
           location = parent_location + [k]
 
-          block.call(expr, k, v, location)
+          yield(expr, k, v, location)
 
           exprs << [v, location] unless v.nil?
         end
@@ -23,14 +23,14 @@ class PgQuery
     end
   end
 
-  def find_tree_location(normalized_parsetree, searched_location, &block)
+  def find_tree_location(normalized_parsetree, searched_location)
     treewalker! normalized_parsetree do |expr, k, v, location|
       next unless location == searched_location
-      block.call(expr, k, v)
+      yield(expr, k, v)
     end
   end
 
-  def transform_nodes!(parsetree, &block)
+  def transform_nodes!(parsetree)
     result = deep_dup(parsetree)
     exprs = result.dup
 
@@ -38,7 +38,7 @@ class PgQuery
       expr = exprs.shift
 
       if expr.is_a?(Hash)
-        block.call(expr) if expr.size == 1 && expr.keys[0][/^[A-Z]+/]
+        yield(expr) if expr.size == 1 && expr.keys[0][/^[A-Z]+/]
 
         exprs += expr.values.compact
       elsif expr.is_a?(Array)

data/lib/pg_query/truncate.rb

@@ -41,7 +41,7 @@ class PgQuery
     treewalker! @tree do |_expr, k, v, location|
       case k
       when TARGET_LIST_FIELD
-        length = deparse([{ SELECT_STMT => { k => v } }]).size - 'SELECT '.size
+        length = deparse([{ SELECT_STMT => { k => v } }]).size - 7 # 'SELECT '.size
 
         truncations << PossibleTruncation.new(location, TARGET_LIST_FIELD, length, true)
       when 'whereClause'

data/lib/pg_query/version.rb

@@ -1,3 +1,3 @@
 class PgQuery
-  VERSION = '0.11.5'
+  VERSION = '0.12.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_query
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.12.0
 platform: ruby
 authors:
 - Lukas Fittl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-10 00:00:00.000000000 Z
+date: 2017-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -42,30 +42,30 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.49.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.49.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.15.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.15.1
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: PostgreSQL query parsing and normalization library