diff options
author | francis <francis> | 2008-09-04 08:52:38 +0000 |
---|---|---|
committer | francis <francis> | 2008-09-04 08:52:38 +0000 |
commit | ba7e91453e1146a489fb10b126b656028fa2197a (patch) | |
tree | 6f100272d101bf446063f0de11c32903ce3a3b09 | |
parent | a48eb26f47c8f68e4a0a43afe274df78e54743c6 (diff) |
Patch from
http://rails.lighthouseapp.com/projects/8994/tickets/456-postgresql-name-in-create-database-is-not-properly-escaped
-rw-r--r-- | vendor/rails-2.1.0/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 6 |
1 files changed, 3 insertions, 3 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 4fe24d5e1..c577289aa 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 @@ -506,7 +506,7 @@ module ActiveRecord end end - execute "CREATE DATABASE #{name}#{option_string}" + execute "CREATE DATABASE \"#{name}#{option_string}\"" end # Drops a PostgreSQL database @@ -515,10 +515,10 @@ module ActiveRecord # drop_database 'matt_development' def drop_database(name) #:nodoc: if postgresql_version >= 80200 - execute "DROP DATABASE IF EXISTS #{quote_table_name(name)}" + execute "DROP DATABASE IF EXISTS \"#{quote_table_name(name)}\"" else begin - execute "DROP DATABASE #{quote_table_name(name)}" + execute "DROP DATABASE \"#{quote_table_name(name)}\"" rescue ActiveRecord::StatementInvalid @logger.warn "#{name} database doesn't exist." if @logger end |