db-charmer 1.6.9 → 1.6.10

data/CHANGES

@@ -1,3 +1,10 @@
+1.6.10 (2010-04-09):
+
+Multi-Db migrations changed. Now it is possible to call ActiveRecord::Migration.db_magic
+and specify default migration connection that would be used by all migrations without
+excplicitly switched connections.
+
+----------------------------------------------------------------------------------------
 1.6.9 (2010-04-08):
 
 Bugfix release: now DbCharmer works without Rails.

data/README.rdoc

@@ -127,6 +127,15 @@ Migration class example (global connection rewrite, multiple connections with th
     end
   end
 
+=== Default Migrations Connection
+
+Starting with DbCharmer version 1.6.10 it is possible to call <tt>ActiveRecord::Migration.db_magic</tt>
+and specify default migration connection that would be used by all migrations without
+excplicitly switched connections. If you want to switch your migration to the default ActiveRecord
+connection, just use <tt>db_magic :connection => :default</tt>.
+
+=== Invalid Connection Names Handling
+
 By default in all environments <tt>on_db</tt> and <tt>db_magic</tt> statments would fail if
 specified connection does not exist in database.yml. It is possible to make +DbCharmer+
 ignore such situations in non-production environments so that rails would create the tables

data/VERSION

@@ -1 +1 @@
-1.6.9
+1.6.10

data/db-charmer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{db-charmer}
-  s.version = "1.6.9"
+  s.version = "1.6.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexey Kovyrin"]
-  s.date = %q{2010-04-08}
+  s.date = %q{2010-04-09}
   s.description = %q{ActiveRecord Connections Magic (slaves, multiple connections, etc)}
   s.email = %q{alexey@kovyrin.net}
   s.extra_rdoc_files = [

data/lib/db_charmer.rb

@@ -2,6 +2,9 @@ module DbCharmer
   @@connections_should_exist = true
   mattr_accessor :connections_should_exist
 
+  @@env = defined?(RAILS_ENV) ? RAILS_ENV : 'development'
+  mattr_accessor :env
+
   def self.connections_should_exist?
     !! connections_should_exist
   end

data/lib/db_charmer/active_record_extensions.rb

@@ -4,10 +4,10 @@ module DbCharmer
 
       def establish_real_connection_if_exists(name, should_exist = false)
         name = name.to_s
-        config = configurations[RAILS_ENV][name]
+        config = configurations[DbCharmer.env][name]
         unless config
           if should_exist
-            raise ArgumentError, "Invalid connection name (does not exist in database.yml): #{RAILS_ENV}/#{name}"
+            raise ArgumentError, "Invalid connection name (does not exist in database.yml): #{DbCharmer.env}/#{name}"
           end
           return # No need to establish connection - they do not want us to
         end

data/lib/db_charmer/multi_db_migrations.rb

@@ -1,12 +1,31 @@
 module DbCharmer
   module MultiDbMigrations
-    @multi_db_names = nil
+    def self.extended(base)
+      class << base
+        alias_method_chain :migrate, :db_wrapper
+      end
+    end
+
+    @@multi_db_names = {}
+    def multi_db_names
+      puts "Retrieving connections for #{self.name}"
+      @@multi_db_names[self.name] || @@multi_db_names['ActiveRecord::Migration']
+    end
+
+    def multi_db_names=(names)
+      puts "Setting connections for #{self.name}"
+      @@multi_db_names[self.name] = names
+    end
 
     def migrate_with_db_wrapper(direction)
-      @multi_db_names.each do |multi_db_name|
-        on_db(multi_db_name) do
-          migrate_without_db_wrapper(direction)
+      if names = multi_db_names
+        names.each do |multi_db_name|
+          on_db(multi_db_name) do
+            migrate_without_db_wrapper(direction)
+          end
         end
+      else
+        migrate_without_db_wrapper(direction)
       end
     end
 
@@ -21,9 +40,8 @@ module DbCharmer
       yield
     ensure
       # Switch it back
-      announce "Checking all database connections"
       ActiveRecord::Base.verify_active_connections!
-      announce "Switching connection back to default"
+      announce "Switching connection back"
       ActiveRecord::Base.switch_connection_to(old_proxy)
     end
 
@@ -37,10 +55,7 @@ module DbCharmer
       raise ArgumentError, "No connection name - no magic!" unless conns.any?
 
       # Save connections
-      @multi_db_names = conns
-      class << self
-        alias_method_chain :migrate, :db_wrapper
-      end
+      self.multi_db_names = conns
     end
 
     # Return a list of connections to shards in a sharded connection

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 6
-  - 9
-  version: 1.6.9
+  - 10
+  version: 1.6.10
 platform: ruby
 authors: 
 - Alexey Kovyrin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-08 00:00:00 -04:00
+date: 2010-04-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency