multi-database-9000 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1e52410b94cd1ebbf0ba4bff0d6454877eb3089
-  data.tar.gz: c8acc0fbde4701940948b4cfde04da7c46a17c99
+  metadata.gz: 33e7b9669dcf781d0f6b56a0d2f51726024e66fd
+  data.tar.gz: d7c68fc744690834858eb9c9147fc8d9fcfdcd19
 SHA512:
-  metadata.gz: 386f8b2b90cda2dffe2775e08c512317459a1661e6e2ad77609f2fe21555fa27936e8510dce32bd5a76ae56c00a3d8fdd3ef700541463c4f6e27e7aa0a107b8b
-  data.tar.gz: 819a923c069d2d92e2596a8cacf8e21fd050914f503d5872dd885c2422c885c4a8ba5ae0d055b32c4a5e9c66a08ea3bcb72f62a4ce2521bd5dd270e01e0e9846
+  metadata.gz: b71aba44cf23dcc5eb977df8ed37e3b39707e1b588194c22a80c51107a0544f0429dcf80743ca69d58dc5ef919896ed5571b8220102deeb0bfa9dca3dcc0a8cb
+  data.tar.gz: f94f1891d8add9af32e25aab7857ea8df2b7ff0fc7631cc5d6802cee6ee6280d0f88ac3ad4aec0a25c0118e0781afb4cdecb7c4397edd52f990224965bd483ac

data/features/development_migrations.feature

@@ -57,16 +57,15 @@ Feature: Migrations run for all databases in the app
     And the file "../../multi-db-dummy/db/schema.rb" should not exist
     And the version in the users schema file should be updated
 
-  Scenario: Specifying the database and the environment variables to migrate to
+  Scenario: Specifying the database and the Rails environment to migrate to
     Given I set the environment variables to:
       | variable           | value      |
       | RAILS_ENV          | production |
     And there is a migration for the widgets database in a multi database app
     When I run `bundle exec rake db:migrate DATABASE=widgets` in a multi database app
-    Then the file "../../multi-db-dummy/db/widgets_production.sqlite3" should exist
-    And the file "../../multi-db-dummy/db/production.sqlite3" should not exist
-    And the file "../../multi-db-dummy/db/users_production.sqlite3" should not exist
-    
+    Then I should see the created 'gadgets' table in the 'widgets' 'production' database
+    And I should see the "doobry", "wotsit" and "thingy" columns in the "gadgets" table in the "widgets" "production" database
+
   Scenario: User runs rake db:migrate:status in a single database app
     Given I have created and run a migration with the name "20151010142141_create_users_table.rb", in a single database app
     And I have created but not run a migration with the name "20151010151000_add_nickname_to_users.rb", in a single database app

data/features/schema_tasks.feature

@@ -0,0 +1,110 @@
+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
+
+  Background:
+    Given empty databases have been created for the app
+
+  Scenario: User loads the schema in a single database app
+    Given a single database app and a schema file with:
+      """
+      ActiveRecord::Schema.define(version: 20151010145432) do
+
+        create_table "users", force: :cascade do |t|
+          t.string  "name"
+          t.integer "age"
+          t.string  "email"
+        end
+
+      end
+      """
+    When I run `bundle exec rake db:schema:load` in a single database app
+    Then I should see the created users table
+    And I should see the correct columns in the users table
+
+  Scenario: User loads the schema in a multi database app
+    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 a widgets_schema file with:
+      """
+      ActiveRecord::Schema.define(version: 20151010141234) do
+
+        create_table "accounts", force: :cascade do |t|
+          t.string  "doobry"
+          t.integer "wotsit"
+          t.string  "thingy"
+        end
+
+      end
+      """
+    When I run `bundle exec rake db:schema:load` in the multi database app
+    Then I should see the created 'posts' table in the 'default' database
+    And I should see the created 'accounts' table in the 'users' database
+    And I should see the "title", "text" and "author" columns in the "posts" table in the "default" database
+    And I should see the "expense", "user_id" and "total" columns in the "accounts" table in the "users" database
+
+  Scenario: loading the schema in the production environment
+    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 a widgets_schema file with:
+      """
+      ActiveRecord::Schema.define(version: 20151010141234) do
+
+        create_table "accounts", force: :cascade do |t|
+          t.string  "doobry"
+          t.integer "wotsit"
+          t.string  "thingy"
+        end
+
+      end
+      """
+    When I run `bundle exec rake db:schema:load RAILS_ENV=production` in the multi database app
+    Then I should see the created 'posts' table in the 'default' 'production' database
+    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

data/features/step_definitions/development_migrations_steps.rb

@@ -57,22 +57,16 @@ Then(/^I should see the created posts table in the default database$/) do
   table_exists? :database => "development.sqlite3", :table => "posts"
 end
 
-Then(/^I should see the created '([^']*)' table in the '([^']*)' database$/) do |table, database|
-  if database == "default"
-    database_file_name = "development"
-  else
-    database_file_name = "#{database}_development"
-  end
-  table_exists? :app => "multi-db-dummy", :database => "#{database_file_name}.sqlite3", :table => table
+# the (?:'([^']*)' )? capture group specifies an optional group
+# e.g. "I should see the created users table in the default database" will match
+# e.g. "I should see the created users table in the default production database" will also match
+# (and "production" will be captured in the third parameter)
+Then(/^I should see the created '([^']*)' table in the '([^']*)' (?:'([^']*)' )?database$/) do |table, database, environment|
+  table_exists? :app => "multi-db-dummy", :database => "#{database_file_name database, environment}.sqlite3", :table => table
 end
 
-Then(/^I should see the "([^"]*)", "([^"]*)" and "([^"]*)" columns in the "([^"]*)" table in the "([^"]*)" database$/) do |column1, column2, column3, table, database|
-  if database == "default"
-    database_file_name = "development"
-  else
-    database_file_name = "#{database}_development"
-  end
-  columns_exist? :app => "multi-db-dummy", :database => "#{database_file_name}.sqlite3", :table => table, :columns => [column1, column2, column3]
+Then(/^I should see the "([^"]*)", "([^"]*)" and "([^"]*)" columns in the "([^"]*)" table in the "([^"]*)" (?:"([^"]*)" )?database$/) do |column1, column2, column3, table, database, environment|
+  columns_exist? :app => "multi-db-dummy", :database => "#{database_file_name database, environment}.sqlite3", :table => table, :columns => [column1, column2, column3]
 end
 
 When(/^I run a migration with the timestamp "([^"]*)" in a single database app$/) do |timestamp|
@@ -144,6 +138,15 @@ end
 
 # Helpers
 
+def database_file_name(database, environment)
+  env = environment || "development"
+  if database == "default"
+    return env
+  else
+    return "#{database}_#{env}"
+  end
+end
+
 def write_multi_db_migration_for(database, migration_name)
   migration_database = database == "default" ? "migrate" : "#{database}_migrate"
   migration_class = migration_name.match(/\d+_(\w+).rb/).captures.first.split('_').map(&:capitalize).join
@@ -160,10 +163,12 @@ def write_multi_db_migration_for(database, migration_name)
 end
 
 def run_rake_db_create
-  cmd = unescape_text("rake db:create")
-  cmd = extract_text(cmd) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
+  ["rake db:create", "rake db:create RAILS_ENV=production"].each do |command|
+    cmd = unescape_text(command)
+    cmd = extract_text(cmd) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
 
-  run_simple(cmd, false)
+    run_simple(cmd, false)
+  end
 end
 
 def write_single_db_migration

data/features/step_definitions/schema_steps.rb

@@ -0,0 +1,11 @@
+Given(/^a single database app and a schema file with:$/) do |schema_content|
+  write_file "../../single-db-dummy/db/schema.rb", schema_content
+end
+
+Given(/^a multi database app and a schema file with:$/) do |schema_content|
+  write_file "../../multi-db-dummy/db/schema.rb", schema_content
+end
+
+Given(/^a (\w+) file with:$/) do |schema_name, schema_content|
+  write_file "../../multi-db-dummy/db/#{schema_name}.rb", schema_content
+end

data/features/step_definitions/sqlite_database_steps.rb

@@ -3,12 +3,12 @@ Given(/^no databases have been created$/) do
   clear_db_dir
 end
 
-Given(/^I run `([^`]*)` in a single database app$/) do |command|
+Given(/^I run `([^`]*)` in (?:a|the) single database app$/) do |command|
   run_task_in_single_db_app(command)
 end
 
 
-Given(/^I run `([^`]*)` in a multi database app$/) do |command|
+Given(/^I run `([^`]*)` in (?:a|the) multi database app$/) do |command|
   run_task_in_multi_db_app(command)
 end
 

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

@@ -40,6 +40,7 @@ end
 Rake::Task['db:create'].clear
 Rake::Task['db:migrate'].clear
 Rake::Task['db:schema:dump'].clear
+Rake::Task['db:schema:load'].clear
 Rake::Task['db:migrate:status'].clear
 
 Rake::Task["db:test:load_schema"].enhance do
@@ -138,5 +139,12 @@ db_namespace = namespace :db do
       end
       db_namespace['schema:dump'].reenable
     end
+
+    desc 'Load a schema.rb file into the database'
+    task :load => [:environment, :load_config] do
+      database_connections(:database => ENV["DATABASE"], :rails_envs => ENV["RAILS_ENV"] || "development").each do |connection_key, connection|
+        ActiveRecord::Tasks::DatabaseTasks.load_schema_for connection, :ruby, "db/#{schema_file_name(connection_key)}"
+      end
+    end
   end
 end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi-database-9000
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Mark Weston
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,9 +140,11 @@ files:
 - features/development_migrations.feature
 - features/production_migrations.feature
 - features/running_generators.feature
+- features/schema_tasks.feature
 - features/step_definitions/development_migrations_steps.rb
 - features/step_definitions/production_migration_steps.rb
 - features/step_definitions/running_generators_steps.rb
+- features/step_definitions/schema_steps.rb
 - features/step_definitions/sqlite_database_steps.rb
 - features/step_definitions/test_migration_steps.rb
 - features/support/env.rb
@@ -291,9 +293,11 @@ test_files:
 - features/development_migrations.feature
 - features/production_migrations.feature
 - features/running_generators.feature
+- features/schema_tasks.feature
 - features/step_definitions/development_migrations_steps.rb
 - features/step_definitions/production_migration_steps.rb
 - features/step_definitions/running_generators_steps.rb
+- features/step_definitions/schema_steps.rb
 - features/step_definitions/sqlite_database_steps.rb
 - features/step_definitions/test_migration_steps.rb
 - features/support/env.rb