0
@@ -76,13 +76,13 @@ module Mack
0
         puts "Created: #{output_dir}"
0
       end
0
       
0
-      def columns
0
+      def columns(name = param(:name))
0
         ivar_cache("form_columns") do
0
           cs = []
0
           cols = (param(:cols) || param(:columns))
0
           if cols
0
             cols.split("|").each do |x|
0
-              cs << Mack::Generator::ModelColumnObject.new(@name_singular, x)
0
+              cs << Mack::Generator::ModelColumnObject.new(name, x)
0
             end
0
           end
0
           cs

0
@@ -64,22 +64,7 @@ class MigrationGenerator < Mack::Generator::Migration::Base
0
     
0
     template_dir = File.join(File.dirname(__FILE__), "templates")
0
     
0
-    @create_table_block = ""
0
-    @drop_table_block = ""
0
     @table_name = param(:name).underscore.plural.gsub("create_", "")
0
-    columns = ""
0
-    cols = (param(:cols) || param(:columns))
0
-    if cols
0
-      cols = cols.split("|")
0
-      cols.each_with_index do |v, i|
0
-        x = v.split(":")
0
-        columns << "      t.column :#{x.first}, :#{x.last}\n"
0
-      end
0
-      @create_table_block = "create_table :#{@table_name} do |t|\n"
0
-      @create_table_block << columns
0
-      @create_table_block << "    end"
0
-      @drop_table_block = "drop_table :#{@table_name}"
0
-    end
0
     
0
     template(File.join(template_dir, "migration.rb.template"), File.join(migrations_directory, "#{next_migration_number}_#{param(:name)}.rb"), :force => param(:force))
0
     

0
@@ -1,11 +1,31 @@
0
 class <%= param(:name).camelcase %> < <%= app_config.orm.camelcase %>::Migration
0
 
0
   def self.up
0
-    <%= @create_table_block %>
0
+<%
0
+    unless columns.empty?
0
+-%>
0
+    create_table :<%= @table_name %> do |t|
0
+<%
0
+      for column in columns
0
+-%>
0
+      t.column :<%= column.column_name %>, :<%= column.column_type %>
0
+<%
0
+      end
0
+-%>
0
+    end
0
+<%
0
+    end
0
+-%>
0
   end
0
 
0
   def self.down
0
-    <%= @drop_table_block %>
0
+<%
0
+    unless columns.empty?
0
+-%>
0
+    drop_table :<%= @table_name %>
0
+<%
0
+    end
0
+-%>
0
   end
0
 
0
 end
0
\ No newline at end of file

0
@@ -31,11 +31,9 @@ class MigrationGeneratorTest < Test::Unit::TestCase
0
 class FooBar < ActiveRecord::Migration
0
 
0
   def self.up
0
-    
0
   end
0
 
0
   def self.down
0
-    
0
   end
0
 
0
 end
0
@@ -52,11 +50,9 @@ MIG
0
 class FooBar < DataMapper::Migration
0
 
0
   def self.up
0
-    
0
   end
0
 
0
   def self.down
0
-    
0
   end
0
 
0
 end