diff options
| author | Marcel Molina <marcel@vernix.org> | 2006-01-13 01:58:11 +0000 |
|---|---|---|
| committer | Marcel Molina <marcel@vernix.org> | 2006-01-13 01:58:11 +0000 |
| commit | 1e2b3d8b5a37e70134cf4dd05f6ff9e6d19bb0eb (patch) | |
| tree | af8ac99af865e562b64230e7892bcf9147e70e04 | |
| parent | f1a01c80dba9dd6545063d8f66ec299ea8f33b8c (diff) | |
| download | rails-1e2b3d8b5a37e70134cf4dd05f6ff9e6d19bb0eb.tar.gz rails-1e2b3d8b5a37e70134cf4dd05f6ff9e6d19bb0eb.tar.bz2 rails-1e2b3d8b5a37e70134cf4dd05f6ff9e6d19bb0eb.zip | |
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
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 4 |
2 files changed, 4 insertions, 2 deletions
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 |