diff options
| -rw-r--r-- | activerecord/CHANGELOG | 5 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | 2 |
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 |