pg_query 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d7e7317e7c022454158d1f8d78a32e2b38fcd6b
-  data.tar.gz: b123e3e645343e4749520ba80a0efd55f67d9c40
+  metadata.gz: 80111a507d64911a62b77017e55feb80a4dad56b
+  data.tar.gz: 06887ee5734b6290a5763b942ba1dde1b21fc1b2
 SHA512:
-  metadata.gz: c010e9fd04c3546c6351576dea74a18706070a2441e3c550d69a32df2e5c070e287d8ffa2d13e8b06c8e779cb480f55a803327fa3fed9339b4f55d98bbf4b446
-  data.tar.gz: 092abe2df76fd405523a4bfe5638b5d7b8bb03106cae55ae2b7afacae8e4508b8b4c32a5e7ad90e0c51eaa6c37ef6b804771f7bc9854aa6178d32b681de1bb29
+  metadata.gz: cb42f31b99f44ccf66df76cb43d9e82f40a2cd87f5dce4d41d392d4920d00ba4c5d240cb25f7550988e1715e2ccd91dcedc5be8787d0cbc305a3412bd7d9a1c9
+  data.tar.gz: bd6c058613222acb36071f847d04afbaba2dbee6c685d52aa914fba1c12e0e86561ea226c75890f16193134426f3ee484d2a984a6fa1a3f9f9183b1db17134de

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.11.0    2016-06-22
+
+* Improved table name analysis (#tables method)
+  * Don't include CTE names, make them accessible as #cte_names instead [#52](https://github.com/lfittl/pg_query/issues/52)
+  * Include table names in target list sub selects [#38](https://github.com/lfittl/pg_query/issues/38)
+  * Add support for ORDER/GROUP BY, HAVING, and booleans in WHERE [#53](https://github.com/lfittl/pg_query/pull/53) [@jcoleman](https://github.com/jcoleman)
+  * Fix parsing of DROP TYPE statements
+
+
 ## 0.10.0    2016-05-31
 
 * Based on PostgreSQL 9.5.3

data/README.md

@@ -4,7 +4,7 @@ This Ruby extension uses the actual PostgreSQL server source to parse SQL querie
 
 In addition the extension allows you to normalize queries (replacing constant values with ?) and parse these normalized queries into a parsetree again.
 
-When you build this extension, it fetches a copy of the PostgreSQL server source and builds parts of it, and then statically links it into this extension.
+When you build this extension, it builds parts of the PostgreSQL server source (see [libpg_query](https://github.com/lfittl/libpg_query)), and then statically links it into this extension.
 
 This is slightly crazy, but is the only reliable way of parsing all valid PostgreSQL queries.
 

data/lib/pg_query/deparse.rb

@@ -526,6 +526,9 @@ class PgQuery
         output << expression
       end
       output << '(' + deparse_item_list(node['keys']).join(', ') + ')' if node['keys']
+      output << '(' + deparse_item_list(node['fk_attrs']).join(', ') + ')' if node['fk_attrs']
+      output << 'REFERENCES ' + deparse_item(node['pktable']) + ' (' + deparse_item_list(node['pk_attrs']).join(', ') + ')' if node['pktable']
+      output << 'NOT VALID' if node['skip_validation']
       output << "USING INDEX #{node['indexname']}" if node['indexname']
       output.join(' ')
     end

data/lib/pg_query/parse.rb

@@ -34,6 +34,11 @@ class PgQuery
     @tables
   end
 
+  def cte_names
+    load_tables_and_aliases! if @cte_names.nil?
+    @cte_names
+  end
+
   def aliases
     load_tables_and_aliases! if @aliases.nil?
     @aliases
@@ -43,11 +48,12 @@ class PgQuery
 
   def load_tables_and_aliases! # rubocop:disable Metrics/CyclomaticComplexity
     @tables = []
+    @cte_names = []
     @aliases = {}
 
     statements = @tree.dup
     from_clause_items = []
-    where_clause_items = []
+    subselect_items = []
 
     loop do
       statement = statements.shift
@@ -64,9 +70,12 @@ class PgQuery
             end
 
             # CTEs
-            if statement[SELECT_STMT]['withClause']
-              statement[SELECT_STMT]['withClause'][WITH_CLAUSE]['ctes'].each do |item|
-                statements << item[COMMON_TABLE_EXPR]['ctequery'] if item[COMMON_TABLE_EXPR]
+            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
           elsif statement[SELECT_STMT]['op'] == 1
@@ -99,7 +108,7 @@ class PgQuery
             # FIXME
           end
         when DROP_STMT
-          objects = statement[DROP_STMT]['objects'].map { |list| list.map { |obj| obj['String']['str'] } }
+          objects = statement[DROP_STMT]['objects'].map { |list| list.map { |obj| obj['String'] && obj['String']['str'] } }
           case statement[DROP_STMT]['removeType']
           when OBJECT_TYPE_TABLE
             @tables += objects.map { |r| r.join('.') }
@@ -108,11 +117,17 @@ class PgQuery
           end
         end
 
-        where_clause_items << statement.values[0]['whereClause'] if !statement.empty? && statement.values[0]['whereClause']
+        statement_value = statement.values[0]
+        unless statement.empty?
+          subselect_items.concat(statement_value['targetList']) if statement_value['targetList']
+          subselect_items << statement_value['whereClause'] if statement_value['whereClause']
+          subselect_items.concat(statement_value['sortClause'].collect { |h| h[SORT_BY]['node'] }) if statement_value['sortClause']
+          subselect_items.concat(statement_value['groupClause']) if statement_value['groupClause']
+          subselect_items << statement_value['havingClause'] if statement_value['havingClause']
+        end
       end
 
-      # Find subselects in WHERE clause
-      next_item = where_clause_items.shift
+      next_item = subselect_items.shift
       if next_item
         case next_item.keys[0]
         when A_EXPR
@@ -120,17 +135,21 @@ class PgQuery
             elem = next_item.values[0][side]
             next unless elem
             if elem.is_a?(Array)
-              where_clause_items += elem
+              subselect_items += elem
             else
-              where_clause_items << elem
+              subselect_items << elem
             end
           end
+        when BOOL_EXPR
+          subselect_items.concat(next_item.values[0]['args'])
+        when RES_TARGET
+          subselect_items << next_item[RES_TARGET]['val']
         when SUB_LINK
           statements << next_item[SUB_LINK]['subselect']
         end
       end
 
-      break if where_clause_items.empty? && statements.empty?
+      break if subselect_items.empty? && statements.empty?
     end
 
     loop do
@@ -146,6 +165,8 @@ class PgQuery
         from_clause_items += next_item[ROW_EXPR]['args']
       when RANGE_VAR
         rangevar = next_item[RANGE_VAR]
+        next if !rangevar['schemaname'] && @cte_names.include?(rangevar['relname'])
+
         table = [rangevar['schemaname'], rangevar['relname']].compact.join('.')
         @tables << table
         @aliases[rangevar['alias'][ALIAS]['aliasname']] = table if rangevar['alias']

data/lib/pg_query/version.rb

@@ -1,3 +1,3 @@
 class PgQuery
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_query
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Lukas Fittl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: PostgreSQL query parsing and normalization library