Changeset 88

Show
Ignore:
Timestamp:
06/21/07 14:37:08 (2 years ago)
Author:
mbailey
Message:

bugfix: display correct username
bugfix: don't fail is database already exists

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1-7-stable/lib/deprec/third_party/railsmachine/recipes/mysql.rb

    r72 r88  
    66   
    77  def execute(sql, user) 
    8     run "mysql --user=root -p --execute=\"#{sql}\"" do |channel, stream, data| 
     8    user = 'root' 
     9    run "mysql --user=#{user} -p --execute=\"#{sql}\"" do |channel, stream, data| 
    910      handle_mysql_password(user, channel, stream, data) 
    1011    end 
    …… 
    4950    read_config 
    5051     
    51     sql = "CREATE DATABASE #{db_name};" 
     52    sql = "CREATE DATABASE IF NOT EXISTS #{db_name};" 
    5253    sql += "GRANT ALL PRIVILEGES ON #{db_name}.* TO #{db_user}@localhost IDENTIFIED BY '#{db_password}';"   
    5354    mysql.execute sql, mysql_admin