Changeset 6965

Timestamp:

06/08/07 01:40:05 (1 year ago)

Author:

bitsweat

Message:

Rollback [6961] which breaks SQLite tests. Reference #7345.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb (modified) (1 diff)
• trunk/activerecord/test/migration_test.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
-
-* Migrations: raise if a column is duplicated.  #7345 [Jeremy McAnally, Josh Peek]
-
-* Fixtures: correctly delete and insert fixtures in a single transaction.  #8553 [Michael Schuerig]

trunk/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb

@@ -352 +352 @@
-      # TableDefinition#timestamps that'll add created_at and updated_at as datetimes.
-      def column(name, type, options = {})
-
-
+
-        column.limit = options[:limit] || native[type.to_sym][:limit] if options[:limit] or native[type.to_sym]
-        column.precision = options[:precision]

trunk/activerecord/test/migration_test.rb

@@ -808 +808 @@
-    end
-
-    def test_should_disallow_duplicate_column_definition
-      assert_raises(ActiveRecord::StatementInvalid) do
-        Person.connection.add_column("people", "full_name", :string, :limit => 40)
-        Person.connection.add_column("people", "full_name", :text)
-      end
-
-      assert_raises(RuntimeError) do
-        Person.connection.create_table :people_with_errors do |t|
-          t.column "full_name", :string, :limit => 40
-          t.column "full_name", :text
-        end
-      end
-
-      Person.reset_column_information
-    end
-
-  end
-end