lib/blavosync/recipes/database.rb in blavosync-0.3.2 vs lib/blavosync/recipes/database.rb in blavosync-0.4.0

@@ -7,28 +7,44 @@
     DESC
     task :backup_db, :roles => :db do
       last_modified = Time.now.to_i
       generate_remote_db_backup
       system "mkdir -p #{tmp_dir}"
+      download(db_schema_backup_zip_file, "#{local_db_schema_backup_file(:env=>from_env, :timestamp=>last_modified)}.#{zip_ext}", :via=> :scp) do|ch, name, sent, total|
+        print "\r\033[1;42m  #{File.basename(name)}: #{sent}/#{total} -- #{(sent.to_f * 100 / total.to_f).to_i}% \033[0m"
+      end
       download(db_backup_zip_file, "#{local_db_backup_file(:env=>from_env, :timestamp=>last_modified)}.#{zip_ext}", :via=> :scp) do|ch, name, sent, total|
         print "\r\033[1;42m  #{File.basename(name)}: #{sent}/#{total} -- #{(sent.to_f * 100 / total.to_f).to_i}% \033[0m"
       end
     end
 
     desc <<-DESC
       Untars the backup file downloaded from local:backup_db (specified via the FROM env
       variable, which defalts to RAILS_ENV), and imports (via mysql command line tool) it back into the database
       defined in the RESTORE_ENV env variable (defaults to development).
     DESC
+
+
     task :restore_db, :roles => :db do
       mysql_str  = "mysql #{mysql_connection_for(to_env)}"
       mysql_dump = "mysqldump  #{mysql_connection_for(from_env)}"
-      local_db_create = "mysql #{mysql_connection_for(to_env)} -e \"create database if not exists #{mysql_db_for(to_env)}\""
+      local_db_create = "mysqladmin create #{mysql_connection_for(to_env)} " #  "create database if not exists #{mysql_db_for(to_env)}"
+      remote_schema_backup_file = local_db_schema_backup_file(:env => from_env, :timestamp=>most_recent_local_backup(from_env, 'schema')).strip
       remote_backup_file = local_db_backup_file(:env => from_env, :timestamp=>most_recent_local_backup(from_env, 'db')).strip
 
-      puts "\n\033[1;42m Restoring database backup to #{to_env} environment FROM #{remote_backup_file}--#{from_env} using #{mysql_str}\033[0m"
+      puts "\n\033[1;42m Attempting to create #{to_env} database \033[0m"
       system(local_db_create.strip)
       cmd = ""
+
+      puts "\n\033[1;42m Restoring database schema to #{to_env} environment FROM #{remote_schema_backup_file}--#{from_env} using #{mysql_str}\033[0m"
+      cmd << <<-CMD
+        #{unzip} -c #{remote_schema_backup_file}.#{zip_ext} > #{remote_schema_backup_file} &&
+        #{mysql_str} < #{remote_schema_backup_file} &&
+        rm -f #{remote_schema_backup_file}
+      CMD
+
+     puts "\n\033[1;42m Restoring database data to #{to_env} environment FROM #{remote_backup_file}--#{from_env} using #{mysql_str}\033[0m"
+
       cmd << <<-CMD
         #{unzip} -c #{remote_backup_file}.#{zip_ext} > #{remote_backup_file} &&
         #{mysql_str} < #{remote_backup_file} &&
         rm -f #{remote_backup_file}
       CMD
\ No newline at end of file