Changeset 9057
- Timestamp:
- 03/18/08 18:36:11 (4 months ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/2-0-stable/activerecord/CHANGELOG
r9019 r9057 1 1 *SVN* 2 3 * Migrations: create_table supports primary_key_prefix_type. #10314 [student, thechrisoshow] 2 4 3 5 * Ensure that ActiveRecord::Calculations disambiguates field names with the table name. #11027 [cavalle] branches/2-0-stable/activerecord/lib/active_record/base.rb
r8839 r9057 967 967 968 968 def reset_primary_key #:nodoc: 969 key = get_primary_key(base_class.name) 970 set_primary_key(key) 971 key 972 end 973 974 def get_primary_key(base_name) #:nodoc: 969 975 key = 'id' 970 976 case primary_key_prefix_type 971 977 when :table_name 972 key = Inflector.foreign_key(base_ class.name, false)978 key = Inflector.foreign_key(base_name, false) 973 979 when :table_name_with_underscore 974 key = Inflector.foreign_key(base_class.name) 975 end 976 set_primary_key(key) 980 key = Inflector.foreign_key(base_name) 981 end 977 982 key 978 983 end branches/2-0-stable/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
r8439 r9057 90 90 def create_table(table_name, options = {}) 91 91 table_definition = TableDefinition.new(self) 92 table_definition.primary_key(options[:primary_key] || "id") unless options[:id] == false92 table_definition.primary_key(options[:primary_key] || Base.get_primary_key(table_name)) unless options[:id] == false 93 93 94 94 yield table_definition
