db-charmer 1.6.1 → 1.6.2

data/CHANGES

@@ -1,3 +1,10 @@
+1.6.2 (2010-04-03):
+
+Bugfix release: Modified our stub connection used on sharded models to fail on db-calling
+methods only. Proxy the rest to a real shard connection. Another bug fixed in db_block_map
+sharding method: we didn't increment block counters when assigning blocks to shards.
+
+----------------------------------------------------------------------------------------
 1.6.1 (2010-03-31):
 
 Breaking change from now on all connection-switching methods (both in migrations and in

data/VERSION

@@ -1 +1 @@
-1.6.1
+1.6.2

data/db-charmer.gemspec

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

data/lib/db_charmer/active_record_extensions.rb

@@ -69,11 +69,12 @@ module DbCharmer
       @@db_charmer_database_remappings = Hash.new
       def db_charmer_remapped_connection
         return nil if (db_charmer_connection_level || 0) > 0
-        name = db_charmer_connection_proxy.db_charmer_connection_name if db_charmer_connection_proxy
-        name = (name || :master).to_sym
+        name = :master
+        proxy = db_charmer_connection_proxy
+        name = proxy.db_charmer_connection_name.to_sym if proxy
 
         remapped = @@db_charmer_database_remappings[name]
-        return DbCharmer::ConnectionFactory.connect(remapped, true) if remapped
+        remapped ? DbCharmer::ConnectionFactory.connect(remapped, true) : nil
       end
 
       def db_charmer_database_remappings

data/lib/db_charmer/connection_switch.rb

@@ -18,7 +18,7 @@ module DbCharmer
           return conn.db_charmer_connection_proxy
         end
 
-        if conn.kind_of?(ActiveRecord::ConnectionAdapters::AbstractAdapter)
+        if conn.kind_of?(ActiveRecord::ConnectionAdapters::AbstractAdapter) || conn.kind_of?(DbCharmer::StubConnection)
           return conn
         end
 
@@ -26,7 +26,13 @@ module DbCharmer
       end
 
       def switch_connection_to(conn, require_config_to_exist = true)
-        self.db_charmer_connection_proxy = coerce_to_connection_proxy(conn, require_config_to_exist)
+        new_conn = coerce_to_connection_proxy(conn, require_config_to_exist)
+
+        if db_charmer_connection_proxy.is_a?(DbCharmer::StubConnection)
+          db_charmer_connection_proxy.set_real_connection(new_conn)
+        end
+
+        self.db_charmer_connection_proxy = new_conn
         self.hijack_connection!
       end
     end

data/lib/db_charmer/sharding/method/db_block_map.rb

@@ -104,6 +104,9 @@ module DbCharmer
           SQL
           connection.execute(sql, "Allocate new block")
 
+          # Increment the blocks counter on the shard
+          ShardInfo.update_counters(shard.id, :blocks_count => +1)
+
           # Retry block search after creation
           block_for_key(key)
         end

data/lib/db_charmer/stub_connection.rb

@@ -1,9 +1,28 @@
+# This is a simple proxy class used as a default connection on sharded models
+#
+# The idea is to proxy all utility method calls to a real connection (set by
+# the +set_real_connection+ method when we switch shards) and fail on real
+# database querying calls forcing users to switch shard connections.
+#
 module DbCharmer
-  class StubConnection < ActiveRecord::ConnectionAdapters::AbstractAdapter
-    def initialize; end
+  class StubConnection
+    def set_real_connection(real_conn)
+      @real_conn = real_conn
+    end
+
+    def method_missing(meth, *args, &block)
+      # Fail on database statements
+      if ActiveRecord::ConnectionAdapters::DatabaseStatements.instance_methods.member?(meth.to_s)
+        raise ActiveRecord::ConnectionNotEstablished, "You have to switch connection on your model before using it!"
+      end
+
+      # Fail if no connection has been established yet
+      unless @real_conn
+        raise  ActiveRecord::ConnectionNotEstablished, "No real connection to proxy this method to!"
+      end
 
-    def method_missing(*arg)
-      raise ActiveRecord::ConnectionNotEstablished, "You have to switch connection on your model before using it"
+      # Proxy the call to our real connection target
+      @real_conn.__send__(meth, *args, &block)
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 6
-  - 1
-  version: 1.6.1
+  - 2
+  version: 1.6.2
 platform: ruby
 authors: 
 - Alexey Kovyrin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-31 00:00:00 -04:00
+date: 2010-04-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency