pg_query 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b234a246e532789199b80cfdc118cc44f45f56dc
-  data.tar.gz: 9f1b878a7902bfbce4a86a69d96ecdc8bdd4a659
+  metadata.gz: 4a5be9c84a9ac788a7845fc900696e4c7df77bb3
+  data.tar.gz: e77d94ae2f8fb120c21efabf2faed451ad4e0966
 SHA512:
-  metadata.gz: 642d3c1c1a325d737da9252e72715a16f25dc6c2138c03ebd4503efb231604a5fd13b0265cf5637c0aa12510837560b70e8f4ad90ca94ecaf937301783bc4673
-  data.tar.gz: 269105c0470ee517a15f6bb613609ed0ff50a915e188b1c43510a98c02304eafee38f5c70a3ecfeefdf4bffdacbbe7331ce0c3d6d13d2336af41d8c314b746bb
+  metadata.gz: 1f2f3fe149dfb181c7023fd243fa66f95f7613fffdb174c2968d947d37ade1d3dd15be599c27aa83ea67f8a289c8bff5e249c94902cb9fd61ca0306f61259927
+  data.tar.gz: ae8f01f2afc0172fad220c3119fb48806893b8e49e5e35ab58448e2342161933487a5ba9cbae8d95c656c68f453537458b450529c72c12cc77119327494e7aa1

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 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)
+* Drop explicit json dependency [#74](https://github.com/lfittl/pg_query/pull/74) [@yuki24](https://github.com/yuki24)
+
+
 ## 1.0.0     2017-10-31
 
 * IMPORTANT: Major version bump to indicate backwards incompatible parse tree change!

data/README.md

@@ -159,24 +159,7 @@ Currently tested and officially supported Ruby versions:
 
 ## Resources
 
-Products, tools and libraries built on pg_query:
-
-* [pganalyze](https://pganalyze.com/)
-* [hsql](https://github.com/JackDanger/hsql)
-* [sqlint](https://github.com/purcell/sqlint)
-* [pghero](https://github.com/ankane/pghero)
-* [dexter](https://github.com/ankane/dexter)
-
-pg_query for other languages:
-
-* C: [libpg_query](https://github.com/lfittl/libpg_query)
-* Go: [pg_query_go](https://github.com/lfittl/pg_query_go)
-* Javascript (Node): [pg-query-parser](https://github.com/zhm/pg-query-parser)
-* Javascript (Browser): [pg-query-emscripten](https://github.com/lfittl/pg-query-emscripten)
-* Python: [psqlparse](https://github.com/alculquicondor/psqlparse)
-
-Please feel free to [open a PR](https://github.com/lfittl/pg_query/pull/new/master) to add yours! :)
-
+See [libpg_query](https://github.com/lfittl/libpg_query/blob/10-latest/README.md#resources) for pg_query in other languages, as well as products/tools built on pg_query.
 
 ## Original Author
 

data/lib/pg_query/parse.rb

@@ -97,18 +97,23 @@ class PgQuery
             statements << statement[SELECT_STMT]['rarg'] if statement[SELECT_STMT]['rarg']
           end
 
-          # CTEs
-          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
+          if (with_clause = statement[SELECT_STMT]['withClause'])
+            cte_statements, cte_names = statements_and_cte_names_for_with_clause(with_clause)
+            @cte_names.concat(cte_names)
+            statements.concat(cte_statements)
           end
         # The following statements modify the contents of a table
         when INSERT_STMT, UPDATE_STMT, DELETE_STMT
-          from_clause_items << { item: statement.values[0]['relation'], type: :dml }
+          value = statement.values[0]
+          from_clause_items << { item: value['relation'], type: :dml }
+          statements << value['selectStmt'] if value.key?('selectStmt')
+          statements << value['withClause'] if value.key?('withClause')
+
+          if (with_clause = value['withClause'])
+            cte_statements, cte_names = statements_and_cte_names_for_with_clause(with_clause)
+            @cte_names.concat(cte_names)
+            statements.concat(cte_statements)
+          end
         when COPY_STMT
           from_clause_items << { item: statement.values[0]['relation'], type: :dml } if statement.values[0]['relation']
           statements << statement.values[0]['query']
@@ -221,5 +226,19 @@ class PgQuery
     end
 
     @tables.uniq!
+    @cte_names.uniq!
+  end
+
+  def statements_and_cte_names_for_with_clause(with_clause)
+    statements = []
+    cte_names = []
+
+    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
+
+    [statements, cte_names]
   end
 end

data/lib/pg_query/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_query
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Lukas Fittl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-31 00:00:00.000000000 Z
+date: 2018-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -66,26 +66,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.15.1
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.8'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.8'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
 description: Parses SQL queries using a copy of the PostgreSQL server query parser
 email: lukas@fittl.com
 executables: []
@@ -142,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: PostgreSQL query parsing and normalization library