Merge pull request #5900 from amatsuda/ar_mysql_pk_with_using_option

current MySQL driver fails to fetch PK name when the PK has USING option

1 files changed, 30 insertions, 0 deletions

diff --git a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
index 5aa4743e7b..475a292f85 100644
--- a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
+++ b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
@@ -56,6 +56,36 @@ module ActiveRecord
         end
       end
 
+      def test_pk_and_sequence_for
+        pk, seq = @conn.pk_and_sequence_for('ex')
+        assert_equal 'id', pk
+        assert_equal @conn.default_sequence_name('ex', 'id'), seq
+      end
+
+      def test_pk_and_sequence_for_with_non_standard_primary_key
+        @conn.exec_query('drop table if exists ex_with_non_standard_pk')
+        @conn.exec_query(<<-eosql)
+          CREATE TABLE `ex_with_non_standard_pk` (
+            `code` INT(11) DEFAULT NULL auto_increment,
+             PRIMARY KEY  (`code`))
+        eosql
+        pk, seq = @conn.pk_and_sequence_for('ex_with_non_standard_pk')
+        assert_equal 'code', pk
+        assert_equal @conn.default_sequence_name('ex_with_non_standard_pk', 'code'), seq
+      end
+
+      def test_pk_and_sequence_for_with_custom_index_type_pk
+        @conn.exec_query('drop table if exists ex_with_custom_index_type_pk')
+        @conn.exec_query(<<-eosql)
+          CREATE TABLE `ex_with_custom_index_type_pk` (
+            `id` INT(11) DEFAULT NULL auto_increment,
+             PRIMARY KEY  USING BTREE (`id`))
+        eosql
+        pk, seq = @conn.pk_and_sequence_for('ex_with_custom_index_type_pk')
+        assert_equal 'id', pk
+        assert_equal @conn.default_sequence_name('ex_with_custom_index_type_pk', 'id'), seq
+      end
+
       private
       def insert(ctx, data)
         binds   = data.map { |name, value|