@@ -3,7 +3,6 @@ require 'benchmark' if defined?(Rails::VERSION::STRING) && Rails::VERSION::STRING < "1.2.0" $stderr.puts "The QueryStats plugin requires Rails >= 1.2.0" elsif !ActionController::Base.included_modules.include?(QueryStats::Labeler) - p ActiveRecord::Base.connection.class ActiveRecord::Base.connection.class.send :include, QueryStats::Recorder ActionController::Base.send :include, QueryStats::Labeler ActionController::Base.send :include, QueryStats::Logger init.rb @@ -38,6 +38,7 @@ module QueryStats # Add data to the array of stats - should only be called by the active record connection adapter. def add(seconds, query, name = nil, *args) #:nodoc: @stats.shift if @stats.size >= LIMIT + return if @ignore_types.include?(@query_type) @stats << { :sql => query, :name => name, lib/query_stats/holder.rb @@ -1,18 +1,9 @@ -sqlite: - :adapter: sqlite - :dbfile: plugin.sqlite.db sqlite3: adapter: sqlite3 dbfile: ":memory:" -postgresql: - :adapter: postgresql - :username: postgres - :password: postgres - :database: plugin_test - :min_messages: ERROR mysql: :adapter: mysql :host: localhost - :username: rails + :username: root :password: - :database: plugin_test \ No newline at end of file + :database: plugin_test test/database.yml @@ -1,5 +1,5 @@ ActiveRecord::Schema.define(:version => 1) do - create_table :people do |t| + create_table :people, :force => true do |t| t.column :name, :string end end \ No newline at end of file test/schema.rb @@ -7,8 +7,6 @@ gem "rails", ENV["RAILS_VERSION"] || "1.2.6" require "rails/version" require 'active_record' require 'active_record/fixtures' -# require 'active_support/binding_of_caller' -# require 'active_support/breakpoint' require 'action_controller' require 'action_controller/test_process' test/test_helper.rb a004058afe644736916dc8bf26fe88bfe13971d4 Dan Manges daniel.manges@gmail.com http://github.com/dan-manges/query_stats/commit/98eb9d1d69e03cb6465c93c0adb28762d5fd8511 98eb9d1d69e03cb6465c93c0adb28762d5fd8511 2008-07-12T15:36:33-07:00 2008-07-12T15:36:33-07:00 passing tests with mysql adapter on rails 2.1 7a65f56eca6f6aba04a179ada99a576466de6b4a Dan Manges daniel.manges@gmail.com