pg_query 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3e1b71a544d0fb300ae470913f157d570579c70
-  data.tar.gz: dd474651bb19f9a17d9c97c54bef4f772db57af9
+  metadata.gz: 7581a181058d0429e35143026aa4cde939af9920
+  data.tar.gz: 9dad6882888ad1a1631e6119263383613452df54
 SHA512:
-  metadata.gz: 4212d4e1af776ee3a90441c93a8b4f8b4492fe093c95df887a35322c24cdfbb3a27b00e482c4a35ed5e6cbc85c7260f71d28503a2f220e7d60f3c653e0ec4b4a
-  data.tar.gz: 89fe26ce09d610a61609fbfea3572834e30edd630486c1aa5257e72f39c31f885af1de814fa2caa7ca9c501cc9b2ddacd9c46becd4d2719523e4eef61b20afc4
+  metadata.gz: bf7a6b92484148b7431f83e4c9a7474825b3fd510d640210fb5fd7eb90bd761bb97dbd2ce4f8d0731bbb59c29158c5a147190eb098f31e17eb03691f3c322da7
+  data.tar.gz: e9418cbb97645d2b7ea861773b5e0ea6f5712183b28165985e5240f26e8335bff1a6c49d396c741c77380430069fb7edfbaeeff64575b49abdc333eba0451b4e

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.13.2    2017-08-10
+
+* Support table detection in sub-SELECTs in JOINs [#68](https://github.com/lfittl/pg_query/pull/65) [@seanmdick](https://github.com/seanmdick)
+* Legacy ".parsetree" helper: Fix "Between" and "In" operator does not have "AEXPR" [#66](https://github.com/lfittl/pg_query/issues/66)
+  * For new applications please use ".tree" method which uses the native structure
+    returned from libpg_query which resembles Postgres node names more closely
+
+
 ## 0.13.1    2017-08-03
 
 * Fix regression in 0.13.1 that broke ".tables" logic for COPY statements that

data/lib/pg_query/legacy_parsetree.rb

@@ -10,8 +10,7 @@ class PgQuery
         transform_parsetree_a_const(node)
       when A_EXPR
         transform_string_list(node[A_EXPR]['name'])
-        new_key = LEGACY_A_EXPR_NAMES[node[A_EXPR]['kind']]
-        node[A_EXPR].delete('kind')
+        node[key].delete('kind')
       when COLUMN_REF
         transform_string_list(node[COLUMN_REF]['fields'])
       when CREATE_FUNCTION_STMT
@@ -44,6 +43,7 @@ class PgQuery
   private
 
   LEGACY_NODE_NAMES = {
+    A_EXPR => 'AEXPR',
     SELECT_STMT => 'SELECT',
     ALTER_TABLE_CMD => 'ALTER TABLE CMD',
     ALTER_TABLE_STMT => 'ALTER TABLE',
@@ -65,24 +65,6 @@ class PgQuery
     # All others default to simply upper-casing the input name
   }.freeze
 
-  LEGACY_A_EXPR_NAMES = {
-    AEXPR_OP => 'AEXPR',
-    # AEXPR_OP_ANY = 1           # normal operator
-    # AEXPR_OP_ALL = 2           # scalar op ALL (array)
-    # AEXPR_DISTINCT = 3         # IS DISTINCT FROM - name must be "="
-    # AEXPR_NULLIF = 4           # NULLIF - name must be "="
-    # AEXPR_OF = 5               # IS [NOT] OF - name must be "=" or "<>"
-    # AEXPR_IN = 6               # [NOT] IN - name must be "=" or "<>"
-    # AEXPR_LIKE = 7             # [NOT] LIKE - name must be "~~" or "!~~"
-    # AEXPR_ILIKE = 8            # [NOT] ILIKE - name must be "~~*" or "!~~*"
-    AEXPR_SIMILAR => 'AEXPR',
-    # AEXPR_BETWEEN = 10         # name must be "BETWEEN"
-    # AEXPR_NOT_BETWEEN = 11     # name must be "NOT BETWEEN"
-    # AEXPR_BETWEEN_SYM = 12     # name must be "BETWEEN SYMMETRIC"
-    # AEXPR_NOT_BETWEEN_SYM = 13 # name must be "NOT BETWEEN SYMMETRIC"
-    # AEXPR_PAREN = 14           # nameless dummy node for parentheses
-  }.freeze
-
   LEGACY_CONSTRAINT_TYPES = {
     # CONSTR_TYPE_NULL = 0 # not standard SQL, but a lot of people expect it
     # CONSTR_TYPE_NOTNULL = 1

data/lib/pg_query/parse.rb

@@ -201,6 +201,10 @@ class PgQuery
         table = [rangevar['schemaname'], rangevar['relname']].compact.join('.')
         @tables << { table: table, type: next_item[:type] }
         @aliases[rangevar['alias'][ALIAS]['aliasname']] = table if rangevar['alias']
+      when RANGE_SUBSELECT
+        from_clause_items << { item: next_item[:item][RANGE_SUBSELECT]['subquery'], type: next_item[:type] }
+      when SELECT_STMT
+        from_clause_items += next_item[:item][SELECT_STMT]['fromClause'].map { |r| { item: r, type: next_item[:type] } }
       end
     end
 

data/lib/pg_query/version.rb

@@ -1,3 +1,3 @@
 class PgQuery
-  VERSION = '0.13.1'.freeze
+  VERSION = '0.13.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_query
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Lukas Fittl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 2017-08-10 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