db-charmer 1.6.2 → 1.6.3

data/CHANGES

@@ -1,3 +1,9 @@
+1.6.3 (2010-04-03):
+
+Bugfix release: Modified stub connection initialization code to set default connections
+for sharded models using shards enumeration or default shard features of sharding methods.
+
+----------------------------------------------------------------------------------------
 1.6.2 (2010-04-03):
 
 Bugfix release: Modified our stub connection used on sharded models to fail on db-calling

data/VERSION

@@ -1 +1 @@
-1.6.2
+1.6.3

data/db-charmer.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{db-charmer}
-  s.version = "1.6.2"
+  s.version = "1.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexey Kovyrin"]

data/lib/db_charmer/db_magic.rb

@@ -23,7 +23,20 @@ module DbCharmer
         if opt[:sharded]
           raise ArgumentError, "Can't use sharding on a model with slaves!" if opt[:slaves].any?
           setup_sharding_magic(opt[:sharded])
-          setup_connection_magic(DbCharmer::StubConnection.new)
+
+          # If method supports shards enumeration, get the first shard
+          conns = sharded_connection.shard_connections || []
+          real_conn = conns.first
+
+          # If connection we do not have real connection yet, try to use the default one
+          real_conn ||= sharded_connection.sharder.shard_for_key(:default) if sharded_connection.support_default_shard?
+
+          # Create stub connection
+          real_conn = coerce_to_connection_proxy(real_conn, DbCharmer.connections_should_exist?) if real_conn
+          stub_conn = DbCharmer::StubConnection.new(real_conn)
+
+          # ... and set it as the default one for this model
+          setup_connection_magic(stub_conn)
         end
       end
 

data/lib/db_charmer/stub_connection.rb

@@ -6,6 +6,10 @@
 #
 module DbCharmer
   class StubConnection
+    def initialize(real_conn = nil)
+      @real_conn = real_conn
+    end
+
     def set_real_connection(real_conn)
       @real_conn = real_conn
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 6
-  - 2
-  version: 1.6.2
+  - 3
+  version: 1.6.3
 platform: ruby
 authors: 
 - Alexey Kovyrin