dohmysql 0.2.4 → 0.2.5

data/lib/doh/mysql/database_creator.rb

@@ -93,15 +93,18 @@ private
 
   def apply_migrates(dbh, source_db)
     apply_files = find_files("#{source_db}/migrate/*_apply.sql")
-    apply_files.sort! do |valx, valy|
-      if valx.end_with?('_before_apply.sql')
-        -1
-      elsif valy.end_with?('_before_apply.sql')
-        1
-      else
-        valx <=> valy
+    migrates = apply_files.collect {|path| File.basename(path).slice(0..-11)}
+
+    migrates.each do |name|
+      base, divider, _ = name.partition('_after')
+      next if divider.empty?
+
+      if migrates.include?("#{base}_before")
+        file_ending = "#{name}_apply.sql"
+        apply_files.delete_if {|path| path.end_with?(file_ending)}
       end
     end
+
     DohDb.load_sql(@connector.config, apply_files)
     apply_files.each do |path|
       migrate_name = File.basename(path).slice(0..-11)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohmysql
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-28 00:00:00.000000000 Z
+date: 2012-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohroot