pg_query 0.11.2 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bc9fd00dd477c57c71b8d87b68e4f0cc140e546
-  data.tar.gz: 6945b13cedde086d562db7bb73f6b260bda2fbd7
+  metadata.gz: a239534a583610c96a6a32facaa233733eadecff
+  data.tar.gz: f1e5a88a394eed863a072fd95c509e03a72c4eda
 SHA512:
-  metadata.gz: fa4e914867c7ea09b89f1c3f4db2b94b69031a232e2ec44fe474467053529518b98606271c16ec22ddd600a5a4809787d54fa27d3064f3e7c4f0e149c4ca610f
-  data.tar.gz: e3566185cad4fb012fb58a668d6a2465e312941510571236a193d09eef0febb6686bc5b5bbcc2b876c3e1cc02e00bffa860a3a954e09075cd534ff2485140960
+  metadata.gz: 686011140d6fb957646700cc78f0e22f7786eadc859e588e19aa0abf4271993684abf27cea0125498923046e35c447409b11c112eadbcb6f4404d558f8f35728
+  data.tar.gz: 4e1ee3b8a8f1f95b852a9966c98bc85278d78812e17c65ddf0391166beb89249e107e83e9377db63ce929f8c80fa7c7971cd1711011d799af5287f58cfbdd512

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 0.11.3    2016-12-06
+
+* Update to newest libpg_query version (9.5-1.4.2)
+  * Cut off fingerprints at 100 nodes deep to avoid excessive runtimes/memory
+  * Fix warning on Linux due to missing asprintf include
+* Improved deparsing [@jcsjcs](https://github.com/jcsjcs)
+  * Float [#54](https://github.com/lfittl/pg_query/pull/54)
+  * BETWEEN [#55](https://github.com/lfittl/pg_query/pull/55)
+  * NULLIF [#56](https://github.com/lfittl/pg_query/pull/56)
+  * SELECT NULL and BooleanTest [#57](https://github.com/lfittl/pg_query/pull/57)
+* Fix build on BSD systems [#58](https://github.com/lfittl/pg_query/pull/58) [@myfreeweb](https://github.com/myfreeweb)
+
+
 ## 0.11.2    2016-06-27
 
 * Update to newest libpg_query version (9.5-1.4.1)

data/ext/pg_query/extconf.rb

@@ -3,7 +3,7 @@
 require 'mkmf'
 require 'open-uri'
 
-LIB_PG_QUERY_TAG = '9.5-1.4.1'
+LIB_PG_QUERY_TAG = '9.5-1.4.2'
 
 workdir = Dir.pwd
 libdir = File.join(workdir, 'libpg_query-' + LIB_PG_QUERY_TAG)
@@ -24,7 +24,7 @@ end
 
 unless Dir.exist?(libfile)
   # Build libpg_query (and parts of PostgreSQL)
-  system("cd #{libdir}; make build")
+  system("cd #{libdir}; #{ENV['MAKE'] || (RUBY_PLATFORM =~ /bsd/ ? 'gmake' : 'make')} build")
 end
 
 # Copy test files (this intentionally overwrites existing files!)

data/lib/pg_query/deparse.rb

@@ -38,6 +38,10 @@ class PgQuery
           deparse_aexpr_in(node)
         when CONSTR_TYPE_FOREIGN
           deparse_aexpr_like(node)
+        when AEXPR_BETWEEN, AEXPR_NOT_BETWEEN, AEXPR_BETWEEN_SYM, AEXPR_NOT_BETWEEN_SYM
+          deparse_aexpr_between(node)
+        when AEXPR_NULLIF
+          deparse_aexpr_nullif(node)
         else
           fail format("Can't deparse: %s: %s", type, node.inspect)
         end
@@ -68,6 +72,8 @@ class PgQuery
         when BOOL_EXPR_NOT
           deparse_bool_expr_not(node)
         end
+      when BOOLEAN_TEST
+        deparse_boolean_test(node)
       when CASE_EXPR
         deparse_case(node)
       when COALESCE_EXPR
@@ -150,6 +156,10 @@ class PgQuery
         end
       when INTEGER
         node['ival'].to_s
+      when FLOAT
+        node['str']
+      when NULL
+        'NULL'
       else
         fail format("Can't deparse: %s: %s", type, node.inspect)
       end
@@ -326,6 +336,18 @@ class PgQuery
       format('NOT %s', deparse_item(node['args'][0]))
     end
 
+    BOOLEAN_TEST_TYPE_TO_STRING = {
+      BOOLEAN_TEST_TRUE        => ' IS TRUE',
+      BOOLEAN_TEST_NOT_TRUE    => ' IS NOT TRUE',
+      BOOLEAN_TEST_FALSE       => ' IS FALSE',
+      BOOLEAN_TEST_NOT_FALSE   => ' IS NOT FALSE',
+      BOOLEAN_TEST_UNKNOWN     => ' IS UNKNOWN',
+      BOOLEAN_TEST_NOT_UNKNOWN => ' IS NOT UNKNOWN'
+    }.freeze
+    def deparse_boolean_test(node)
+      deparse_item(node['arg']) + BOOLEAN_TEST_TYPE_TO_STRING[node['booltesttype']]
+    end
+
     def deparse_range_function(node)
       output = []
       output << 'LATERAL' if node['lateral']
@@ -375,6 +397,28 @@ class PgQuery
       output.join(' ' + deparse_item(node['name'][0], :operator) + ' ')
     end
 
+    def deparse_aexpr_between(node)
+      between = case node['kind']
+                when AEXPR_BETWEEN
+                  ' BETWEEN '
+                when AEXPR_NOT_BETWEEN
+                  ' NOT BETWEEN '
+                when AEXPR_BETWEEN_SYM
+                  ' BETWEEN SYMMETRIC '
+                when AEXPR_NOT_BETWEEN_SYM
+                  ' NOT BETWEEN SYMMETRIC '
+                end
+      name   = deparse_item(node['lexpr'])
+      output = node['rexpr'].map { |n| deparse_item(n) }
+      name << between << output.join(' AND ')
+    end
+
+    def deparse_aexpr_nullif(node)
+      lexpr = deparse_item(node['lexpr'])
+      rexpr = deparse_item(node['rexpr'])
+      format('NULLIF(%s, %s)', lexpr, rexpr)
+    end
+
     def deparse_joinexpr(node)
       output = []
       output << deparse_item(node['larg'])

data/lib/pg_query/node_types.rb

@@ -113,6 +113,13 @@ class PgQuery
   BOOL_EXPR_OR = 1
   BOOL_EXPR_NOT = 2
 
+  BOOLEAN_TEST_TRUE = 0
+  BOOLEAN_TEST_NOT_TRUE = 1
+  BOOLEAN_TEST_FALSE = 2
+  BOOLEAN_TEST_NOT_FALSE = 3
+  BOOLEAN_TEST_UNKNOWN = 4
+  BOOLEAN_TEST_NOT_UNKNOWN = 5
+
   AEXPR_OP = 0               # normal operator
   AEXPR_OP_ANY = 1           # scalar op ANY (array)
   AEXPR_OP_ALL = 2           # scalar op ALL (array)

data/lib/pg_query/version.rb

@@ -1,3 +1,3 @@
 class PgQuery
-  VERSION = '0.11.2'
+  VERSION = '0.11.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_query
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
 platform: ruby
 authors:
 - Lukas Fittl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-12-06 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.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: PostgreSQL query parsing and normalization library