Load generators from both lib/rails/generators and lib/generators. Using the former since it's less obstrusive.

1 files changed, 0 insertions, 33 deletions

diff --git a/activerecord/lib/generators/active_record/model/model_generator.rb b/activerecord/lib/generators/active_record/model/model_generator.rb
deleted file mode 100644
index 2641083e0d..0000000000
--- a/activerecord/lib/generators/active_record/model/model_generator.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'generators/active_record'
-
-module ActiveRecord
-  module Generators
-    class ModelGenerator < Base
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
-
-      check_class_collision
-
-      class_option :migration,  :type => :boolean
-      class_option :timestamps, :type => :boolean
-      class_option :parent,     :type => :string, :desc => "The parent class for the generated model"
-
-      def create_migration_file
-        return unless options[:migration] && options[:parent].nil?
-        migration_template "migration.rb", "db/migrate/create_#{table_name}.rb"
-      end
-
-      def create_model_file
-        template 'model.rb', File.join('app/models', class_path, "#{file_name}.rb")
-      end
-
-      hook_for :test_framework
-
-      protected
-
-        def parent_class_name
-          options[:parent] || "ActiveRecord::Base"
-        end
-
-    end
-  end
-end