multi-database-9000 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33e7b9669dcf781d0f6b56a0d2f51726024e66fd
-  data.tar.gz: d7c68fc744690834858eb9c9147fc8d9fcfdcd19
+  metadata.gz: 4aff0b568745cf031959322115ac1463cfb2be74
+  data.tar.gz: d887a6c2f4b7b980590b34768431561659fedf5c
 SHA512:
-  metadata.gz: b71aba44cf23dcc5eb977df8ed37e3b39707e1b588194c22a80c51107a0544f0429dcf80743ca69d58dc5ef919896ed5571b8220102deeb0bfa9dca3dcc0a8cb
-  data.tar.gz: f94f1891d8add9af32e25aab7857ea8df2b7ff0fc7631cc5d6802cee6ee6280d0f88ac3ad4aec0a25c0118e0781afb4cdecb7c4397edd52f990224965bd483ac
+  metadata.gz: 92dab60e53e359f0e57a8bc76defa34871324d563eaf7702100129cdb19048e3fa491d2563cca323783ce6c921d769ca1dd449a6c187446937ae3efd910c8782
+  data.tar.gz: 58b04be81ed4f4c5e19386f99cc333c574174f3e986d140c720fe05af6dc11453afef3bfca9b92458624c88edb0962dc9586ffa2ba64bee3b0bfba7a67ef342b

data/.gitignore

@@ -18,3 +18,4 @@
 mkmf.log
 .idea
 *.gem
+.rbx

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+ - "2.2.3"
+# uncomment this line if your project needs to run something other than `rake`:
+script: bundle exec cucumber

data/features/schema_tasks.feature

@@ -2,6 +2,7 @@ Feature: rake schema tasks should work for all databases in the app
 
   rake db:schema:load will load all the database schemas for the current environment
   rake db:schema:load DATABASE=widgets will load the schema for the widgets database
+  the schema_migrations table for each database should be correctly updated with migrations run on that database only
 
   Background:
     Given empty databases have been created for the app
@@ -108,3 +109,40 @@ Feature: rake schema tasks should work for all databases in the app
     And I should see the created 'accounts' table in the 'users' 'production' database
     And I should see the "title", "text" and "author" columns in the "posts" table in the "default" "production" database
     And I should see the "expense", "user_id" and "total" columns in the "accounts" table in the "users" "production" database
+
+  Scenario: checking the schema_migrations table after running rake db:schema:load
+    Given a multi database app and a schema file with:
+      """
+      ActiveRecord::Schema.define(version: 20151010142141) do
+
+        create_table "posts", force: :cascade do |t|
+          t.string  "title"
+          t.integer "text"
+          t.string  "author"
+        end
+
+      end
+      """
+    And a users_schema file with:
+      """
+      ActiveRecord::Schema.define(version: 20151010141234) do
+
+        create_table "accounts", force: :cascade do |t|
+          t.string  "expense"
+          t.integer "user_id"
+          t.string  "total"
+        end
+
+      end
+      """
+    And the following migrations have already been run:
+      | Migration                               | database|
+      | 20151008140000_create_posts_table.rb    | default |
+      | 20151009140000_update_posts_table.rb    | default |
+      | 20151010142141_change_posts_table.rb    | default |
+      | 20151008220000_create_accounts_table.rb | users   |
+      | 20151009220000_update_accounts_table.rb | users   |
+      | 20151010141234_change_gadgets_table.rb  | users   |
+    When I run `bundle exec rake db:schema:load` in the multi database app
+    Then the schema_migrations table for the "default" database should only contain version numbers from default database migrations
+    And the schema_migrations table for the "users" database should only contain version numbers from users database migrations

data/features/step_definitions/schema_steps.rb

@@ -1,3 +1,5 @@
+require 'pry'
+
 Given(/^a single database app and a schema file with:$/) do |schema_content|
   write_file "../../single-db-dummy/db/schema.rb", schema_content
 end
@@ -8,4 +10,26 @@ end
 
 Given(/^a (\w+) file with:$/) do |schema_name, schema_content|
   write_file "../../multi-db-dummy/db/#{schema_name}.rb", schema_content
+end
+
+Given(/^the following migrations have already been run:$/) do |table|
+  @version_numbers = Hash.new {|hash, missing_key| hash[missing_key] = []}
+  table.hashes.each{|migration| @version_numbers[migration["database"]] << migration["Migration"].match(/\d{14}/).to_s}
+  table.hashes.each do |migration|
+    write_multi_db_migration_for migration["database"], migration["Migration"]
+  end
+end
+
+Then(/^the schema_migrations table for the "([^"]*)" database should only contain version numbers from (?:\w+) database migrations$/) do |database|
+  if database == "default"
+    database_file = "development.sqlite3"
+  else
+    database_file = "#{database}_development.sqlite3"
+  end
+  SQLite3::Database.new("multi-db-dummy/db/#{database_file}") do |db|
+    versions_query = db.execute("SELECT version FROM schema_migrations ORDER BY version ASC")
+    puts versions_query
+    expect(versions_query.count).to eql @version_numbers[database].count
+    expect(versions_query.flatten).to match_array @version_numbers[database]
+  end
 end

data/lib/active_record_extensions/schema.rb

@@ -0,0 +1,19 @@
+module MultiDatabase9000
+  module ActiveRecordExtensions
+    module Schema
+      def define(info, &block) # :nodoc:
+        instance_eval(&block)
+
+        unless info[:version].blank?
+          initialize_schema_migrations_table
+          database_match = caller[1].match(/\/(\w+)_schema/)
+          if database_match.present?
+            connection.assume_migrated_upto_version(info[:version], MultiDatabase9000.migration_path_for(database_match.captures.first))
+          else
+            connection.assume_migrated_upto_version(info[:version], migrations_paths)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/multi-database-9000.rb

@@ -1,5 +1,6 @@
 require "multi-database-9000/version"
 require "multi-database-9000/multi-database-9000"
+require "active_record_extensions/schema"
 
 module MultiDatabase9000
   class Railtie < Rails::Railtie
@@ -7,5 +8,6 @@ module MultiDatabase9000
       load "multi-database-9000/tasks/multi-database-9000_tasks.rake"
     end
   end
-
 end
+
+ActiveRecord::Schema.prepend MultiDatabase9000::ActiveRecordExtensions::Schema

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

@@ -1,5 +1,5 @@
 module MultiDatabase9000
-  def self.maintain_all_test_schemas! # :nodoc:
+  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
@@ -9,4 +9,47 @@ module MultiDatabase9000
       ActiveRecord::Base.establish_connection(current_config)
     end
   end
+
+  def self.migration_path_for(database)
+    return nil unless database.present?
+    return ["db/#{database}_migrate"]
+  end
+
+  def database_connections(database: nil, rails_envs: nil)
+    connections = connections_for_environment(rails_envs)
+    if database.present?
+      connections.keep_if {|key, _| key.match Regexp.new(database)}
+    end
+    return connections
+  end
+
+  def connections_for_environment(rails_envs)
+    rails_envs = Array(rails_envs)
+    matcher = ->(key, value){rails_envs.any?{|env| key.match Regexp.new(env)}}
+    return ActiveRecord::Base.configurations.keep_if &matcher
+  end
+
+  def database_name(connection_key)
+    if connection_key.match /\w+_\w+/
+      return connection_key.split('_').first
+    else
+      return "default"
+    end
+  end
+
+  def migration_directory(connection_key)
+    if ['test','development','staging','cucumber','production'].include? connection_key
+      return "db/migrate/"
+    else
+      return "db/#{database_name(connection_key)}_migrate/"
+    end
+  end
+
+  def schema_file_name(connection_key)
+    if ['test','development','staging','cucumber','production'].include? connection_key
+      return "schema.rb"
+    else
+      return "#{database_name(connection_key)}_schema.rb"
+    end
+  end
 end

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

@@ -1,3 +1,3 @@
 module MultiDatabase9000
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/multi-db-dummy/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    multi-database-9000 (0.2.1)
+    multi-database-9000 (0.3.0)
       rails (>= 4.0)
 
 GEM

data/single-db-dummy/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    multi-database-9000 (0.1.0)
+    multi-database-9000 (0.3.0)
       rails (>= 4.0)
 
 GEM

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi-database-9000
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Mark Weston
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,6 +132,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -150,6 +151,7 @@ files:
 - features/support/env.rb
 - features/test_app.feature
 - features/test_migrations.feature
+- lib/active_record_extensions/schema.rb
 - lib/generators/multi_migration_generator.rb
 - lib/generators/templates/migration.rb
 - lib/multi-database-9000.rb