Fix bad merge

instacart · Jan 19, 2024 · 49d6397 · 49d6397
1 parent d0bf6d6
commit 49d6397
Show file tree

Hide file tree

Showing 11 changed files with 440 additions and 85 deletions.
diff --git a/app/assets/javascripts/pghero/highlight.min.js b/app/assets/javascripts/pghero/highlight.min.js
diff --git a/app/assets/javascripts/pghero/highlight.pack.js b/app/assets/javascripts/pghero/highlight.pack.js
diff --git a/gemfiles/activerecord50.gemfile b/gemfiles/activerecord50.gemfile
diff --git a/gemfiles/activerecord51.gemfile b/gemfiles/activerecord51.gemfile
diff --git a/gemfiles/activerecord52.gemfile b/gemfiles/activerecord52.gemfile
diff --git a/lib/pghero/methods/basic.rb b/lib/pghero/methods/basic.rb
@@ -120,10 +120,6 @@ def add_source(sql)
         "#{sql} /*pghero*/"
       end
 
-      def add_source(sql)
-        "#{sql} /*pghero*/"
-      end
-
       def quote(value)
         connection.quote(value)
       end

diff --git a/lib/pghero/methods/space.rb b/lib/pghero/methods/space.rb
@@ -139,10 +139,6 @@ def clean_space_stats(before: nil)
         PgHero::SpaceStats.where(database: id).where("captured_at < ?", before).delete_all
       end
 
-      def clean_space_stats
-        PgHero::SpaceStats.where(database: id).where("captured_at < ?", 90.days.ago).delete_all
-      end
-
       def space_stats_enabled?
         table_exists?("pghero_space_stats")
       end

diff --git a/lib/pghero/methods/suggested_indexes.rb b/lib/pghero/methods/suggested_indexes.rb
@@ -266,17 +266,6 @@ def row_estimates(stats, total_rows, rows_left, op)
         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.node
         when :select_stmt
@@ -288,26 +277,6 @@ def parse_table(tree)
         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

diff --git a/test/controller_test.rb b/test/controller_test.rb
@@ -161,7 +161,6 @@ def test_explain_visualize_normalized
     end
   end
 
->>>>>>> master
   def test_tune
     get pg_hero.tune_path
     assert_response :success

diff --git a/test/indexes_test.rb b/test/indexes_test.rb
@@ -27,12 +27,8 @@ def test_reset_stats
   end
 
   def test_last_stats_reset_time
-<<<<<<< HEAD
-    assert database.last_stats_reset_time
-=======
     database.last_stats_reset_time
     assert true
->>>>>>> master
   end
 
   def test_invalid_indexes

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -31,10 +31,7 @@ def explain_normalized?
 
 Combustion.path = "test/internal"
 Combustion.initialize! :active_record, :action_controller do
-<<<<<<< HEAD
-=======
   config.load_defaults Rails::VERSION::STRING.to_f
->>>>>>> master
   config.action_controller.logger = logger
   config.active_record.logger = logger
 end