multi-database-9000 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c941f8e97928fc6d86a81f4b07b552e2d832516f
-  data.tar.gz: 114253f571df29eb17201088b45451a20606f10d
+  metadata.gz: a9a298c8a6e8b9f13f7693a6e095d599f887e727
+  data.tar.gz: 99c365b6c7cc7f69496a5fa1b284b637cb914f0c
 SHA512:
-  metadata.gz: 4ab393c65e0ce9ff0248fa8f58b8e1d608d9f91abf6de8c16f7a2c26f1de8bf4a487c9cda5cbc08ee2a725c863ea42192a68dac2cff16dc1e0781958534d1a89
-  data.tar.gz: d15b57dfe902c132efa8823add10f40aa3c1dbf83a411bf4703d92306246a3a00640f26ab8dc53ec9e3bb7e3308e1dba92865b9f598420d0eb71595f7720e526
+  metadata.gz: 9396097551db4202e83fd6239cc5dee511984a3e39b1c455237912f455d840fb0afc58fab81b3b1e777f1bc6534999148570ca0864e4263e76192249071473f0
+  data.tar.gz: 6e464b44a392dbd32383e007eed10e5e0bdcba847bd2b4dbd63f573625f0c27406deea76bfd16798a2669163f285434e850a870241bad7be0c9ea4b7d3d0021c

data/lib/multi-database-9000/multi-database-9000.rb

@@ -1,12 +1,14 @@
 module MultiDatabase9000
   def self.maintain_all_test_schemas!
-    # Roundrip to Rake to allow plugins to hook into database initialization.
-    FileUtils.cd Rails.root do
-      current_config = ActiveRecord::Base.connection_config
-      ActiveRecord::Base.clear_all_connections!
-      system("bin/rake db:test:prepare")
-      # Establish a new connection, the old database may be gone (db:test:prepare uses purge)
-      ActiveRecord::Base.establish_connection(current_config)
+    if ActiveRecord::Migrator.needs_migration? || !ActiveRecord::Migrator.any_migrations?
+      # Roundrip to Rake to allow plugins to hook into database initialization.
+      FileUtils.cd Rails.root do
+        current_config = ActiveRecord::Base.connection_config
+        ActiveRecord::Base.clear_all_connections!
+        system("bin/rake db:test:prepare")
+        # Establish a new connection, the old database may be gone (db:test:prepare uses purge)
+        ActiveRecord::Base.establish_connection(current_config)
+      end
     end
   end
 

data/lib/multi-database-9000/tasks/multi-database-9000_tasks.rake

@@ -1,4 +1,3 @@
-
 def database_connections(database: nil, rails_envs: nil)
   connections = connections_for_environment(rails_envs)
   if database.present?
@@ -7,9 +6,9 @@ def database_connections(database: nil, rails_envs: nil)
   return connections
 end
 
-def connections_for_environment(rails_envs)
+def connections_for_environment(rails_envs, include_default_env: true)
   rails_envs = Array(rails_envs)
-  matcher = ->(key, value){rails_envs.any?{|env| key.match Regexp.new(env)}}
+  matcher = ->(key, _){rails_envs.any?{|env| key.match(Regexp.new(env)) && (include_default_env || env != key)}}
   return ActiveRecord::Base.configurations.keep_if &matcher
 end
 
@@ -46,7 +45,7 @@ Rake::Task['db:migrate:status'].clear
 Rake::Task["db:test:load_schema"].enhance do
   begin
     should_reconnect = ActiveRecord::Base.connection_pool.active_connection?
-    connections_for_environment("test").each do |connection_key, connection|
+    connections_for_environment("test", include_default_env: false).each do |connection_key, connection|
       ActiveRecord::Tasks::DatabaseTasks.load_schema_for connection, :ruby, "db/#{schema_file_name(connection_key)}"
     end
   ensure

data/lib/multi-database-9000/version.rb

@@ -1,3 +1,3 @@
 module MultiDatabase9000
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/multi-db-dummy/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    multi-database-9000 (0.3.0)
+    multi-database-9000 (0.3.2)
       rails (>= 4.0)
 
 GEM
@@ -113,3 +113,6 @@ DEPENDENCIES
   pry
   rails (= 4.2.4)
   sqlite3
+
+BUNDLED WITH
+   1.11.2

data/single-db-dummy/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    multi-database-9000 (0.3.0)
+    multi-database-9000 (0.3.2)
       rails (>= 4.0)
 
 GEM
@@ -113,3 +113,6 @@ DEPENDENCIES
   pry
   rails (= 4.2.4)
   sqlite3
+
+BUNDLED WITH
+   1.11.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi-database-9000
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Mark Weston
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -285,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Enables Rails apps with multiple databases to handle migrations and rake