0
@@ -1,5 +1,7 @@
0
 *SVN*
0
 
0
+* Migrations: create_table supports primary_key_prefix_type.  #10314 [student, thechrisoshow]
0
+
0
 * Ensure that ActiveRecord::Calculations disambiguates field names with the table name.  #11027 [cavalle]
0
 
0
 * Ensure that modifying has_and_belongs_to_many actions clear the query cache.  Closes #10840 [john.andrews]

0
@@ -966,14 +966,19 @@
0
       end
0
 
0
       def reset_primary_key #:nodoc:
0
+        key = get_primary_key(base_class.name)
0
+        set_primary_key(key)
0
+        key
0
+      end
0
+
0
+      def get_primary_key(base_name) #:nodoc:
0
         key = 'id'
0
         case primary_key_prefix_type
0
           when :table_name
0
-            key = Inflector.foreign_key(base_class.name, false)
0
+            key = Inflector.foreign_key(base_name, false)
0
           when :table_name_with_underscore
0
-            key = Inflector.foreign_key(base_class.name)
0
+            key = Inflector.foreign_key(base_name)
0
         end
0
-        set_primary_key(key)
0
         key
0
       end
0
 

0
@@ -89,7 +89,7 @@
0
       # See also TableDefinition#column for details on how to create columns.
0
       def create_table(table_name, options = {})
0
         table_definition = TableDefinition.new(self)
0
-        table_definition.primary_key(options[:primary_key] || "id") unless options[:id] == false
0
+        table_definition.primary_key(options[:primary_key] || Base.get_primary_key(table_name)) unless options[:id] == false
0
 
0
         yield table_definition
0