pg_query 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a5be9c84a9ac788a7845fc900696e4c7df77bb3
-  data.tar.gz: e77d94ae2f8fb120c21efabf2faed451ad4e0966
+  metadata.gz: 9d1df6666392e194e8ac7a87086cae2e3051644a
+  data.tar.gz: b524259660a3489556696cf0f4b75d0c5c3c91b7
 SHA512:
-  metadata.gz: 1f2f3fe149dfb181c7023fd243fa66f95f7613fffdb174c2968d947d37ade1d3dd15be599c27aa83ea67f8a289c8bff5e249c94902cb9fd61ca0306f61259927
-  data.tar.gz: ae8f01f2afc0172fad220c3119fb48806893b8e49e5e35ab58448e2342161933487a5ba9cbae8d95c656c68f453537458b450529c72c12cc77119327494e7aa1
+  metadata.gz: 61523601794ef69a4dad8e33ba3fc9b5f35f299dce42f3b924b8ccca8726d9a11266dbcbbb7c1fc6f92c98c3443a02092d006c2c9a1484a1a9b9e0875fa9b6e3
+  data.tar.gz: 476105d1b4a3337f9ef4266452858cb70d02278ad8b564320ad9d76169425f81f2e64fc9fff070fcc9739ce3589bde93e5ea000bf062c61a7190d5f4e38eacee

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 1.0.2     2018-04-11
+
+* Deparsing improvements
+  * SELECT DISTINCT clause [#77](https://github.com/lfittl/pg_query/pull/77) [@Papierkorb](https://github.com/Papierkorb)
+  * "CASE expr WHEN ... END" clause [#78](https://github.com/lfittl/pg_query/pull/78) [@Papierkorb](https://github.com/Papierkorb)
+  * LEFT/RIGHT/FULL/NATURAL JOIN [#79](https://github.com/lfittl/pg_query/pull/79) [@Papierkorb](https://github.com/Papierkorb)
+  * SELECT that includes schema name [#80](https://github.com/lfittl/pg_query/pull/80) [@jcsjcs](https://github.com/jcsjcs)
+
+
 ## 1.0.1     2018-02-02
 
 * Parse CTEs and nested selects in INSERT/UPDATE [#76](https://github.com/lfittl/pg_query/pull/76) [@jcoleman](https://github.com/jcoleman)

data/lib/pg_query/deparse.rb

@@ -174,7 +174,8 @@ class PgQuery
     def deparse_rangevar(node)
       output = []
       output << 'ONLY' unless node['inh']
-      output << '"' + node['relname'] + '"'
+      schema = node['schemaname'] ? '"' + node['schemaname'] + '".' : ''
+      output << schema + '"' + node['relname'] + '"'
       output << deparse_item(node['alias']) if node['alias']
       output.join(' ')
     end
@@ -432,9 +433,17 @@ class PgQuery
       output << deparse_item(node['larg'])
       case node['jointype']
       when 0
-        output << 'CROSS' if node['quals'].nil? && node['usingClause'].nil?
+        if node['isNatural']
+          output << 'NATURAL'
+        elsif node['quals'].nil? && node['usingClause'].nil?
+          output << 'CROSS'
+        end
       when 1
         output << 'LEFT'
+      when 2
+        output << 'FULL'
+      when 3
+        output << 'RIGHT'
       end
       output << 'JOIN'
       output << deparse_item(node['rarg'])
@@ -528,6 +537,7 @@ class PgQuery
 
     def deparse_case(node)
       output = ['CASE']
+      output << deparse_item(node['arg']) if node['arg']
       output += node['args'].map { |arg| deparse_item(arg) }
       if node['defresult']
         output << 'ELSE'
@@ -681,6 +691,7 @@ class PgQuery
 
       if node[TARGET_LIST_FIELD]
         output << 'SELECT'
+        output << 'DISTINCT' if node['distinctClause']
         output << node[TARGET_LIST_FIELD].map do |item|
           deparse_item(item, :select)
         end.join(', ')

data/lib/pg_query/version.rb

@@ -1,3 +1,3 @@
 class PgQuery
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_query
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Lukas Fittl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-02 00:00:00.000000000 Z
+date: 2018-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: PostgreSQL query parsing and normalization library