Include raw SQL queries when tracking

Author: lipanski

lib/sql_spy.rb

@@ -1,7 +1,7 @@
 module SqlSpy
   Query = Struct.new(:name, :sql, :duration) do
     def model_name
-      name.split.first
+      String(name).split.first
     end
 
     def select?
@@ -29,7 +29,7 @@ def queries
     end
 
     def call(_name, start, finish, _message_id, values)
-      return if values[:name].nil? || IGNORED_NAMES.include?(values[:name])
+      return if IGNORED_NAMES.include?(values[:name])
       return if values[:cached]
 
       queries << Query.new(values[:name], values[:sql], (finish - start) * 1000)

test/sql_spy_test.rb

@@ -61,11 +61,14 @@ def test_single_insert_query
     end
 
     assert_instance_of Array, queries
-    assert_equal 1, queries.count
+    assert_equal 3, queries.count
 
-    query = queries.first
-    assert query.insert?
-    assert_equal "User", query.model_name
+    assert_match %r{(begin transaction|begin)}i, queries[0].sql
+
+    assert queries[1].insert?
+    assert_equal "User", queries[1].model_name
+
+    assert_match %r{(end transaction|commit)}i, queries[2].sql
   end
 
   def test_single_update_query
@@ -124,4 +127,20 @@ def test_duration
     assert_instance_of Float, query.duration
     refute query.duration.zero?
   end
+
+  def test_execute_raw_sql
+    queries = SqlSpy.track do
+      ActiveRecord::Base.connection.execute("SELECT COUNT(*) FROM users;")
+    end
+
+    assert_equal 1, queries.count
+
+    query = queries.first
+    assert_equal "SELECT COUNT(*) FROM users;", query.sql
+    assert_nil query.model_name
+    assert query.select?
+    refute query.insert?
+    refute query.update?
+    refute query.delete?
+  end
 end