dbhijacker 0.4.5 → 0.4.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dbhijacker (0.4.5)
+    dbhijacker (0.4.6)
       rails (~> 2.3.14)
 
 GEM

data/hijacker.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.name = %q{dbhijacker}
   s.homepage = "https://github.com/crystalcommerce/hijacker"
-  s.version = "0.4.5"
+  s.version = "0.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Xavier", "Donald Plummer", "Woody Peterson"]

data/lib/hijacker/database.rb

@@ -1,4 +1,31 @@
+#Dummy exceptions if driver not loaded
+if !defined?(Mysql2)
+  module Mysql2
+    class Error < StandardError
+      attr_accessor :errno
+    end
+  end
+end
+
+if !defined?(Mysql)
+  module Mysql
+    class Error < StandardError
+      attr_accessor :errno
+    end
+  end
+end
+
 class Hijacker::Database < ActiveRecord::Base
+  module MissingDatabaseError
+    MYSQL_UNKNOWN_DB_ERRNO = 1049
+
+    def self.===(e)
+      return true if e.is_a?(Hijacker::InvalidDatabase)
+      (e.is_a?(Mysql::Error) || e.is_a?(Mysql2::Error)) &&
+        e.errno == MYSQL_UNKNOWN_DB_ERRNO
+    end
+  end
+
   establish_connection(Hijacker.root_config)
 
   has_many :aliases, :class_name => "Hijacker::Alias"
@@ -12,6 +39,7 @@ class Hijacker::Database < ActiveRecord::Base
 
   alias_attribute :name, :database
 
+
   def sister?
     master_id.present?
   end
@@ -79,7 +107,7 @@ class Hijacker::Database < ActiveRecord::Base
       sites.each do |db|
         begin
           Hijacker.connect_to_master(db)
-        rescue Hijacker::InvalidDatabase
+        rescue MissingDatabaseError
           next
         end
         yield db
@@ -87,7 +115,7 @@ class Hijacker::Database < ActiveRecord::Base
     ensure
       begin
         Hijacker.connect_to_master(original_database)
-      rescue Hijacker::InvalidDatabase
+      rescue MissingDatabaseError
       end
     end
   end
@@ -118,4 +146,9 @@ class Hijacker::Database < ActiveRecord::Base
     Hijacker::Database.connection.
       execute("DELETE FROM `disabled_databases` WHERE `database_name` = '#{database}'")
   end
+
+private
+  def self.catch_missing_database(&block)
+    block.call
+  end
 end

data/spec/hijacker/database_spec.rb

@@ -65,17 +65,33 @@ module Hijacker
       it "connects to each of the database and reconnects to the original" do
         original_db = Hijacker::Database.current
         Hijacker.should_receive(:connect).exactly(Database.all.size + 1).times
-        Database.connect_each do |db|
-          # noop
-        end
+        Database.connect_each {}
 
         Hijacker::Database.current.should == original_db
       end
 
       it "eats invalid database errors" do
-        Hijacker.stub!(:connect).and_raise(Hijacker::InvalidDatabase)
+        Hijacker.stub(:connect).and_raise(Hijacker::InvalidDatabase)
         expect { Database.connect_each {|db| } }.not_to raise_error
       end
+      
+      it "eats mysql-specific errors for missing databases" do
+        [Mysql::Error, Mysql2::Error].each do |klass|
+          exception = klass.new("Unknown database 'fake'")
+          exception.errno = 1049
+          Hijacker.stub(:connect).and_raise(exception)
+          expect { Database.connect_each {} }.to_not raise_error
+        end
+      end
+
+      it "does not eat unrelated mysql-specific databases" do
+        [Mysql::Error, Mysql2::Error].each do |klass|
+          exception = klass.new("WAT")
+          exception.errno = 2000
+          Hijacker.stub(:connect).and_raise(exception)
+          expect { Database.connect_each {} }.to raise_error(klass)
+        end
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dbhijacker
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 4
-  - 5
-  version: 0.4.5
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - Michael Xavier
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: One application, multiple client databases