dohmysql 0.2.0 → 0.2.1

data/lib/doh/mysql/database_creator.rb

@@ -7,7 +7,7 @@ require 'doh/mysql/file_util'
 module DohDb
 
 class DatabaseCreator
-  MIGRATE_TABLE_DEF = "CREATE TABLE migrate (migrated_at DATETIME NOT NULL, name CHAR(50) NOT NULL)"
+  MIGRATE_TABLE_DEF = "CREATE TABLE migrate (migrated_at DATETIME NOT NULL, name CHAR(50) NOT NULL, sql_applied TEXT NOT NULL)"
 
   def initialize(sqlfiles_directory = nil, connector = nil)
     @sqlfiles_directory = sqlfiles_directory || DohDb.sql_files_path
@@ -94,10 +94,10 @@ private
   def apply_migrates(dbh, source_db)
     apply_files = find_files("#{source_db}/migrate/*_apply.sql")
     DohDb.load_sql(@connector.config, apply_files)
-    migrate_names = apply_files.collect {|path| File.basename(path).partition('_apply').first}
-    # NOTE: could package these up into one insert, but it is very small, and will have very few migrates, so not a big deal
-    migrate_names.each do |name|
-      dbh.query("INSERT INTO migrate SET migrated_at = NOW(), name = #{name.to_sql}")
+    apply_files.each do |path|
+      migrate_name = File.basename(path).slice(0..-11)
+      contents = File.open(path) {|file| file.read}
+      dbh.query("INSERT INTO migrate SET migrated_at = NOW(), name = #{migrate_name.to_sql}, sql_applied = #{contents.to_sql}")
     end
   end
 

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

@@ -16,7 +16,7 @@ class MigrateAnalyzer
   end
 
   def check(migrate_name)
-    DohDb::DatabaseCreator.new.create_database_copy(CHECK_DATABASE, @database, true, true)
+    DohDb::DatabaseCreator.new.create_database_copy(CHECK_DATABASE, @database, true, false)
     dump_sql(@sql_original)
 
     runner = DohDb::MigrateRunner.new(@database)

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

@@ -24,8 +24,10 @@ class MigrateRunner
     if migrate_exist?(migrate_name)
       return [false, "migration #{migrate_name} has already been applied"]
     end
-    load_sql(apply_filename(migrate_name))
-    Doh.db.query("INSERT INTO #@table SET migrated_at = NOW(), name = #{migrate_name.to_sql}")
+    fname = apply_filename(migrate_name)
+    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}")
     [true, "migration #{migrate_name} applied successfully"]
   rescue Exception => excpt
     [false, excpt.message]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohmysql
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors: