dohmysql 0.2.18 → 0.2.19

data/bin/migrate

@@ -7,7 +7,7 @@ module DohDb
 module Migrate
 
 if ['make', 'apply', 'revert'].include?(CMD_NAME)
-  success, msg = DohDb::MigrateRunner.new(OPTS.database).send(CMD_NAME, *CMD_ARGS)
+  success, msg = DohDb::MigrateRunner.new(OPTS.database).send(CMD_NAME, *CMD_ARGS, OPTS)
 elsif ['check', 'verify'].include?(CMD_NAME)
   success, msg = DohDb::MigrateAnalyzer.new(OPTS.database).send(CMD_NAME, *CMD_ARGS)
 end

data/lib/doh/mysql/handle.rb

@@ -16,6 +16,7 @@ class Handle
 
   def initialize(config)
     @config = config
+    @testing_rollback = false
     log_config = @config.dup
     log_config.delete(:password)
     DohDb.logger.call('connection', "creating connection with config: #{log_config}")

data/lib/doh/mysql/migrate/options.rb

@@ -20,6 +20,7 @@ end.join("\n")
 
 OPTS = Doh::Options.new(
 {'database' => [Doh.config[:default_database], "-d", "--database <database>", "name of the database to migrate -- defaults to config[:default_database], currently '#{Doh.config[:default_database]}'"] \
+, 'runafter' => [false, "-a", "--after", "for migrate make, creates the migrations designed to be run after a deploy (defaults to before)"] \
 }, true, "Commands:\n\n#{cmd_detail}")
 
 CMD_NAME, CMD_ARGS = OPTS.varargs.shift, OPTS.varargs

data/lib/doh/mysql/migrate/runner.rb

@@ -10,21 +10,21 @@ class MigrateRunner
     @config = DohDb::connector_instance.config
   end
 
-  def make(migrate_name)
-    apply_fname = apply_filename(migrate_name)
+  def make(migrate_name, opts)
+    apply_fname = apply_filename(migrate_name, opts)
     if File.exist?(apply_fname)
       return [false, "it appears that migration #{migrate_name} already exists"]
     end
     `touch #{apply_fname}`
-    `touch #{revert_filename(migrate_name)}`
+    `touch #{revert_filename(migrate_name, opts)}`
     [true, "files for migration #{migrate_name} created in #{@directory}"]
   end
 
-  def apply(migrate_name)
+  def apply(migrate_name, opts)
     if migrate_exist?(migrate_name)
       return [false, "migration #{migrate_name} has already been applied"]
     end
-    fname = apply_filename(migrate_name)
+    fname = apply_filename(migrate_name, opts)
     load_sql(fname)
     contents = File.open(fname) {|file| file.read}
     Doh.db.query("INSERT INTO #@table SET migrated_at = NOW(), name = #{migrate_name.to_sql}, sql_applied = #{contents.to_sql}")
@@ -33,11 +33,11 @@ class MigrateRunner
     [false, excpt.message]
   end
 
-  def revert(migrate_name)
+  def revert(migrate_name, opts)
     unless migrate_exist?(migrate_name)
       return [false, "migration #{migrate_name} can't be reverted until it has been applied"]
     end
-    load_sql(revert_filename(migrate_name))
+    load_sql(revert_filename(migrate_name, opts))
     Doh.db.query("DELETE FROM #@table WHERE name = #{migrate_name.to_sql}")
     [true, "migration #{migrate_name} reverted successfully"]
   rescue Exception => excpt
@@ -45,12 +45,14 @@ class MigrateRunner
   end
 
 private
-  def apply_filename(migrate_name)
-    File.join(@directory, "#{migrate_name}_apply.sql")
+  def apply_filename(migrate_name, opts)
+    position_str = opts.runafter ? 'after' : 'before'
+    File.join(@directory, "#{migrate_name}_#{position_str}_apply.sql")
   end
 
-  def revert_filename(migrate_name)
-    File.join(@directory, "#{migrate_name}_revert.sql")
+  def revert_filename(migrate_name, opts)
+    position_str = opts.runafter ? 'before' : 'after'
+    File.join(@directory, "#{migrate_name}_#{position_str}_revert.sql")
   end
 
   def load_sql(filename)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohmysql
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohroot