sql-logging 3.0.10 → 3.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9aac99fce0362d4f0b07f0035ec9266dc97e1599
-  data.tar.gz: 0c63f55de965eabc0216a84cad8f889eebbb9d58
+SHA256:
+  metadata.gz: f2cb4888d60283e8bb85c45f6783506ee37706d0172f170dfcac727075c25d53
+  data.tar.gz: 2c5039a94905ef23aaa3f0b4c089712eae95a8618159695e79b2eba7173a4614
 SHA512:
-  metadata.gz: f135c72dd4b332fcf9e2f08b0ac4fb167090003d1a22ff161c0925f4d9910f973f51a0774e50426d022a3784eb32177ce749f181a7b84468e6e6afe433310335
-  data.tar.gz: 688b7ddf99783b4411d74ea76360775509871654a04e9dbf402fa8afad65a552112e4358f92562989a6f76699207c2be47b6e9b36682618d7b848040d99639b0
+  metadata.gz: 1ba76d7926d1d6f7dee3019ed9ade10ac0c261a7986d6c6476283a12750e46082c6324d41fb49b1b8c01c95b574dfef2fd31a317f07f012ea98bc510edf70b91
+  data.tar.gz: 0602bf7b0917bb47cd4d20c5bd320574d0f6b39fe0381716f5c46ec6e98e64390bebdc7a78f39324ef0d726d42d07aa65283ec638ac2f679210311eae5bb6902

data/README.rdoc

@@ -7,7 +7,7 @@ is a repackaging of the old SQL Logging plug-in for Rails 2.x. It, in turn,
 was based on ideas and plug-ins from Adam Doppelt's (standard logging
 enhancements) and Nathaniel Talbott (the QueryTrace plug-in).
 
-This gem is for Rails 3+ only. It supports MySQL (including the mysql2 gem),
+This gem is for Rails 4+ only. It supports MySQL (including the mysql2 gem),
 PostgreSQL and SQLite.
 
 == Usage

data/lib/sql-logging/adapters/cache_extension.rb

@@ -1,21 +1,25 @@
 require 'active_record/connection_adapters/abstract/query_cache'
 
 module ActiveRecord::ConnectionAdapters::QueryCache
-  private
-
-  def cache_sql_with_sql_logging(sql, binds, &blk)
-    if @query_cache.has_key?(sql)
-      rows = nil
-      elapsed = Benchmark.measure do
-        rows = cache_sql_without_sql_logging(sql, binds, &blk)
+  module CacheSQLWithSqlLogging
+    def cache_sql(sql, binds, &blk)
+      if @query_cache.has_key?(sql)
+        rows = nil
+        elapsed = Benchmark.measure do
+          rows = super(sql, binds, &blk)
+        end
+        msec = elapsed.real * 1000
+        SqlLogging::Statistics.record_query(sql, "CACHE", msec, rows)
+        rows
+      else
+        super(sql, binds, &blk)
       end
-      msec = elapsed.real * 1000
-      SqlLogging::Statistics.record_query(sql, "CACHE", msec, rows)
-      rows
-    else
-      cache_sql_without_sql_logging(sql, binds, &blk)
     end
   end
 
-  alias_method_chain :cache_sql, :sql_logging
+  private
+
+  def self.included(klass)
+    klass.prepend CacheSQLWithSqlLogging
+  end
 end

data/lib/sql-logging/adapters/mysql.rb

@@ -1,15 +1,19 @@
 require 'active_record/connection_adapters/mysql_adapter'
 
-class ActiveRecord::ConnectionAdapters::MysqlAdapter
-  def select_with_sql_logging(sql, *args)
-    rows = nil
-    elapsed = Benchmark.measure do
-      rows = select_without_sql_logging(sql, *args)
+module ActiveRecord::ConnectionAdapters
+  module SelectWithSqlLogging
+    def select(sql, *args)
+      rows = nil
+      elapsed = Benchmark.measure do
+        rows = super(sql, *args)
+      end
+      msec = elapsed.real * 1000
+      SqlLogging::Statistics.record_query(sql, args.first, msec, rows)
+      rows
     end
-    msec = elapsed.real * 1000
-    SqlLogging::Statistics.record_query(sql, args.first, msec, rows)
-    rows
   end
-  
-  alias_method_chain :select, :sql_logging
+
+  class MysqlAdapter
+    prepend SelectWithSqlLogging
+  end
 end

data/lib/sql-logging/adapters/mysql2.rb

@@ -1,15 +1,19 @@
 require 'active_record/connection_adapters/mysql2_adapter'
 
-class ActiveRecord::ConnectionAdapters::Mysql2Adapter
-  def select_with_sql_logging(sql, *args)
-    rows = nil
-    elapsed = Benchmark.measure do
-      rows = select_without_sql_logging(sql, *args)
+module ActiveRecord::ConnectionAdapters
+  module SelectWithSqlLogging
+    def select(sql, *args)
+      rows = nil
+      elapsed = Benchmark.measure do
+        rows = super(sql, *args)
+      end
+      msec = elapsed.real * 1000
+      SqlLogging::Statistics.record_query(sql, args.first, msec, rows)
+      rows
     end
-    msec = elapsed.real * 1000
-    SqlLogging::Statistics.record_query(sql, args.first, msec, rows)
-    rows
   end
-  
-  alias_method_chain :select, :sql_logging
+
+  class Mysql2Adapter
+    prepend SelectWithSqlLogging
+  end
 end

data/lib/sql-logging/adapters/pedant_mysql2.rb

@@ -1,15 +1,19 @@
 require 'active_record/connection_adapters/pedant_mysql2_adapter'
 
-class ActiveRecord::ConnectionAdapters::Mysql2Adapter
-  def select_with_sql_logging(sql, *args)
-    rows = nil
-    elapsed = Benchmark.measure do
-      rows = select_without_sql_logging(sql, *args)
+module ActiveRecord::ConnectionAdapters
+  module SelectWithSqlLogging
+    def select(sql, *args)
+      rows = nil
+      elapsed = Benchmark.measure do
+        rows = super(sql, *args)
+      end
+      msec = elapsed.real * 1000
+      SqlLogging::Statistics.record_query(sql, args.first, msec, rows)
+      rows
     end
-    msec = elapsed.real * 1000
-    SqlLogging::Statistics.record_query(sql, args.first, msec, rows)
-    rows
   end
 
-  alias_method_chain :select, :sql_logging
+  class Mysql2Adapter
+    prepend SelectWithSqlLogging
+  end
 end

data/lib/sql-logging/adapters/postgresql.rb

@@ -1,45 +1,53 @@
 require 'active_record/connection_adapters/postgresql_adapter'
 
-class ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
-  def execute_with_sql_logging(sql, *args)
-    result = nil
-    elapsed = Benchmark.measure do
-      result = execute_without_sql_logging(sql, *args)
+module ActiveRecord::ConnectionAdapters
+  module ExecuteWithSqlLogging
+    def execute(sql, *args)
+      result = nil
+      elapsed = Benchmark.measure do
+        result = super(sql, *args)
+      end
+      msec = elapsed.real * 1000
+      if result.respond_to?(:rows)
+        SqlLogging::Statistics.record_query(sql, args.first, msec, result.rows)
+      else
+        SqlLogging::Statistics.record_query(sql, args.first, msec, result)
+      end
+      result
     end
-    msec = elapsed.real * 1000
-    if result.respond_to?(:rows)
-      SqlLogging::Statistics.record_query(sql, args.first, msec, result.rows)
-    else
-      SqlLogging::Statistics.record_query(sql, args.first, msec, result)
-    end
-    result
   end
-  
-  def exec_query_with_sql_logging(sql, *args)
-    result = nil
-    elapsed = Benchmark.measure do
-      result = exec_query_without_sql_logging(sql, *args)
+
+  module ExecQueryWithSqlLogging
+    def exec_query(sql, *args)
+      result = nil
+      elapsed = Benchmark.measure do
+        result = super(sql, *args)
+      end
+      msec = elapsed.real * 1000
+      if result.respond_to?(:rows)
+        SqlLogging::Statistics.record_query(sql, args.first, msec, result.rows)
+      else
+        SqlLogging::Statistics.record_query(sql, args.first, msec, result)
+      end
+      result
     end
-    msec = elapsed.real * 1000
-    if result.respond_to?(:rows)
-      SqlLogging::Statistics.record_query(sql, args.first, msec, result.rows)
-    else
+  end
+
+  module ExecDeleteWithSqlLogging
+    def exec_delete(sql, *args)
+      result = nil
+      elapsed = Benchmark.measure do
+        result = super(sql, *args)
+      end
+      msec = elapsed.real * 1000
       SqlLogging::Statistics.record_query(sql, args.first, msec, result)
+      result
     end
-    result
   end
-  
-  def exec_delete_with_sql_logging(sql, *args)
-    result = nil
-    elapsed = Benchmark.measure do
-      result = exec_delete_without_sql_logging(sql, *args)
-    end
-    msec = elapsed.real * 1000
-    SqlLogging::Statistics.record_query(sql, args.first, msec, result)
-    result
+
+  class PostgreSQLAdapter
+    prepend ExecuteWithSqlLogging
+    prepend ExecQueryWithSqlLogging
+    prepend ExecDeleteWithSqlLogging
   end
-  
-  alias_method_chain :execute, :sql_logging
-  alias_method_chain :exec_query, :sql_logging
-  alias_method_chain :exec_delete, :sql_logging
 end

data/lib/sql-logging/adapters/sqlite.rb

@@ -1,13 +1,17 @@
-class ActiveRecord::ConnectionAdapters::SQLiteAdapter
-  def execute_with_sql_logging(sql, name = nil)
-    res = nil
-    elapsed = Benchmark.measure do
-      res = execute_without_sql_logging(sql, name)
+module ActiveRecord::ConnectionAdapters
+  module ExecuteWithSqlLogging
+    def execute(sql, name = nil)
+      res = nil
+      elapsed = Benchmark.measure do
+        res = super(sql, name)
+      end
+      msec = elapsed.real * 1000
+      SqlLogging::Statistics.record_query(sql, name, msec, res)
+      res
     end
-    msec = elapsed.real * 1000
-    SqlLogging::Statistics.record_query(sql, name, msec, res)
-    res
   end
 
-  alias_method_chain :execute, :sql_logging
+  class SQLiteAdapter
+    prepend ExecuteWithSqlLogging
+  end
 end

data/lib/sql-logging/configuration.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module SqlLogging
   class Configuration
     DEFAULTS = {
@@ -9,7 +10,7 @@ module SqlLogging
       logger: nil
     }.freeze
 
-    attr_writer(*DEFAULTS.keys - [:show_top_sql_queries=])
+    attr_writer(*DEFAULTS.keys - [:show_top_sql_queries])
     attr_reader(*DEFAULTS.keys - %i(logger backtrace_cleaner))
 
     def initialize

data/lib/sql-logging/railtie.rb

@@ -6,12 +6,12 @@ module SqlLogging
         require "sql-logging/adapters/cache_extension"
         begin
           require "sql-logging/adapters/#{adapter}"
-        rescue LoadError => e
+        rescue LoadError
           Rails.logger.warn "SQL Logging extensions are not available for #{adapter}; functionality will be limited"
         end
       end
     end
-    
+
     initializer 'sql_logging.reset_statistics' do
       ActiveSupport.on_load(:active_record) do
         ActionDispatch::Callbacks.before do

data/lib/sql-logging/statistics.rb

@@ -1,3 +1,5 @@
+require 'forwardable'
+
 module SqlLogging
   class Statistics
     class Data

data/lib/sql-logging/version.rb

@@ -1,3 +1,3 @@
 module SqlLogging
-  VERSION = '3.0.10'
+  VERSION = '3.0.11'
 end

metadata

@@ -1,64 +1,66 @@
 --- !ruby/object:Gem::Specification
 name: sql-logging
 version: !ruby/object:Gem::Version
-  version: 3.0.10
+  version: 3.0.11
 platform: ruby
 authors:
 - Steve Madsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-01 00:00:00.000000000 Z
+date: 2018-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 5.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.11.0
-description: Adds SQL analysis and debugging info to Rails 3 apps.
+        version: 5.8.3
+description: Adds SQL analysis and debugging info to Rails applications.
 email: steve@lightyearsoftware.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
+- README.rdoc
+- lib/sql-logging.rb
 - lib/sql-logging/adapters/cache_extension.rb
 - lib/sql-logging/adapters/mysql.rb
 - lib/sql-logging/adapters/mysql2.rb
@@ -73,8 +75,6 @@ files:
 - lib/sql-logging/railtie.rb
 - lib/sql-logging/statistics.rb
 - lib/sql-logging/version.rb
-- lib/sql-logging.rb
-- README.rdoc
 homepage: http://github.com/lightyear/sql-logging
 licenses: []
 metadata: {}
@@ -84,18 +84,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
-summary: Adds SQL analysis and debugging info to Rails 3 apps.
+summary: SQL analysis and debugging info for Rails
 test_files: []