2 files changed, 30 insertions, 24 deletions
diff --git a/activerecord/test/cases/migration/compatibility_test.rb b/activerecord/test/cases/migration/compatibility_test.rb
index 6a9cdd9d29..6d5b6243db 100644
--- a/activerecord/test/cases/migration/compatibility_test.rb
+++ b/activerecord/test/cases/migration/compatibility_test.rb
@@ -71,6 +71,36 @@ module ActiveRecord
       ensure
         connection.drop_table :more_testings rescue nil
       end
+
+      def test_timestamps_have_null_constraints_if_not_present_in_migration_of_create_table
+        migration = Class.new(ActiveRecord::Migration) {
+          def migrate(x)
+            create_table :more_testings do |t|
+              t.timestamps
+            end
+          end
+        }.new
+
+        ActiveRecord::Migrator.new(:up, [migration]).migrate
+
+        assert connection.columns(:more_testings).find { |c| c.name == 'created_at' }.null
+        assert connection.columns(:more_testings).find { |c| c.name == 'updated_at' }.null
+      ensure
+        connection.drop_table :more_testings rescue nil
+      end
+
+      def test_timestamps_have_null_constraints_if_not_present_in_migration_for_adding_timestamps_to_existing_table
+        migration = Class.new(ActiveRecord::Migration) {
+          def migrate(x)
+            add_timestamps :testings
+          end
+        }.new
+
+        ActiveRecord::Migrator.new(:up, [migration]).migrate
+
+        assert connection.columns(:testings).find { |c| c.name == 'created_at' }.null
+        assert connection.columns(:testings).find { |c| c.name == 'updated_at' }.null
+      end
     end
   end
 end
diff --git a/activerecord/test/cases/migration/table_and_index_test.rb b/activerecord/test/cases/migration/table_and_index_test.rb
deleted file mode 100644
index 24cba84a09..0000000000
--- a/activerecord/test/cases/migration/table_and_index_test.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require "cases/helper"
-
-module ActiveRecord
-  class Migration
-    class TableAndIndexTest < ActiveRecord::TestCase
-      def test_add_schema_info_respects_prefix_and_suffix
-        conn = ActiveRecord::Base.connection
-
-        conn.drop_table(ActiveRecord::Migrator.schema_migrations_table_name, if_exists: true)
-        # Use shorter prefix and suffix as in Oracle database identifier cannot be larger than 30 characters
-        ActiveRecord::Base.table_name_prefix = 'p_'
-        ActiveRecord::Base.table_name_suffix = '_s'
-        conn.drop_table(ActiveRecord::Migrator.schema_migrations_table_name, if_exists: true)
-
-        conn.initialize_schema_migrations_table
-
-        assert_equal "p_unique_schema_migrations_s", conn.indexes(ActiveRecord::Migrator.schema_migrations_table_name)[0][:name]
-      ensure
-        ActiveRecord::Base.table_name_prefix = ""
-        ActiveRecord::Base.table_name_suffix = ""
-      end
-    end
-  end
-end