Permalink
Browse files

Make sure that the Schema Dumper supports non-standard primary keys w…

…ith MySQL. Closes #9971 [RubyRedRick]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8012 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
NZKoz committed Oct 25, 2007
1 parent 12d8d48 commit 2d208eb3a09bf5b091464b7a4bbd00647eb7dfb2
@@ -440,6 +440,16 @@ def show_variable(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
def connect
encoding = @config[:encoding]
@@ -110,6 +110,13 @@ def test_schema_dump_should_not_add_default_value_for_mysql_text_field
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 "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
def test_schema_dump_includes_decimal_options

0 comments on commit 2d208eb

Please sign in to comment.