Add compatibility with rails 5

basecamp · Jan 25, 2016 · 89d1a1e · 89d1a1e
1 parent 4d9c487
commit 89d1a1e
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/lib/marginalia.rb b/lib/marginalia.rb
@@ -56,6 +56,13 @@ def exec_query_with_marginalia(sql, name = 'SQL', binds = [])
       exec_query_without_marginalia(annotate_sql(sql), name, binds)
     end
 
+    if ActiveRecord::VERSION::MAJOR >= 5
+      def exec_query_with_marginalia(sql, name = 'SQL', binds = [], options = {})
+        options[:prepare] ||= false
+        exec_query_without_marginalia(annotate_sql(sql), name, binds, options)
+      end
+    end
+
     def exec_delete_with_marginalia(sql, name = 'SQL', binds = [])
       exec_delete_without_marginalia(annotate_sql(sql), name, binds)
     end