From 1e2b3d8b5a37e70134cf4dd05f6ff9e6d19bb0eb Mon Sep 17 00:00:00 2001 From: Marcel Molina Date: Fri, 13 Jan 2006 01:58:11 +0000 Subject: Escape database name in MySQL adapter when creating and dropping databases. Closes #3409. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3403 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/CHANGELOG | 2 ++ activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'activerecord') diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 9a05c30b4c..79557bbf13 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Escape database name in MySQL adapter when creating and dropping databases. #3409 [anna@wota.jp] + * Disambiguate table names for columns in validates_uniquness_of's WHERE clause. #3423 [alex.borovsky@gmail.com] * .with_scope imposed create parameters now bypass attr_protected [Tobias Luetke] diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb index 4cc08c01ae..6c768cb9f6 100755 --- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb @@ -243,11 +243,11 @@ module ActiveRecord end def create_database(name) #:nodoc: - execute "CREATE DATABASE #{name}" + execute "CREATE DATABASE `#{name}`" end def drop_database(name) #:nodoc: - execute "DROP DATABASE IF EXISTS #{name}" + execute "DROP DATABASE IF EXISTS `#{name}`" end -- cgit v1.2.3