From 66820a4aa70889a02f48eb860727daa31639aab3 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 24 Sep 2005 17:50:07 +0000 Subject: Just include activerecord/schema with AR so it doesnt need to be dumped git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2322 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record.rb | 1 + activerecord/lib/active_record/schema.rb | 2 -- activerecord/lib/active_record/schema_dumper.rb | 7 +------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index 874df2efc8..8d50df6758 100755 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -48,6 +48,7 @@ require 'active_record/acts/tree' require 'active_record/acts/nested_set' require 'active_record/locking' require 'active_record/migration' +require 'active_record/schema' ActiveRecord::Base.class_eval do include ActiveRecord::Validations diff --git a/activerecord/lib/active_record/schema.rb b/activerecord/lib/active_record/schema.rb index 1cb4aec3c8..e25385bf06 100644 --- a/activerecord/lib/active_record/schema.rb +++ b/activerecord/lib/active_record/schema.rb @@ -1,5 +1,4 @@ module ActiveRecord - class Schema < Migration #:nodoc: private_class_method :new @@ -19,5 +18,4 @@ module ActiveRecord end end end - end diff --git a/activerecord/lib/active_record/schema_dumper.rb b/activerecord/lib/active_record/schema_dumper.rb index e086c17841..ec5e2f12d5 100644 --- a/activerecord/lib/active_record/schema_dumper.rb +++ b/activerecord/lib/active_record/schema_dumper.rb @@ -1,5 +1,4 @@ module ActiveRecord - # This class is used to dump the database schema for some connection to some # output format (i.e., ActiveRecord::Schema). class SchemaDumper @@ -33,10 +32,7 @@ module ActiveRecord # migrations feature of ActiveRecord to incrementally modify your database, and # then regenerate this schema definition. -require 'active_record/schema' - ActiveRecord::Schema.define(#{define_params}) do - HEADER end @@ -83,5 +79,4 @@ HEADER stream.puts unless indexes.empty? end end - -end +end \ No newline at end of file -- cgit v1.2.3