Changeset 8012

Timestamp:

10/25/07 06:42:05 (9 months ago)

Author:

nzkoz

Message:

Make sure that the Schema Dumper supports non-standard primary keys with MySQL. Closes #9971 [RubyRedRick]

Files:

• trunk/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb (modified) (1 diff)
• trunk/activerecord/test/schema_dumper_test.rb (modified) (1 diff)

trunk/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

@@ -441 +441 @@
-      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
-        def connect

trunk/activerecord/test/schema_dumper_test.rb

@@ -111 +111 @@
-        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 "movies"(.*)do})
+        assert_not_nil(match, "nonstandardpk table not found")
+        assert_match %r(:primary_key => "movieid"), match[1], "non-standard primary key not preserved"
+      end
-    end
-