incubator-olio-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sha...@apache.org
Subject svn commit: r979947 - /incubator/olio/webapp/rails/trunk/db/migrate/024_populate_geolocations.rb
Date Wed, 28 Jul 2010 04:00:45 GMT
Author: shanti
Date: Wed Jul 28 04:00:44 2010
New Revision: 979947

URL: http://svn.apache.org/viewvc?rev=979947&view=rev
Log:
Fix for OLIO-147. Added -p option to mysql. Patch provided by Xavier Dutreilh

Modified:
    incubator/olio/webapp/rails/trunk/db/migrate/024_populate_geolocations.rb

Modified: incubator/olio/webapp/rails/trunk/db/migrate/024_populate_geolocations.rb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/db/migrate/024_populate_geolocations.rb?rev=979947&r1=979946&r2=979947&view=diff
==============================================================================
--- incubator/olio/webapp/rails/trunk/db/migrate/024_populate_geolocations.rb (original)
+++ incubator/olio/webapp/rails/trunk/db/migrate/024_populate_geolocations.rb Wed Jul 28 04:00:44
2010
@@ -20,7 +20,7 @@ class PopulateGeolocations < ActiveRecor
     r = Rails::Configuration.new
     y = YAML::load_file(r.database_configuration_file)    
     if y[RAILS_ENV.to_s]["adapter"] == "mysql"
-      system "mysql -u #{y[RAILS_ENV.to_s]["username"]} -D #{y[RAILS_ENV.to_s]["database"]}
< ./db/migrate/geolocations.sql"
+      system "mysql -u #{y[RAILS_ENV.to_s]["username"]} -p#{y[RAILS_ENV.to_s]["password"]}
-D #{y[RAILS_ENV.to_s]["database"]} < ./db/migrate/geolocations.sql"
     #elsif y[RAILS_ENV.to_s]["adapter"] == "sqlite2"
       # Handle SQLite2
     #elsif y[RAILS_ENV.to_s]["adapter"] == "sqlite3"



Mime
View raw message