diff options
| author | Jacob Dunphy <jacob.dunphy@gmail.com> | 2009-01-15 13:30:44 -0800 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2009-01-29 17:34:33 +1300 |
| commit | e6493eb9b76de73afef2706493efd090dfff4ecc (patch) | |
| tree | bd2fb28d979c63f3a87e79f7c319ef86cf236fb4 /activerecord/lib/active_record/connection_adapters | |
| parent | feed7b4cfd860bdc9f5b4efc2ca2af76cb01d55d (diff) | |
| download | rails-e6493eb9b76de73afef2706493efd090dfff4ecc.tar.gz rails-e6493eb9b76de73afef2706493efd090dfff4ecc.tar.bz2 rails-e6493eb9b76de73afef2706493efd090dfff4ecc.zip | |
Sqlite adapter's copy_table incorrectly attempts to recreate a primary key id (:id => true in the create_table) if an :id column is present, even if it isn't a primary_key.
This fix sets :id => false if there is an :id column, but it's not the primary_key.
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1766 state:committed]
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | 2 |
1 files changed, 1 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 9387cf8827..5390f49f04 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb @@ -306,7 +306,7 @@ module ActiveRecord end def copy_table(from, to, options = {}) #:nodoc: - options = options.merge(:id => !columns(from).detect{|c| c.name == 'id'}.nil?) + options = options.merge(:id => (!columns(from).detect{|c| c.name == 'id'}.nil? && 'id' == primary_key(from).to_s)) create_table(to, options) do |definition| @definition = definition columns(from).each do |column| |