aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/schema.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2010-12-01 17:08:01 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2010-12-01 17:08:01 -0800
commit3ec212e3c9c815e9993cbea409c60774ea75cd30 (patch)
tree56f77db136192f65eb4e3a1417d8b989e56cfe37 /activerecord/lib/active_record/schema.rb
parentc15c14563e6604aab232336b16e14f1f235cc19d (diff)
downloadrails-3ec212e3c9c815e9993cbea409c60774ea75cd30.tar.gz
rails-3ec212e3c9c815e9993cbea409c60774ea75cd30.tar.bz2
rails-3ec212e3c9c815e9993cbea409c60774ea75cd30.zip
rolling out migrated_at until I can fix the build
Diffstat (limited to 'activerecord/lib/active_record/schema.rb')
-rw-r--r--activerecord/lib/active_record/schema.rb19
1 files changed, 4 insertions, 15 deletions
diff --git a/activerecord/lib/active_record/schema.rb b/activerecord/lib/active_record/schema.rb
index 9a47fd3b84..c6bb5c1961 100644
--- a/activerecord/lib/active_record/schema.rb
+++ b/activerecord/lib/active_record/schema.rb
@@ -46,24 +46,13 @@ module ActiveRecord
# ...
# end
def self.define(info={}, &block)
- Base.connection.drop_table(ActiveRecord::Migrator.schema_migrations_table_name)
- initialize_schema_migrations_table
-
schema = new
schema.instance_eval(&block)
- assume_migrated_upto_version(info[:version], schema.migrations_path) unless info[:version].blank?
- end
-
- def migration(version, name="", options={})
- name, options = "", name if name.is_a?(Hash)
-
- table = Arel::Table.new(ActiveRecord::Migrator.schema_migrations_table_name)
- table.insert(
- table["version"] => version,
- table["name"] => name,
- table["migrated_at"] => Time.now
- )
+ unless info[:version].blank?
+ initialize_schema_migrations_table
+ assume_migrated_upto_version(info[:version], schema.migrations_path)
+ end
end
end
end