pg_query 0.13.3 → 0.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41868b21a2b7a440970f576289d910e0830f4bce
-  data.tar.gz: af57e55f9d2db4f4fa3e6e4a4284c4896b3b221b
+  metadata.gz: ff41b6f96f4b8cf081341854b35684016ccfdab7
+  data.tar.gz: 016e672d36156857083385248901065174e95ca2
 SHA512:
-  metadata.gz: 2443cf93ee2cdeacf5b9231049ed8503d902d73d779b3873fba7cc2ad8bd17d95ae7a39ad90dae652adfc4e432e8973c02b7d78c7a529156a2a1739dc918f2da
-  data.tar.gz: 35306d9dc32a1812fb8a902de034626e82e9bf7fd2369473a3718b13e4aea14fa671ae8d34df22e9c4550d0b21f8835c36be937a40a0af07e6c0a343adb08326
+  metadata.gz: c61da4a93cf780a6b55fb47ee366db887a0c75d88a50bf2c7e15f28bbbb298ea8715386b16e83462077836c1f323b6aa381d46f8361f6d292ee3f9198480e5d0
+  data.tar.gz: 622df6653bea3aad75f39f1b816038633c51f9ae31a45ba0fc81802470ea4dd1b1089b63db0684920bdf7096f3b8d7efa2d378d17e63ff7090a7054d119d7cbc

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.13.4    2017-10-20
+
+* Update to libpg_query 9.5-1.7.0
+  - Fixes compilation old gcc before 4.6.0 [#73](https://github.com/lfittl/pg_query/issues/73)
+
+
 ## 0.13.3    2017-09-04
 
 * Fix table detection for SELECTs that have sub-SELECTs without FROM clause [#69](https://github.com/lfittl/pg_query/issues/69)

data/ext/pg_query/extconf.rb

@@ -3,7 +3,7 @@
 require 'mkmf'
 require 'open-uri'
 
-LIB_PG_QUERY_TAG = '9.5-1.6.2'.freeze
+LIB_PG_QUERY_TAG = '9.5-1.7.0'.freeze
 
 workdir = Dir.pwd
 libdir = File.join(workdir, 'libpg_query-' + LIB_PG_QUERY_TAG)

data/lib/pg_query/deparse.rb

@@ -424,12 +424,12 @@ class PgQuery
       format('NULLIF(%s, %s)', lexpr, rexpr)
     end
 
-    def deparse_joinexpr(node)
+    def deparse_joinexpr(node) # rubocop:disable Metrics/CyclomaticComplexity
       output = []
       output << deparse_item(node['larg'])
       case node['jointype']
       when 0
-        output << 'CROSS' if node['quals'].nil?
+        output << 'CROSS' if node['quals'].nil? && node['usingClause'].nil?
       when 1
         output << 'LEFT'
       end
@@ -441,6 +441,8 @@ class PgQuery
         output << deparse_item(node['quals'])
       end
 
+      output << format('USING (%s)', node['usingClause'].map { |n| deparse_item(n) }.join(', ')) if node['usingClause']
+
       output.join(' ')
     end
 

data/lib/pg_query/parse.rb

@@ -27,6 +27,9 @@ class PgQuery
     @query = query
     @tree = tree
     @warnings = warnings
+    @tables = nil
+    @aliases = nil
+    @cte_names = nil
   end
 
   def tables
@@ -87,20 +90,20 @@ class PgQuery
                 from_clause_items << { item: item, type: :select }
               end
             end
-
-            # CTEs
-            with_clause = statement[SELECT_STMT]['withClause']
-            if with_clause
-              with_clause[WITH_CLAUSE]['ctes'].each do |item|
-                next unless item[COMMON_TABLE_EXPR]
-                @cte_names << item[COMMON_TABLE_EXPR]['ctename']
-                statements << item[COMMON_TABLE_EXPR]['ctequery']
-              end
-            end
           when 1
             statements << statement[SELECT_STMT]['larg'] if statement[SELECT_STMT]['larg']
             statements << statement[SELECT_STMT]['rarg'] if statement[SELECT_STMT]['rarg']
           end
+
+          # CTEs
+          with_clause = statement[SELECT_STMT]['withClause']
+          if with_clause
+            with_clause[WITH_CLAUSE]['ctes'].each do |item|
+              next unless item[COMMON_TABLE_EXPR]
+              @cte_names << item[COMMON_TABLE_EXPR]['ctename']
+              statements << item[COMMON_TABLE_EXPR]['ctequery']
+            end
+          end
         # The following statements modify the contents of a table
         when INSERT_STMT, UPDATE_STMT, DELETE_STMT
           from_clause_items << { item: statement.values[0]['relation'], type: :dml }

data/lib/pg_query/version.rb

@@ -1,3 +1,3 @@
 class PgQuery
-  VERSION = '0.13.3'.freeze
+  VERSION = '0.13.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_query
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.13.4
 platform: ruby
 authors:
 - Lukas Fittl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-05 00:00:00.000000000 Z
+date: 2017-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: PostgreSQL query parsing and normalization library