Raise ActiveRecord::StatementInvalid for Rails 3.1 and below

johnewart · Aug 3, 2014 · e80c0df · e80c0df
1 parent 377c797
commit e80c0df
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/lib/pghero.rb b/lib/pghero.rb
@@ -235,9 +235,13 @@ def rds?
     end
 
     def explain(sql)
+      sql = sql.to_s
       explanation = nil
       # use transaction for safety
       Connection.transaction do
+        if ActiveRecord::VERSION::MAJOR == 3 and ActiveRecord::VERSION::MINOR < 2 and sql.include?(";")
+          raise ActiveRecord::StatementInvalid
+        end
         explanation = select_all("EXPLAIN #{sql}").map{|v| v["QUERY PLAN"] }.join("\n")
         raise ActiveRecord::Rollback
       end

diff --git a/test/pghero_test.rb b/test/pghero_test.rb
@@ -14,12 +14,7 @@ def test_explain
 
   def test_explain_multiple_statements
     User.create!
-    if ActiveRecord::VERSION::MAJOR == 3 and ActiveRecord::VERSION::MINOR < 2
-      PgHero.explain("ANALYZE DELETE FROM users; DELETE FROM users; COMMIT")
-      assert_equal 1, User.count
-    else
-      assert_raises(ActiveRecord::StatementInvalid){ PgHero.explain("ANALYZE DELETE FROM users; DELETE FROM users; COMMIT") }
-    end
+    assert_raises(ActiveRecord::StatementInvalid){ PgHero.explain("ANALYZE DELETE FROM users; DELETE FROM users; COMMIT") }
   end
 
 end