Added more debugging around restore.

lib/psql-cm/restore.rb

@@ -19,16 +19,15 @@ def restore!
               schema = cm_file.sub(".sql",'')
               ensure_schema_exists(database,schema)
 
-
               psqlrc_file = File.join(ENV['HOME'],'.psqlrc')
               FileUtils.touch(psqlrc_file) unless File.exists?(psqlrc_file)
               psqlrc = File.read(psqlrc_file)
               File.open(psqlrc_file,'w') do |file|
                 file.rewind
                 file.write "SET search_path TO #{schema}; "
               end
-              begin
 
+              begin
                 debug "restore> #{database}:#{schema} < #{cm_file}"
                 sh "psql #{db(database).psql_args} #{database} < #{cm_file}"
 
@@ -38,15 +37,18 @@ def restore!
                        WHERE is_base = $1 ORDER BY created_at ASC;"
 
                 Tempfile.open('base.sql') do |temp_file|
+                  debug "restore:base:sql> #{sql.sub('$1','true')}"
                   row = db(database).exec(sql, ['true'])
                   temp_file.write(row)
                   sh "psql #{db(database).psql_args} #{database} < #{temp_file.path}"
                 end
 
-                debug "sql> #{sql}"
-                db(database).exec(sql,['false']).each do |row|
-                  debug "change>\n#{row['content']}"
-                  Tempfile.open('base.sql') do |temp_file|
+                debug "restore:changes:sql> #{sql.sub('$1','false')}"
+                changes = db(database).exec(sql,['false'])
+                debug "restore:change:count>#{changes.cmd_tuples}"
+                changes.each do |row|
+                  debug "restore:change:content>\n#{row['content']}"
+                  Tempfile.open('change.sql') do |temp_file|
                     temp_file.write(row['content'])
                     temp_file.close
                     sh "psql #{db(database).psql_args} #{database} < #{temp_file.path}"