Ticket #9971: mysql_schema_dump_pk_patch.diff

test/schema_dumper_test.rb

@@ -110 +110 @@
-        output = standard_dump
-        assert_match %r{t.text\s+"body",\s+:default => "",\s+:null => false$}, output
-      end
+      
+      def test_mysql_schema_dump_should_honor_nonstandard_primary_keys
+        output = standard_dump
+        match = output.match(%r{create_table "nonstandardpk"(.*)$})
+        assert_not_nil(match, "nonstandardpk table not found") 
+        assert_match %r(:primary_key => "NotId"), output, "non-standard primary key not preserved"
+      end
-    end
-
-    def test_schema_dump_includes_decimal_options

test/fixtures/db_definitions/mysql.sql

@@ -236 +236 @@
-CREATE TABLE `minimalistics` (
-  `id` INTEGER NOT NULL auto_increment PRIMARY KEY
-);
+
+CREATE TABLE `nonstandardpk` (
+  `NotId` INTEGER NOT NULL auto_increment PRIMARY KEY
+);

lib/active_record/connection_adapters/mysql_adapter.rb

@@ -438 +438 @@
-      def show_variable(name)
-        variables = select_all("SHOW VARIABLES LIKE '#{name}'")
-        variables.first['Value'] unless variables.empty?
+      end 
+      
+      # Returns a table's primary key and belonging sequence.
+      def pk_and_sequence_for(table) #:nodoc:
+        table_desc_result = execute("describe #{table}")
+        keys = []
+        execute("describe #{table}").each_hash do |h| 
+          keys << h["Field"]if h["Key"] == "PRI"
+        end
+        keys.length == 1 ? [keys.first, nil] : nil
-      end
-
-      private