diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-09-15 21:23:05 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-09-15 21:23:05 +0000 |
| commit | 79202b37dc7566e8b8392a44c461a64469f79a77 (patch) | |
| tree | 14f21cc3a9706a3c9dd3a6b7fc4c91d6977858aa /activerecord/lib/active_record | |
| parent | 2fba012c018a7e29e5e0afa2ba6a6ea91b07b0a3 (diff) | |
| download | rails-79202b37dc7566e8b8392a44c461a64469f79a77.tar.gz rails-79202b37dc7566e8b8392a44c461a64469f79a77.tar.bz2 rails-79202b37dc7566e8b8392a44c461a64469f79a77.zip | |
Fixed that altering join tables in migrations would fail w/ sqlite3 #7453 [TimoMihaljov/brandon]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7484 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb index 963d4b92bd..f985bd9615 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb @@ -285,6 +285,7 @@ module ActiveRecord end def copy_table(from, to, options = {}) #:nodoc: + options = options.merge(:id => !columns(from).detect{|c| c.name == 'id'}.nil?) create_table(to, options) do |@definition| columns(from).each do |column| column_name = options[:rename] ? @@ -296,7 +297,7 @@ module ActiveRecord :limit => column.limit, :default => column.default, :null => column.null) end - @definition.primary_key(primary_key(from)) + @definition.primary_key(primary_key(from)) if primary_key(from) yield @definition if block_given? end |