dbhijacker 0.4.7 → 0.5.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dbhijacker (0.4.6)
+    dbhijacker (0.4.7)
       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.7"
+  s.version = "0.5.0"
 
   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.rb

@@ -1,6 +1,7 @@
 require 'hijacker/active_record_ext'
 require 'active_record'
 require 'action_controller'
+require 'set'
 
 module Hijacker
   class UnparseableURL < StandardError;end
@@ -39,6 +40,10 @@ module Hijacker
       target_name = target_name.downcase
       sister_name = sister_name.downcase unless sister_name.nil?
 
+      unless database_exists?(target_name)
+        raise InvalidDatabase, 'database does not exist'
+      end
+
       if already_connected?(target_name, sister_name)
         return "Already connected to #{target_name}"
       end
@@ -77,6 +82,27 @@ module Hijacker
     end
   end
 
+  def self.database_exists?(database_name)
+    return true unless defined?(ActiveRecord::ConnectionAdapters::Mysql2Adapter) && ActiveRecord::Base.connection.is_a?(ActiveRecord::ConnectionAdapters::Mysql2Adapter)
+
+    @host_connections ||= {}
+    current_host = Host.connection.config['host']
+
+    begin
+      existing_dbs = Host.all.inject(Set.new) do |acc, host|
+        @host_connections[host.hostname] ||= Mysql2::Client.new(root_config.merge('host' => host.hostname))
+        @host_connections[host.hostname].query("SHOW DATABASES").each do |row|
+          acc << row['Database']
+        end
+        acc
+      end
+
+      existing_dbs.include?(database_name)
+    ensure
+      Host.establish_connection(root_config.merge('host' => current_host))
+    end
+  end
+
   # very small chance this will raise, but if it does, we will still handle it the
   # same as +Hijacker.connect+ so we don't lock up the app.
   # 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dbhijacker
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
-  - 7
-  version: 0.4.7
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Michael Xavier