aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--vendor/rails-2.1.0/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/vendor/rails-2.1.0/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/vendor/rails-2.1.0/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 7dbfbb41f..4fe24d5e1 100644
--- a/vendor/rails-2.1.0/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/vendor/rails-2.1.0/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -514,7 +514,15 @@ module ActiveRecord
# Example:
# drop_database 'matt_development'
def drop_database(name) #:nodoc:
- execute "DROP DATABASE IF EXISTS #{name}"
+ if postgresql_version >= 80200
+ execute "DROP DATABASE IF EXISTS #{quote_table_name(name)}"
+ else
+ begin
+ execute "DROP DATABASE #{quote_table_name(name)}"
+ rescue ActiveRecord::StatementInvalid
+ @logger.warn "#{name} database doesn't exist." if @logger
+ end
+ end
end