diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-06-03 21:41:40 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-06-03 21:41:40 +0000 |
| commit | 7f00f51239f112ef6c70293665bcf0a5e2c313db (patch) | |
| tree | f04b9440378e3fd5dbaad82511562c25a65aa5ad /activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | |
| parent | 3e67e0b3b2c192335daeede83430dc6e5042fec3 (diff) | |
| download | rails-7f00f51239f112ef6c70293665bcf0a5e2c313db.tar.gz rails-7f00f51239f112ef6c70293665bcf0a5e2c313db.tar.bz2 rails-7f00f51239f112ef6c70293665bcf0a5e2c313db.zip | |
Fixed migration trouble with SQLite when NOT NULL is used in the new definition (closes #5215) [greg@lapcominc.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4419 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb index cf4114aacc..7b7232ea13 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb @@ -316,9 +316,10 @@ module ActiveRecord def copy_table_contents(from, to, columns, rename = {}) #:nodoc: column_mappings = Hash[*columns.map {|name| [name, name]}.flatten] rename.inject(column_mappings) {|map, a| map[a.last] = a.first; map} - + from_columns = columns(from).collect {|col| col.name} + columns = columns.find_all{|col| from_columns.include?(column_mappings[col])} @connection.execute "SELECT * FROM #{from}" do |row| - sql = "INSERT INTO #{to} VALUES (" + sql = "INSERT INTO #{to} ("+columns*','+") VALUES (" sql << columns.map {|col| quote row[column_mappings[col]]} * ', ' sql << ')' @connection.execute sql |