From c650199e5d615e9f5a60222c64a360146d0dee15 Mon Sep 17 00:00:00 2001 From: Archakov Alexander Date: Tue, 26 Apr 2016 16:58:24 +1000 Subject: [PATCH 1/2] fix dump for rails engine --- lib/sequel_rails/railties/database.rake | 28 ++++++++++++++----------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/lib/sequel_rails/railties/database.rake b/lib/sequel_rails/railties/database.rake index b72b80a..4ea6911 100644 --- a/lib/sequel_rails/railties/database.rake +++ b/lib/sequel_rails/railties/database.rake @@ -9,6 +9,17 @@ namespace sequel_rails_namespace do @db_for_current_env[Rails.env] ||= ::SequelRails.setup(Rails.env) end + def run_dump + case (SequelRails.configuration.schema_format ||= :ruby) + when :ruby + Rake::Task["#{sequel_rails_namespace}:schema:dump"].invoke + when :sql + Rake::Task["#{sequel_rails_namespace}:structure:dump"].invoke + else + abort "unknown schema format #{SequelRails.configuration.schema_format}" + end + end + # desc "Raises an error if there are pending migrations" task :abort_if_pending_migrations => [:environment, "#{sequel_rails_namespace}:migrate:load"] do if SequelRails::Migrations.pending_migrations? @@ -70,14 +81,7 @@ namespace sequel_rails_namespace do end task :dump => :environment do - case (SequelRails.configuration.schema_format ||= :ruby) - when :ruby - Rake::Task["#{sequel_rails_namespace}:schema:dump"].invoke - when :sql - Rake::Task["#{sequel_rails_namespace}:structure:dump"].invoke - else - abort "unknown schema format #{SequelRails.configuration.schema_format}" - end + run_dump end task :load => :environment do @@ -147,7 +151,7 @@ namespace sequel_rails_namespace do version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil fail 'VERSION is required' unless version SequelRails::Migrations.migrate_up!(version) - Rake::Task["#{sequel_rails_namespace}:dump"].invoke if SequelRails.configuration.schema_dump + run_dump if SequelRails.configuration.schema_dump end desc 'Runs the "down" for a given migration VERSION.' @@ -155,14 +159,14 @@ namespace sequel_rails_namespace do version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil fail 'VERSION is required' unless version SequelRails::Migrations.migrate_down!(version) - Rake::Task["#{sequel_rails_namespace}:dump"].invoke if SequelRails.configuration.schema_dump + run_dump if SequelRails.configuration.schema_dump end end desc 'Migrate the database to the latest version' task :migrate => 'migrate:load' do SequelRails::Migrations.migrate_up!(ENV['VERSION'] ? ENV['VERSION'].to_i : nil) - Rake::Task["#{sequel_rails_namespace}:dump"].invoke if SequelRails.configuration.schema_dump + run_dump if SequelRails.configuration.schema_dump end desc 'Rollback the latest migration file or down to specified VERSION=x' @@ -173,7 +177,7 @@ namespace sequel_rails_namespace do SequelRails::Migrations.previous_migration end SequelRails::Migrations.migrate_down! version - Rake::Task["#{sequel_rails_namespace}:dump"].invoke if SequelRails.configuration.schema_dump + run_dump if SequelRails.configuration.schema_dump end desc 'Load the seed data from db/seeds.rb' From 06d9c32527cb2b8f2082c4869278ad18e9d8b268 Mon Sep 17 00:00:00 2001 From: Archakov Alexander Date: Tue, 26 Apr 2016 17:20:15 +1000 Subject: [PATCH 2/2] fix undefined local variable --- lib/sequel_rails/railties/database.rake | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/sequel_rails/railties/database.rake b/lib/sequel_rails/railties/database.rake index 4ea6911..da39579 100644 --- a/lib/sequel_rails/railties/database.rake +++ b/lib/sequel_rails/railties/database.rake @@ -9,12 +9,12 @@ namespace sequel_rails_namespace do @db_for_current_env[Rails.env] ||= ::SequelRails.setup(Rails.env) end - def run_dump + def run_dump(namespace) case (SequelRails.configuration.schema_format ||= :ruby) when :ruby - Rake::Task["#{sequel_rails_namespace}:schema:dump"].invoke + Rake::Task["#{namespace}:schema:dump"].invoke when :sql - Rake::Task["#{sequel_rails_namespace}:structure:dump"].invoke + Rake::Task["#{namespace}:structure:dump"].invoke else abort "unknown schema format #{SequelRails.configuration.schema_format}" end @@ -81,7 +81,7 @@ namespace sequel_rails_namespace do end task :dump => :environment do - run_dump + run_dump(sequel_rails_namespace) end task :load => :environment do @@ -151,7 +151,7 @@ namespace sequel_rails_namespace do version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil fail 'VERSION is required' unless version SequelRails::Migrations.migrate_up!(version) - run_dump if SequelRails.configuration.schema_dump + run_dump(sequel_rails_namespace) if SequelRails.configuration.schema_dump end desc 'Runs the "down" for a given migration VERSION.' @@ -159,14 +159,14 @@ namespace sequel_rails_namespace do version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil fail 'VERSION is required' unless version SequelRails::Migrations.migrate_down!(version) - run_dump if SequelRails.configuration.schema_dump + run_dump(sequel_rails_namespace) if SequelRails.configuration.schema_dump end end desc 'Migrate the database to the latest version' task :migrate => 'migrate:load' do SequelRails::Migrations.migrate_up!(ENV['VERSION'] ? ENV['VERSION'].to_i : nil) - run_dump if SequelRails.configuration.schema_dump + run_dump(sequel_rails_namespace) if SequelRails.configuration.schema_dump end desc 'Rollback the latest migration file or down to specified VERSION=x' @@ -177,7 +177,7 @@ namespace sequel_rails_namespace do SequelRails::Migrations.previous_migration end SequelRails::Migrations.migrate_down! version - run_dump if SequelRails.configuration.schema_dump + run_dump(sequel_rails_namespace) if SequelRails.configuration.schema_dump end desc 'Load the seed data from db/seeds.rb'