sql-logging 3.0.8 → 3.0.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 75e58e5f101ae2526faab84ad37755deb83fb59b
+  data.tar.gz: 02d77d4c791c74056d557934c598afa32cb29d3d
+SHA512:
+  metadata.gz: 460b73d5ea7b42e0dcd296d8eabe3c18e5d9bf56850f500d2a41461c11e151e879621ece3cea4dda095beca6314d0f6ea41b0ae362a575172da70c12c53cc647
+  data.tar.gz: 469b866fbde399773894c8469229ed15d94c6dc06526588f96da2605d033b3ea8469cecac2bb55a811183100ae3ba7b5e0670213f280008f188f6c120d7760ba

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

@@ -0,0 +1,21 @@
+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)
+      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
+end

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

@@ -0,0 +1,15 @@
+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)
+    end
+    msec = elapsed.real * 1000
+    SqlLogging::Statistics.record_query(sql, args.first, msec, rows)
+    rows
+  end
+
+  alias_method_chain :select, :sql_logging
+end

data/lib/sql-logging/railtie.rb

@@ -7,6 +7,7 @@ module SqlLogging
     initializer 'sql_logging.load_adapter_extensions' do
       ActiveSupport.on_load(:active_record, :after => 'active_record.initialize_database') do
         adapter = ActiveRecord::Base.configurations[Rails.env]['adapter']
+        require "sql-logging/adapters/cache_extension"
         begin
           require "sql-logging/adapters/#{adapter}"
         rescue LoadError => e

data/lib/sql-logging/statistics.rb

@@ -12,6 +12,7 @@ module SqlLogging
     @@show_sql_backtrace = true
     @@show_top_sql_queries = :total_time
     @@top_sql_queries = 10
+    @@backtrace_cleaner = nil
   
     cattr_accessor :show_sql_backtrace, :top_sql_queries
   
@@ -34,10 +35,15 @@ module SqlLogging
       @@queries = @@bytes = @@rows = 0
       @@top_queries = {}
     end
-  
-    @@backtrace_cleaner = Rails.backtrace_cleaner.dup
-    @@backtrace_cleaner.add_silencer { |line| line =~ %r{sql-logging/lib} }
-  
+
+    def self.backtrace_cleaner
+      unless @@backtrace_cleaner
+        @@backtrace_cleaner = Rails.backtrace_cleaner.dup
+        @@backtrace_cleaner.add_silencer { |line| line =~ %r{sql-logging/lib} }
+      end
+      @@backtrace_cleaner
+    end
+
     def self.record_query(sql, name, msec, result)
       unless name.blank? || name =~ / Columns$/ || name == :skip_logging
         bytes = 0
@@ -53,6 +59,8 @@ module SqlLogging
           ntuples = 0
           if result.respond_to?(:length)
             ntuples = result.length
+          elsif result.respond_to?(:count)
+            ntuples = result.count
           elsif result.respond_to?(:num_rows)
             ntuples = result.num_rows
           elsif result.respond_to?(:ntuples)
@@ -64,7 +72,7 @@ module SqlLogging
         @@rows += ntuples
         @@bytes += bytes
 
-        backtrace = @@backtrace_cleaner.clean(caller).join("\n    ")
+        backtrace = backtrace_cleaner.clean(caller).join("\n    ")
         unless @@show_top_sql_queries == false
           key = "#{name}:#{backtrace}"
           unless query = @@top_queries[key]
@@ -74,34 +82,28 @@ module SqlLogging
           query.log_query(ntuples || 0, bytes || 0, msec)
         end
 
-        Rails.logger.debug "    #{helper.pluralize(ntuples, 'row')}, #{helper.number_to_human_size(bytes)}"
+        Rails.logger.debug "    #{ntuples} rows, #{bytes} bytes"
         Rails.logger.debug "    #{backtrace}" if @@show_sql_backtrace
       end
     end
   
     def self.log_report
-      Rails.logger.debug "SQL Logging: #{helper.pluralize(@@queries, 'statement')} executed, returning #{helper.number_to_human_size(@@bytes)}"
+      Rails.logger.debug "SQL Logging: #{@@queries} statements executed, returning #{@@bytes} bytes"
     
       unless @@show_top_sql_queries == false || @@top_queries.empty?
         Rails.logger.debug "Top #{@@top_sql_queries} SQL executions:"
         sorted_keys = @@top_queries.keys.sort_by { |k| @@top_queries[k][@@show_top_sql_queries] }.reverse
         sorted_keys.slice(0..@@top_sql_queries).each do |key|
           query = @@top_queries[key]
-          Rails.logger.debug "  Executed #{helper.pluralize(query.queries, 'time')} in #{'%.1f' % query.total_time}ms " +
+          Rails.logger.debug "  Executed #{query.queries} times in #{'%.1f' % query.total_time}ms " +
             "(#{'%.1f' % query.min_time}/#{'%.1f' % query.median_time}/#{'%.1f' % query.max_time}ms min/median/max), " +
-            "returning #{helper.pluralize(query.rows, 'row')} " +
-            "(#{helper.number_to_human_size(query.bytes)}):\n" +
+            "returning #{query.rows} rows" +
+            "(#{query.bytes} bytes):\n" +
             "    #{query.name}\n" +
             "    First exec was: #{query.sql}\n" +
             "    #{query.backtrace}"
         end
       end
     end
-  
-    protected
-  
-    def self.helper
-      Helper.instance
-    end
   end
 end

data/lib/sql-logging/version.rb

@@ -1,3 +1,3 @@
 module SqlLogging
-  VERSION = '3.0.8'
+  VERSION = '3.0.9'
 end

metadata

@@ -1,49 +1,52 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sql-logging
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
-  segments: 
-  - 3
-  - 0
-  - 8
-  version: 3.0.8
+version: !ruby/object:Gem::Version
+  version: 3.0.9
 platform: ruby
-authors: 
+authors:
 - Steve Madsen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-09-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
-  version_requirements: *id001
-description: Adds SQL analysis and debugging info to Rails 3 apps.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+description: |2
+      sql-logging adds functionality to Rails to debug query performance.
+      SQL triggered by your application includes a stack trace so you can determine
+      what code led to it, and a summary is emitted after each request to highlight
+      the most expensive queries executed.
 email: steve@lightyearsoftware.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
+- README.rdoc
+files:
 - README.rdoc
-files: 
+- lib/sql-logging.rb
+- lib/sql-logging/adapters/cache_extension.rb
 - lib/sql-logging/adapters/mysql.rb
 - lib/sql-logging/adapters/mysql2.rb
+- lib/sql-logging/adapters/pedant_mysql2.rb
 - lib/sql-logging/adapters/postgresql.rb
 - lib/sql-logging/adapters/sqlite.rb
 - lib/sql-logging/adapters/sqlite3.rb
@@ -52,40 +55,28 @@ 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: []
-
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: Adds SQL analysis and debugging info to Rails 3 apps.
+specification_version: 4
+summary: Adds SQL analysis and debugging info to Rails 3+ apps.
 test_files: []
-