pg_query 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTQ5MzZjYzgxYTIxZGQ3MWU3N2ZiYzFlMzI5MDhmOTZjMmFjZDQ5ZQ==
+    ZWQ2ODM2MzRjNWVkODM4ZWJhMjliN2Y1Yjg4NzE4MzljYmUzM2ZkYw==
   data.tar.gz: !binary |-
-    MzIwNTk4ODI3OWRjODA4MjI2ZWQxOGUyMjM1NGJjMGM5MzRlYmI3YQ==
+    MDMwMjdmODc1MjM1YzAwMTZhNDg4ZDk2Y2YxMjVhZWMzOGNlODNmNw==
 SHA512:
   metadata.gz: !binary |-
-    ZTk5YzFhZmQyZjRkZTIwNDdhNDExMWViNzQwYjI1NDBlOGQyNzk1ZTE2MzRh
-    OTlmNTQ3ZTc5MDRjNDQ4ZDRkMWVkOWZjMzY1MmZhMDUzZWM4YTM0NDZmODIw
-    MDNkMDQ0ZmM1NzgzYzYwODFlZmRjZDk3ODQyZWMyM2Q2YjgwN2U=
+    MTAzODFhNjEyNWJmNmVhNzIxNGYwYWMzZWY0ZGE3YTAzOWYzOTMzZmVjZTA5
+    YWUyMGViNTgxMGIzOGU3NjRmZDMyZmUwMDBlNDUxMmZiYmYwZTMzNGY1MzE1
+    M2M3YTU3NGJkY2Y2N2I0NDI1NzIzZTEzY2ZlYTAyZWFiNTFmNGQ=
   data.tar.gz: !binary |-
-    Nzk0NTY3MjE2NDE2OTZhOWYxNzAwOTNlZjE1Njk0MDdhNGYxNjU5NTgyZjI0
-    ODhmYjQyZGMzN2ZlYTk4ZGY2OGZhYjMwNjU0YjhkYjJkYWFmNGNiZmU1NDVk
-    MjY4Yzc2Y2E3NjRjYzA2MmEzNjg3NTkwZjA2MDBlMmIxMWQ1YmQ=
+    ZWI2YzI0Mjc5NzIzMDU1MGJiNzIyNzIzMGI1Y2UwMmI1MGE4NTk5ZThjYjE4
+    YTliZTkxMDM3MjM2OGQxODZjY2JhZGZkYTNkNWQ1MjMwNGVlMGM4OWEyMzc0
+    YTk4NmRmOTRmOTc0ZTJjOTQ3NDZiMGQxNGYxYjVkMWYzNzIyZWE=

data/lib/pg_query.rb

@@ -2,4 +2,5 @@ require 'pg_query/version'
 require 'pg_query/parse_error'
 
 require 'pg_query/pg_query'
-require 'pg_query/parse'
+require 'pg_query/parse'
+require 'pg_query/parse_normalized'

data/lib/pg_query/parse_normalized.rb

@@ -0,0 +1,51 @@
+class PgQuery
+  # Parses a query that has been normalized by pg_stat_statements
+  def self.parse_normalized(original_query)
+    # Transform ? into \uFFED
+    query = normalized_to_parseable_query(original_query)
+    
+    # Parse it!
+    result = parse(query)
+    
+    # Transform \uFFED references as if they were $0
+    parsed_to_normalized_parsetree!(result.parsetree)
+    
+    PgQuery.new(original_query, result.parsetree, result.warnings)
+  end
+
+protected
+  # The PostgreSQL parser doesn't understand pg_stat_statements replacement characters,
+  # change them into a fake column reference to an unusual unicode character \uFFED
+  def self.normalized_to_parseable_query(query)
+    regexps = [
+      'INTERVAL ?',
+      /\$[0-9]+\?/,
+      '?.?',
+      /(?<!\\)\?/, # Replace all ?, unless they are escaped by a backslash
+    ]
+    regexps.each do |re|
+      query = query.gsub(re) {|m| "\uFFED" * m.size }
+    end
+    query
+  end
+  
+  # Modifies the passed in parsetree to have paramrefs to $0 instead of columnref to \uFFED
+  def self.parsed_to_normalized_parsetree!(parsetree)
+    expressions = parsetree.dup
+    loop do
+      break unless expression = expressions.shift
+  
+      if expression.is_a?(Array)
+        expressions += expression.compact
+      elsif expression.is_a?(Hash)
+        value = expression['COLUMNREF'] && expression['COLUMNREF']['fields']
+        if value && value.size == 1 && value[0].is_a?(String) && value[0].chars.to_a.uniq == ["\uFFED"]
+          expression.replace('PARAMREF' => {'number' => 0,
+                                            'location' => expression['COLUMNREF']['location']})
+        else
+          expressions += expression.values.compact
+        end
+      end
+    end
+  end
+end

data/lib/pg_query/version.rb

@@ -1,3 +1,3 @@
 class PgQuery
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_query
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Lukas Fittl
@@ -67,6 +67,7 @@ files:
 - lib/pg_query.rb
 - lib/pg_query/parse.rb
 - lib/pg_query/parse_error.rb
+- lib/pg_query/parse_normalized.rb
 - lib/pg_query/version.rb
 homepage: http://github.com/pganalyze/pg_query
 licenses: