0
@@ -443,9 +443,10 @@ module ActiveRecord
0
 
0
       # Appends <tt>:datetime</tt> columns <tt>:created_at</tt> and
0
       # <tt>:updated_at</tt> to the table.
0
-      def timestamps
0
-        column(:created_at, :datetime)
0
-        column(:updated_at, :datetime)
0
+      def timestamps(*args)
0
+        options = args.extract_options!
0
+        column(:created_at, :datetime, options)
0
+        column(:updated_at, :datetime, options)
0
       end
0
 
0
       def references(*args)

0
@@ -237,6 +237,39 @@ if ActiveRecord::Base.connection.supports_migrations?
0
       end
0
     end
0
 
0
+    def test_create_table_with_timestamps_should_create_datetime_columns
0
+      table_name = :testings
0
+
0
+      Person.connection.create_table table_name do |t|
0
+        t.timestamps
0
+      end
0
+      created_columns = Person.connection.columns(table_name)
0
+
0
+      created_at_column = created_columns.detect {|c| c.name == 'created_at' }
0
+      updated_at_column = created_columns.detect {|c| c.name == 'updated_at' }
0
+
0
+      assert created_at_column.null
0
+      assert updated_at_column.null
0
+    ensure
0
+      Person.connection.drop_table table_name rescue nil
0
+    end
0
+
0
+    def test_create_table_with_timestamps_should_create_datetime_columns_with_options
0
+      table_name = :testings
0
+
0
+      Person.connection.create_table table_name do |t|
0
+        t.timestamps :null => false
0
+      end
0
+      created_columns = Person.connection.columns(table_name)
0
+
0
+      created_at_column = created_columns.detect {|c| c.name == 'created_at' }
0
+      updated_at_column = created_columns.detect {|c| c.name == 'updated_at' }
0
+
0
+      assert !created_at_column.null
0
+      assert !updated_at_column.null
0
+    ensure
0
+      Person.connection.drop_table table_name rescue nil
0
+    end
0
 
0
     # SQL Server, Sybase, and SQLite3 will not allow you to add a NOT NULL
0
     # column to a table without a default value.
0
@@ -1192,8 +1225,8 @@ if ActiveRecord::Base.connection.supports_migrations?
0
 
0
       def test_timestamps_creates_updated_at_and_created_at
0
         with_new_table do |t|
0
-          t.expects(:column).with(:created_at, :datetime)
0
-          t.expects(:column).with(:updated_at, :datetime)
0
+          t.expects(:column).with(:created_at, :datetime, kind_of(Hash))
0
+          t.expects(:column).with(:updated_at, :datetime, kind_of(Hash))
0
           t.timestamps
0
         end
0
       end