1 files changed, 9 insertions, 3 deletions
diff --git a/railties/lib/generators/active_record/model/model_generator.rb b/railties/lib/generators/active_record/model/model_generator.rb
index 45e773fde1..53592c222f 100644
--- a/railties/lib/generators/active_record/model/model_generator.rb
+++ b/railties/lib/generators/active_record/model/model_generator.rb
@@ -8,7 +8,7 @@ module ActiveRecord
       conditional_class_option :timestamps
       conditional_class_option :migration
 
-      class_option :parent, :type => :string, :default => "ActiveRecord::Base",
+      class_option :parent, :type => :string,
                    :desc => "The parent class for the generated model"
 
       def create_model_file
@@ -17,13 +17,19 @@ module ActiveRecord
 
       # TODO Add migration support
       def create_migration_file
-#        unless options[:skip_migration]
+        if options[:migration] && options[:parent].nil?
 #          m.migration_template 'migration.rb', 'db/migrate', :assigns => {
 #            :migration_name => "Create#{class_name.pluralize.gsub(/::/, '')}"
 #          }, :migration_file_name => "create_#{file_path.gsub(/\//, '_').pluralize}"
-#        end
+        end
       end
 
+      protected
+
+        def parent_class_name
+          options[:parent] || "ActiveRecord::Base"
+        end
+
     end
   end
 end