kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Fixed migration trouble with SQLite when NOT NULL is used in the new definition (closes #5215) [greg@lapcominc.com]

Browse source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4419 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson 2006-06-03 21:41:40 +00:00
parent 3e67e0b3b2
commit 7f00f51239
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activerecord/CHANGELOG
View file

@ -1,5 +1,7 @@
*SVN* *SVN*
* Fixed migration trouble with SQLite when NOT NULL is used in the new definition #5215 [greg@lapcominc.com]
* Fixed problems with eager loading and counting on SQL Server #5212 [kajism@yahoo.com] * Fixed problems with eager loading and counting on SQL Server #5212 [kajism@yahoo.com]
* Fixed that count distinct should use the selected column even when using :include #5251 [anna@wota.jp] * Fixed that count distinct should use the selected column even when using :include #5251 [anna@wota.jp]

5
activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
View file

@ -316,9 +316,10 @@ module ActiveRecord
def copy_table_contents(from, to, columns, rename = {}) #:nodoc: def copy_table_contents(from, to, columns, rename = {}) #:nodoc:
column_mappings = Hash[*columns.map {|name| [name, name]}.flatten] column_mappings = Hash[*columns.map {|name| [name, name]}.flatten]
rename.inject(column_mappings) {|map, a| map[a.last] = a.first; map} 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| @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 << columns.map {|col| quote row[column_mappings[col]]} * ', '
sql << ')' sql << ')'
@connection.execute sql @connection.execute sql

3
activerecord/test/migration_test.rb
View file

@ -173,7 +173,8 @@ if ActiveRecord::Base.connection.supports_migrations?
Person.connection.create_table :testings do |t| Person.connection.create_table :testings do |t|
t.column :foo, :string t.column :foo, :string
end end
Person.connection.add_column :testings, :bar, :string, :null => false, :default => "default" Person.connection.execute "insert into testings (foo) values ('hello')"
assert_nothing_raised {Person.connection.add_column :testings, :bar, :string, :null => false, :default => "default" }
assert_raises(ActiveRecord::StatementInvalid) do assert_raises(ActiveRecord::StatementInvalid) do
Person.connection.execute "insert into testings (foo, bar) values ('hello', NULL)" Person.connection.execute "insert into testings (foo, bar) values ('hello', NULL)"