Make to primary key instead of an unique index for internal tables

2 files changed, 1 insertions, 25 deletions

diff --git a/activerecord/test/cases/ar_schema_test.rb b/activerecord/test/cases/ar_schema_test.rb
index 1f32c48b95..9c99689c1e 100644
--- a/activerecord/test/cases/ar_schema_test.rb
+++ b/activerecord/test/cases/ar_schema_test.rb
@@ -21,7 +21,7 @@ if ActiveRecord::Base.connection.supports_migrations?
       ActiveRecord::Migration.verbose = @original_verbose
     end
 
-    def test_has_has_primary_key
+    def test_has_primary_key
       old_primary_key_prefix_type = ActiveRecord::Base.primary_key_prefix_type
       ActiveRecord::Base.primary_key_prefix_type = :table_name_with_underscore
       assert_equal "version", ActiveRecord::SchemaMigration.primary_key
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