pghero 2.8.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e754becdd218d70d2134bdc75529f30be8b7e5158e2e22bd7e89b326353e12fa
-  data.tar.gz: dd0cd7fe10dc4201643f6c5f91d58060dbde78feab62ed98a6fb63ee17909666
+  metadata.gz: 3b4a596a016b5c33a99013818181ef967c26dcec092ee787b6629eac091ad121
+  data.tar.gz: 63fc2a949a62828a4537e54fb087c5a5b143bc88ab2753b4d777d4f793fb34ab
 SHA512:
-  metadata.gz: b2b4685743c02cdc9bcc4f98225d7cf1de1efb824a4bda52b02baac22a8aa852755d19f1b343856da334c8aa29e0c27ebe2827be9dd5b6e8d8930e31373da2a2
-  data.tar.gz: ba47c2eed1b11ba28ff2038b88543fd1c78a81c9188c96791dd8002c7928786fc178da9cc12cdf33c752e0243cacde2b1e569478150d988732f9042446be66dd
+  metadata.gz: beda0eb3c89c9a3928b9d998e7e9ae8858adda77873c9dc0d03836498a765c219815c6441b814d3b23da78f02f759d71737eb51236135cfb72c6372358043c37
+  data.tar.gz: 020de38d5b406ede495f44ad16ce6a5bde8ebb59c49027af4dc49afb88cf768bc20f3c064fe72070f2739eb2979d2b95d0f7cdbdd106851252e6c81f646d3e82

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.8.1 (2021-03-25)
+
+- Added support for pg_query 2
+
 ## 2.8.0 (2021-03-14)
 
 - No longer show walsender in long running queries

data/lib/pghero/methods/suggested_indexes.rb

@@ -201,36 +201,69 @@ module PgHero
         rescue PgQuery::ParseError
           return {error: "Parse error"}
         end
-        return {error: "Unknown structure"} unless tree.size == 1
-
-        tree = tree.first
-
-        # pg_query 1.0.0
-        tree = tree["RawStmt"]["stmt"] if tree["RawStmt"]
-
-        table = parse_table(tree) rescue nil
-        unless table
-          error =
-            case tree.keys.first
-            when "InsertStmt"
-              "INSERT statement"
-            when "VariableSetStmt"
-              "SET statement"
-            when "SelectStmt"
-              if (tree["SelectStmt"]["fromClause"].first["JoinExpr"] rescue false)
-                "JOIN not supported yet"
+
+        if PgQuery::VERSION.to_i >= 2
+          return {error: "Unknown structure"} unless tree.stmts.size == 1
+
+          tree = tree.stmts.first.stmt
+
+          table = parse_table_v2(tree) rescue nil
+          unless table
+            error =
+              case tree.node
+              when :insert_stmt
+                "INSERT statement"
+              when :variable_set_stmt
+                "SET statement"
+              when :select_stmt
+                if (tree.select_stmt.from_clause.first.join_expr rescue false)
+                  "JOIN not supported yet"
+                end
               end
-            end
-          return {error: error || "Unknown structure"}
-        end
+            return {error: error || "Unknown structure"}
+          end
+
+          select = tree[tree.node.to_s]
+          where = (select.where_clause ? parse_where_v2(select.where_clause) : []) rescue nil
+          return {error: "Unknown structure"} unless where
+
+          sort = (select.sort_clause ? parse_sort_v2(select.sort_clause) : []) rescue []
+
+          {table: table, where: where, sort: sort}
+        else
+          # TODO remove support for pg_query < 2 in PgHero 3.0
+
+          return {error: "Unknown structure"} unless tree.size == 1
+
+          tree = tree.first
+
+          # pg_query 1.0.0
+          tree = tree["RawStmt"]["stmt"] if tree["RawStmt"]
+
+          table = parse_table(tree) rescue nil
+          unless table
+            error =
+              case tree.keys.first
+              when "InsertStmt"
+                "INSERT statement"
+              when "VariableSetStmt"
+                "SET statement"
+              when "SelectStmt"
+                if (tree["SelectStmt"]["fromClause"].first["JoinExpr"] rescue false)
+                  "JOIN not supported yet"
+                end
+              end
+            return {error: error || "Unknown structure"}
+          end
 
-        select = tree.values.first
-        where = (select["whereClause"] ? parse_where(select["whereClause"]) : []) rescue nil
-        return {error: "Unknown structure"} unless where
+          select = tree.values.first
+          where = (select["whereClause"] ? parse_where(select["whereClause"]) : []) rescue nil
+          return {error: "Unknown structure"} unless where
 
-        sort = (select["sortClause"] ? parse_sort(select["sortClause"]) : []) rescue []
+          sort = (select["sortClause"] ? parse_sort(select["sortClause"]) : []) rescue []
 
-        {table: table, where: where, sort: sort}
+          {table: table, where: where, sort: sort}
+        end
       end
 
       # TODO better row estimation
@@ -267,6 +300,17 @@ module PgHero
         end
       end
 
+      def parse_table_v2(tree)
+        case tree.node
+        when :select_stmt
+          tree.select_stmt.from_clause.first.range_var.relname
+        when :delete_stmt
+          tree.delete_stmt.relation.relname
+        when :update_stmt
+          tree.update_stmt.relation.relname
+        end
+      end
+
       def parse_table(tree)
         case tree.keys.first
         when "SelectStmt"
@@ -278,6 +322,26 @@ module PgHero
         end
       end
 
+      # TODO capture values
+      def parse_where_v2(tree)
+        aexpr = tree.a_expr
+
+        if tree.bool_expr
+          if tree.bool_expr.boolop == :AND_EXPR
+            tree.bool_expr.args.flat_map { |v| parse_where_v2(v) }
+          else
+            raise "Not Implemented"
+          end
+        elsif aexpr && ["=", "<>", ">", ">=", "<", "<=", "~~", "~~*", "BETWEEN"].include?(aexpr.name.first.string.str)
+          [{column: aexpr.lexpr.column_ref.fields.last.string.str, op: aexpr.name.first.string.str}]
+        elsif tree.null_test
+          op = tree.null_test.nulltesttype == :IS_NOT_NULL ? "not_null" : "null"
+          [{column: tree.null_test.arg.column_ref.fields.last.string.str, op: op}]
+        else
+          raise "Not Implemented"
+        end
+      end
+
       # TODO capture values
       def parse_where(tree)
         aexpr = tree["A_Expr"]
@@ -298,6 +362,15 @@ module PgHero
         end
       end
 
+      def parse_sort_v2(sort_clause)
+        sort_clause.map do |v|
+          {
+            column: v.sort_by.node.column_ref.fields.last.string.str,
+            direction: v.sort_by.sortby_dir == :SORTBY_DESC ? "desc" : "asc"
+          }
+        end
+      end
+
       def parse_sort(sort_clause)
         sort_clause.map do |v|
           {

data/lib/pghero/version.rb

@@ -1,3 +1,3 @@
 module PgHero
-  VERSION = "2.8.0"
+  VERSION = "2.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pghero
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.8.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-14 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord