db-charmer 1.5.0 → 1.5.1

data/CHANGES

@@ -1,3 +1,15 @@
+1.5.0 -> 1.5.1:
+
+In this version we've added support for connection names logging in Rails queries log.
+New log records have [connection_name] prefix for all queries that are executed on
+non-standard connections:
+
+[logs]   LogRecord Columns (1.1ms)   SHOW FIELDS FROM `log_records`
+[logs]   User Delete all (0.1ms)   DELETE FROM `users`
+[slave01]   User Load (0.2ms)   SELECT * FROM `users` WHERE (`users`.`login` = 'foo')
+
+----------------------------------------------------------------------------------------
+
 1.4.6 -> 1.5.0:
 
 Major change in this version of DbCharmer is association preload support. For example,

data/VERSION

@@ -1 +1 @@
-1.5.0
+1.5.1

data/db-charmer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{db-charmer}
-  s.version = "1.5.0"
+  s.version = "1.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexey Kovyrin"]
-  s.date = %q{2010-03-05}
+  s.date = %q{2010-03-06}
   s.description = %q{ActiveRecord Connections Magic (slaves, multiple connections, etc)}
   s.email = %q{alexey@kovyrin.net}
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
      "db-charmer.gemspec",
      "init.rb",
      "lib/db_charmer.rb",
+     "lib/db_charmer/abstract_adapter_extensions.rb",
      "lib/db_charmer/active_record_extensions.rb",
      "lib/db_charmer/association_preload.rb",
      "lib/db_charmer/connection_factory.rb",

data/lib/db_charmer.rb

@@ -37,6 +37,8 @@ require 'blankslate'
 #puts "Extending AR..."
 
 require 'db_charmer/active_record_extensions'
+require 'db_charmer/abstract_adapter_extensions'
+
 require 'db_charmer/connection_factory'
 require 'db_charmer/connection_proxy'
 require 'db_charmer/connection_switch'
@@ -45,6 +47,7 @@ require 'db_charmer/multi_db_proxy'
 
 # Enable misc AR extensions
 ActiveRecord::Base.extend(DbCharmer::ActiveRecordExtensions::ClassMethods)
+ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:include, DbCharmer::AbstractAdapterExtensions::InstanceMethods)
 
 # Enable connections switching in AR
 ActiveRecord::Base.extend(DbCharmer::ConnectionSwitch::ClassMethods)

data/lib/db_charmer/abstract_adapter_extensions.rb

@@ -0,0 +1,22 @@
+module DbCharmer
+  module AbstractAdapterExtensions
+    module InstanceMethods
+      def self.included(base)
+        base.alias_method_chain :format_log_entry, :connection_name
+      end
+
+      def connection_name
+        @connection_name
+      end
+
+      def connection_name=(name)
+        @connection_name = name
+      end
+
+      def format_log_entry_with_connection_name(message, dump = nil)
+        msg = connection_name ? "[#{connection_name}] " : ''
+        msg << format_log_entry_without_connection_name(message, dump)
+      end
+    end
+  end
+end

data/lib/db_charmer/active_record_extensions.rb

@@ -8,6 +8,7 @@ module DbCharmer
           raise ArgumentError, "Invalid connection name (does not exist in database.yml): #{RAILS_ENV}/#{name}"
         end
         establish_connection(config) if config
+        connection.connection_name = name.to_s
       end
 
       #-----------------------------------------------------------------------------

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 0
-  version: 1.5.0
+  - 1
+  version: 1.5.1
 platform: ruby
 authors: 
 - Alexey Kovyrin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-05 00:00:00 -05:00
+date: 2010-03-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,6 +63,7 @@ files:
 - db-charmer.gemspec
 - init.rb
 - lib/db_charmer.rb
+- lib/db_charmer/abstract_adapter_extensions.rb
 - lib/db_charmer/active_record_extensions.rb
 - lib/db_charmer/association_preload.rb
 - lib/db_charmer/connection_factory.rb