pg_query 0.13.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 130496beef8076270894c725111a261febd7b9ac
-  data.tar.gz: 8543cfd89d821fc25109c0318c9186b19fb66898
+  metadata.gz: b234a246e532789199b80cfdc118cc44f45f56dc
+  data.tar.gz: 9f1b878a7902bfbce4a86a69d96ecdc8bdd4a659
 SHA512:
-  metadata.gz: e93a528c33bd1fdf597d1d67a581038d7988712e6bcf5819184012118955baf881ed2d43575f71fce82486188287c95fc0115ada496898286a4b31080fa479d8
-  data.tar.gz: a094a568c867ebd96ebcf9bc6b5fb56a711313b2317868ae065089b27b60c3563c20f5c16713c65ba276c77648f4597fb30dae1fb8d57e114097fd0f13aa0456
+  metadata.gz: 642d3c1c1a325d737da9252e72715a16f25dc6c2138c03ebd4503efb231604a5fd13b0265cf5637c0aa12510837560b70e8f4ad90ca94ecaf937301783bc4673
+  data.tar.gz: 269105c0470ee517a15f6bb613609ed0ff50a915e188b1c43510a98c02304eafee38f5c70a3ecfeefdf4bffdacbbe7331ce0c3d6d13d2336af41d8c314b746bb

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 1.0.0     2017-10-31
+
+* IMPORTANT: Major version bump to indicate backwards incompatible parse tree change!
+* Update to Postgres 10 parser and fingerprint version 2
+  - This is a backwards-incompatible change in parser output format, although it should
+    be relatively easy to update most programs. This can't be avoided since Postgres
+    does not guarantee parse trees stay the same across versions
+
+
 ## 0.13.5    2017-10-26
 
 * Update to libpg_query 9.5-1.7.1

data/ext/pg_query/extconf.rb

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

data/lib/pg_query/deparse.rb

@@ -116,6 +116,8 @@ class PgQuery
         deparse_rangesubselect(node)
       when RANGE_VAR
         deparse_rangevar(node)
+      when RAW_STMT
+        deparse_raw_stmt(node)
       when RENAME_STMT
         deparse_renamestmt(node)
       when RES_TARGET
@@ -171,15 +173,16 @@ class PgQuery
 
     def deparse_rangevar(node)
       output = []
-      case node['inhOpt']
-      when 0
-        output << 'ONLY'
-      end
+      output << 'ONLY' unless node['inh']
       output << '"' + node['relname'] + '"'
       output << deparse_item(node['alias']) if node['alias']
       output.join(' ')
     end
 
+    def deparse_raw_stmt(node)
+      deparse_item(node[STMT_FIELD])
+    end
+
     def deparse_renamestmt(node)
       output = []
 

data/lib/pg_query/filter_columns.rb

@@ -13,7 +13,9 @@ class PgQuery
     loop do
       statement = statements.shift
       if statement
-        if statement[SELECT_STMT]
+        if statement[RAW_STMT]
+          statements << statement[RAW_STMT][STMT_FIELD]
+        elsif statement[SELECT_STMT]
           case statement[SELECT_STMT]['op']
           when 0
             if statement[SELECT_STMT][FROM_CLAUSE_FIELD]

data/lib/pg_query/fingerprint.rb

@@ -9,7 +9,7 @@ class PgQuery
 
   private
 
-  FINGERPRINT_VERSION = 1
+  FINGERPRINT_VERSION = 2
 
   class FingerprintSubHash
     attr_reader :parts
@@ -76,6 +76,10 @@ class PgQuery
         next if [DECLARE_CURSOR_STMT, FETCH_STMT, CLOSE_PORTAL_STMT].include?(node_name)
       when 'relname'
         next if node_name == RANGE_VAR && fields[RELPERSISTENCE_FIELD] == 't'
+      when 'stmt_len'
+        next if node_name == RAW_STMT
+      when 'stmt_location'
+        next if node_name == RAW_STMT
       end
 
       fingerprint_value(val, hash, node_name, field_name, true)

data/lib/pg_query/legacy_parsetree.rb

@@ -1,7 +1,9 @@
 class PgQuery
   # Legacy parsetree from 0.7 and earlier versions - migrate to "tree" format if you can
   def parsetree # rubocop:disable Metrics/CyclomaticComplexity
-    @parsetree ||= transform_nodes!(@tree) do |node|
+    @parsetree ||= transform_nodes!(@tree) do |raw_node|
+      node = raw_node.keys[0] == RAW_STMT ? raw_node.delete(RAW_STMT)[STMT_FIELD] : raw_node
+
       key = node.keys[0]
       new_key = LEGACY_NODE_NAMES[key] || key.upcase
 
@@ -9,34 +11,38 @@ class PgQuery
       when A_CONST
         transform_parsetree_a_const(node)
       when A_EXPR
-        transform_string_list(node[A_EXPR]['name'])
+        node[A_EXPR]['name'] = transform_string_list(node[A_EXPR]['name'])
         node[key].delete('kind')
       when COLUMN_REF
-        transform_string_list(node[COLUMN_REF]['fields'])
+        node[COLUMN_REF]['fields'] = transform_string_list(node[COLUMN_REF]['fields'])
       when CREATE_FUNCTION_STMT
-        transform_string_list(node[CREATE_FUNCTION_STMT]['funcname'])
+        node[CREATE_FUNCTION_STMT]['funcname'] = transform_string_list(node[CREATE_FUNCTION_STMT]['funcname'])
       when CREATE_TRIG_STMT
-        transform_string_list(node[CREATE_TRIG_STMT]['funcname'])
+        node[CREATE_TRIG_STMT]['funcname'] = transform_string_list(node[CREATE_TRIG_STMT]['funcname'])
       when CONSTRAINT
         node[CONSTRAINT]['contype'] = LEGACY_CONSTRAINT_TYPES[node[CONSTRAINT]['contype']]
-        transform_string_list(node[CONSTRAINT]['keys'])
+        node[CONSTRAINT]['keys'] = transform_string_list(node[CONSTRAINT]['keys'])
       when COPY_STMT
-        transform_string_list(node[COPY_STMT]['attlist'])
+        node[COPY_STMT]['attlist'] = transform_string_list(node[COPY_STMT]['attlist'])
       when DEF_ELEM
         node[DEF_ELEM]['arg'] = node[DEF_ELEM]['arg'][INTEGER]['ival'] if node[DEF_ELEM]['arg'].is_a?(Hash) && node[DEF_ELEM]['arg'].keys[0] == INTEGER
         node[DEF_ELEM]['arg'] = node[DEF_ELEM]['arg'][STRING]['str'] if node[DEF_ELEM]['arg'].is_a?(Hash) && node[DEF_ELEM]['arg'].keys[0] == STRING
-        transform_string_list(node[DEF_ELEM]['arg']) if node[DEF_ELEM]['arg'].is_a?(Array)
+        node[DEF_ELEM]['arg'] = transform_string_list(node[DEF_ELEM]['arg']) if node[DEF_ELEM]['arg'].is_a?(Array)
       when DROP_STMT
-        node[DROP_STMT]['objects'].each { |obj| transform_string_list(obj) }
+        node[DROP_STMT]['objects'].each_with_index do |obj, idx|
+          node[DROP_STMT]['objects'][idx] = transform_string_list(obj)
+        end
       when FUNC_CALL
-        transform_string_list(node[FUNC_CALL]['funcname'])
+        node[FUNC_CALL]['funcname'] = transform_string_list(node[FUNC_CALL]['funcname'])
       when GRANT_ROLE_STMT
-        transform_string_list(node[GRANT_ROLE_STMT]['grantee_roles'])
+        node[GRANT_ROLE_STMT]['grantee_roles'] = transform_string_list(node[GRANT_ROLE_STMT]['grantee_roles'])
+      when RANGE_VAR
+        node[RANGE_VAR]['inhOpt'] = node[RANGE_VAR].delete('inh') ? 2 : 0
       when TYPE_NAME
-        transform_string_list(node[TYPE_NAME]['names'])
+        node[TYPE_NAME]['names'] = transform_string_list(node[TYPE_NAME]['names'])
       end
 
-      node[new_key] = node.delete(key)
+      raw_node[new_key] = node.delete(key)
     end
   end
 
@@ -66,18 +72,7 @@ class PgQuery
   }.freeze
 
   LEGACY_CONSTRAINT_TYPES = {
-    # CONSTR_TYPE_NULL = 0 # not standard SQL, but a lot of people expect it
-    # CONSTR_TYPE_NOTNULL = 1
-    # CONSTR_TYPE_DEFAULT = 2
-    # CONSTR_TYPE_CHECK = 3
-    CONSTR_TYPE_PRIMARY => 'PRIMARY_KEY',
-    # CONSTR_TYPE_UNIQUE = 5
-    # CONSTR_TYPE_EXCLUSION = 6
-    # CONSTR_TYPE_FOREIGN = 7
-    # CONSTR_TYPE_ATTR_DEFERRABLE = 8 # attributes for previous constraint node
-    # CONSTR_TYPE_ATTR_NOT_DEFERRABLE = 9
-    # CONSTR_TYPE_ATTR_DEFERRED = 10
-    # CONSTR_TYPE_ATTR_IMMEDIATE = 11
+    CONSTR_TYPE_PRIMARY => 'PRIMARY_KEY'
   }.freeze
 
   def transform_parsetree_a_const(node)
@@ -105,6 +100,10 @@ class PgQuery
   def transform_string_list(list)
     return if list.nil?
 
-    list.map! { |node| node.keys[0] == STRING ? node[STRING]['str'] : node }
+    if list.is_a?(Array)
+      list.map { |node| node.keys[0] == STRING ? node[STRING]['str'] : node }
+    else
+      [list.keys[0] == STRING ? list[STRING]['str'] : list]
+    end
   end
 end

data/lib/pg_query/node_types.rb

@@ -60,6 +60,7 @@ class PgQuery
   RANGE_FUNCTION = 'RangeFunction'.freeze
   RANGE_SUBSELECT = 'RangeSubselect'.freeze
   RANGE_VAR = 'RangeVar'.freeze
+  RAW_STMT = 'RawStmt'.freeze
   REFRESH_MAT_VIEW_STMT = 'RefreshMatViewStmt'.freeze
   RENAME_STMT = 'RenameStmt'.freeze
   RES_TARGET = 'ResTarget'.freeze
@@ -89,6 +90,7 @@ class PgQuery
   FROM_CLAUSE_FIELD = 'fromClause'.freeze
   RELPERSISTENCE_FIELD = 'relpersistence'.freeze
   REXPR_FIELD = 'rexpr'.freeze
+  STMT_FIELD = 'stmt'.freeze
   TARGET_LIST_FIELD = 'targetList'.freeze
   VALUES_LISTS_FIELD = 'valuesLists'.freeze
 
@@ -97,22 +99,65 @@ class PgQuery
   CONSTR_TYPE_NULL = 0 # not standard SQL, but a lot of people expect it
   CONSTR_TYPE_NOTNULL = 1
   CONSTR_TYPE_DEFAULT = 2
-  CONSTR_TYPE_CHECK = 3
-  CONSTR_TYPE_PRIMARY = 4
-  CONSTR_TYPE_UNIQUE = 5
-  CONSTR_TYPE_EXCLUSION = 6
-  CONSTR_TYPE_FOREIGN = 7
-  CONSTR_TYPE_ATTR_DEFERRABLE = 8 # attributes for previous constraint node
-  CONSTR_TYPE_ATTR_NOT_DEFERRABLE = 9
-  CONSTR_TYPE_ATTR_DEFERRED = 10
-  CONSTR_TYPE_ATTR_IMMEDIATE = 11
+  CONSTR_TYPE_IDENTITY = 3
+  CONSTR_TYPE_CHECK = 4
+  CONSTR_TYPE_PRIMARY = 5
+  CONSTR_TYPE_UNIQUE = 6
+  CONSTR_TYPE_EXCLUSION = 7
+  CONSTR_TYPE_FOREIGN = 8
+  CONSTR_TYPE_ATTR_DEFERRABLE = 9 # attributes for previous constraint node
+  CONSTR_TYPE_ATTR_NOT_DEFERRABLE = 10
+  CONSTR_TYPE_ATTR_DEFERRED = 11
+  CONSTR_TYPE_ATTR_IMMEDIATE = 12
 
-  OBJECT_TYPE_INDEX = 19
-  OBJECT_TYPE_RULE = 28
-  OBJECT_TYPE_SCHEMA = 29
-  OBJECT_TYPE_TABLE = 32
-  OBJECT_TYPE_TRIGGER = 35
-  OBJECT_TYPE_VIEW = 42
+  OBJECT_TYPE_ACCESS_METHOD = 0
+  OBJECT_TYPE_AGGREGATE = 1
+  OBJECT_TYPE_AMOP = 2
+  OBJECT_TYPE_AMPROC = 3
+  OBJECT_TYPE_ATTRIBUTE = 4
+  OBJECT_TYPE_CAST = 5
+  OBJECT_TYPE_COLUMN = 6
+  OBJECT_TYPE_COLLATION = 7
+  OBJECT_TYPE_CONVERSION = 8
+  OBJECT_TYPE_DATABASE = 9
+  OBJECT_TYPE_DEFAULT = 10
+  OBJECT_TYPE_DEFACL = 11
+  OBJECT_TYPE_DOMAIN = 12
+  OBJECT_TYPE_DOMCONSTRAINT = 13
+  OBJECT_TYPE_EVENT_TRIGGER = 14
+  OBJECT_TYPE_EXTENSION = 15
+  OBJECT_TYPE_FDW = 16
+  OBJECT_TYPE_FOREIGN_SERVER = 17
+  OBJECT_TYPE_FOREIGN_TABLE = 18
+  OBJECT_TYPE_FUNCTION = 19
+  OBJECT_TYPE_INDEX = 20
+  OBJECT_TYPE_LANGUAGE = 21
+  OBJECT_TYPE_LARGEOBJECT = 22
+  OBJECT_TYPE_MATVIEW = 23
+  OBJECT_TYPE_OPCLASS = 24
+  OBJECT_TYPE_OPERATOR = 25
+  OBJECT_TYPE_OPFAMILY = 26
+  OBJECT_TYPE_POLICY = 27
+  OBJECT_TYPE_PUBLICATION = 28
+  OBJECT_TYPE_PUBLICATION_REL = 29
+  OBJECT_TYPE_ROLE = 30
+  OBJECT_TYPE_RULE = 31
+  OBJECT_TYPE_SCHEMA = 32
+  OBJECT_TYPE_SEQUENCE = 33
+  OBJECT_TYPE_SUBSCRIPTION = 34
+  OBJECT_TYPE_STATISTIC_EXT = 35
+  OBJECT_TYPE_TABCONSTRAINT = 36
+  OBJECT_TYPE_TABLE = 37
+  OBJECT_TYPE_TABLESPACE = 38
+  OBJECT_TYPE_TRANSFORM = 39
+  OBJECT_TYPE_TRIGGER = 40
+  OBJECT_TYPE_TSCONFIGURATION = 41
+  OBJECT_TYPE_TSDICTIONARY = 42
+  OBJECT_TYPE_TSPARSER = 43
+  OBJECT_TYPE_TSTEMPLATE = 44
+  OBJECT_TYPE_TYPE = 45
+  OBJECT_TYPE_USER_MAPPING = 46
+  OBJECT_TYPE_VIEW = 47
 
   BOOL_EXPR_AND = 0
   BOOL_EXPR_OR = 1
@@ -129,17 +174,18 @@ class PgQuery
   AEXPR_OP_ANY = 1           # scalar op ANY (array)
   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 = 9          # [NOT] SIMILAR - name must be "~" or "!~"
-  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
+  AEXPR_NOT_DISTINCT = 4     # IS NOT DISTINCT FROM - name must be "="
+  AEXPR_NULLIF = 5           # NULLIF - name must be "="
+  AEXPR_OF = 6               # IS [NOT] OF - name must be "=" or "<>"
+  AEXPR_IN = 7               # [NOT] IN - name must be "=" or "<>"
+  AEXPR_LIKE = 8             # [NOT] LIKE - name must be "~~" or "!~~"
+  AEXPR_ILIKE = 9            # [NOT] ILIKE - name must be "~~*" or "!~~*"
+  AEXPR_SIMILAR = 10         # [NOT] SIMILAR - name must be "~" or "!~"
+  AEXPR_BETWEEN = 11         # name must be "BETWEEN"
+  AEXPR_NOT_BETWEEN = 12     # name must be "NOT BETWEEN"
+  AEXPR_BETWEEN_SYM = 13     # name must be "BETWEEN SYMMETRIC"
+  AEXPR_NOT_BETWEEN_SYM = 14 # name must be "NOT BETWEEN SYMMETRIC"
+  AEXPR_PAREN = 15           # nameless dummy node for parentheses
 
   TRANS_STMT_BEGIN = 0
   TRANS_STMT_START = 1 # semantically identical to BEGIN
@@ -228,4 +274,9 @@ class PgQuery
   AT_ForceRowSecurity = 58          # FORCE ROW SECURITY
   AT_NoForceRowSecurity = 59        # NO FORCE ROW SECURITY
   AT_GenericOptions = 60            # OPTIONS (...)
+  AT_AttachPartition = 61           # ATTACH PARTITION
+  AT_DetachPartition = 62           # DETACH PARTITION
+  AT_AddIdentity = 63               # ADD IDENTITY
+  AT_SetIdentity = 64               # SET identity column options
+  AT_DropIdentity = 65              # DROP IDENTITY
 end

data/lib/pg_query/parse.rb

@@ -78,6 +78,8 @@ class PgQuery
       statement = statements.shift
       if statement
         case statement.keys[0]
+        when RAW_STMT
+          statements << statement[RAW_STMT][STMT_FIELD]
         # The following statement types do not modify tables and are added to from_clause_items
         # (and subsequently @tables)
         when SELECT_STMT
@@ -127,7 +129,13 @@ class PgQuery
         when REFRESH_MAT_VIEW_STMT
           from_clause_items << { item: statement[REFRESH_MAT_VIEW_STMT]['relation'], type: :ddl }
         when DROP_STMT
-          objects = statement[DROP_STMT]['objects'].map { |list| list.map { |obj| obj['String'] && obj['String']['str'] } }
+          objects = statement[DROP_STMT]['objects'].map do |obj|
+            if obj.is_a?(Array)
+              obj.map { |obj2| obj2['String'] && obj2['String']['str'] }
+            else
+              obj['String'] && obj['String']['str']
+            end
+          end
           case statement[DROP_STMT]['removeType']
           when OBJECT_TYPE_TABLE
             @tables += objects.map { |r| { table: r.join('.'), type: :ddl } }

data/lib/pg_query/version.rb

@@ -1,3 +1,3 @@
 class PgQuery
-  VERSION = '0.13.5'.freeze
+  VERSION = '1.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_query
 version: !ruby/object:Gem::Version
-  version: 0.13.5
+  version: 1.0.0
 platform: ruby
 authors:
 - Lukas Fittl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler