fix logging of cached queries with binds in rails 5.1.5

fixes CORE-1082 Change-Id: Ib8c4dd84e47d0e127ad09cab6ed416f5a37abe3d Reviewed-on: https://gerrit.instructure.com/142668 Reviewed-by: Rob Orton <[email protected]> Tested-by: Jenkins Product-Review: Cody Cutrer <[email protected]> QA-Review: Cody Cutrer <[email protected]>
cchoi12 · Mar 6, 2018 · 7d99c14 · 7d99c14
1 parent e545c26
commit 7d99c14
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/lib/switchman/active_record/query_cache.rb b/lib/switchman/active_record/query_cache.rb
@@ -98,13 +98,17 @@ def cache_sql(sql, name, binds)
           @lock.synchronize do
             result =
                 if query_cache[sql].key?(binds)
+                  args = {
+                    sql: sql,
+                    binds: binds,
+                    name: name,
+                    connection_id: object_id,
+                    cached: true
+                  }
+                  args[:type_casted_binds] = -> { type_casted_binds(binds) } if ::Rails.version >= '5.1.5'
                   ::ActiveSupport::Notifications.instrument(
                       "sql.active_record",
-                      sql: sql,
-                      binds: binds,
-                      name: name,
-                      connection_id: object_id,
-                      cached: true,
+                      args
                   )
                   query_cache[sql][binds]
                 else

diff --git a/spec/lib/active_record/query_cache_spec.rb b/spec/lib/active_record/query_cache_spec.rb
@@ -27,6 +27,14 @@ module ActiveRecord
           @shard1.activate { User.connection.expects(:select).never }
           expect(@shard1.activate { User.all.to_a }).not_to eq @shard3.activate { User.all.to_a }
         end
+
+        it "doesn't break logging with binds" do
+          ::Rails.logger.expects(:error).never
+          User.connection.cache do
+            User.where(id: 1).take
+            User.where(id: 1).take
+          end
+        end
       else
         # call with two blocks. the first will run on a new thread, pausing at
         # the site of a "cc.call". the second will run on the original thread