aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-07-07 08:48:59 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-07-07 08:48:59 +0000
commitbd832a221b1c1bd09ecf446775c8d636d3783b6a (patch)
tree6f2ca07b782a586df6e6c3a2d4fc5ae253bfa1af /activerecord
parent5a9a93d28f2233d8ceec11a931153eb87c6b40b5 (diff)
downloadrails-bd832a221b1c1bd09ecf446775c8d636d3783b6a.tar.gz
rails-bd832a221b1c1bd09ecf446775c8d636d3783b6a.tar.bz2
rails-bd832a221b1c1bd09ecf446775c8d636d3783b6a.zip
Fixed first run of "rake migrate" on PostgreSQL by not expecting a return value on the id #1640
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1755 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG5
-rwxr-xr-xactiverecord/lib/active_record/connection_adapters/abstract_adapter.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 450b456904..07e34ebbb1 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,3 +1,8 @@
+*SVN*
+
+* Fixed first run of "rake migrate" on PostgreSQL by not expecting a return value on the id #1640
+
+
*1.11.0* (5th July, 2005)
* Fixed that Yaml error message in fixtures hid the real error #1623 [Nicholas Seckar]
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index ea9b6442e7..75fd170269 100755
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -361,7 +361,7 @@ module ActiveRecord
def initialize_schema_information
begin
execute "CREATE TABLE schema_info (version #{type_to_sql(:integer)})"
- insert "INSERT INTO schema_info (version) VALUES(0)"
+ execute "INSERT INTO schema_info (version) VALUES(0)"
rescue ActiveRecord::StatementInvalid
# Schema has been intialized
end