[Title] fix remote db access for migrate

[Type] Bugfix
[Module] Toolchain /
[Priority] Minor
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

Change-Id: Ia6a525727e00e3f9c57d07806257c8d7654622e9

diff --git a/src/build_server/BuildServer.rb b/src/build_server/BuildServer.rb
index 3b80c4b11b42ab48ee6df0343d6ca1a8d446a513..cc903db15ab03d4b7d2769303ce8e1e59fc07bdd 100644 (file)
--- a/src/build_server/BuildServer.rb
+++ b/src/build_server/BuildServer.rb
@@ -557,7 +557,7 @@ class BuildServer
                        dsn = @db_dsn.split(':')
                        if dsn[2].nil? then
                                dsn[1].split(';').each do |attr|
-                                       case attr.split('=')[0].strip.eql? "database"
+                                       case attr.split('=')[0].strip
                                        when /database/i then
                                                name = attr.split('=')[1].strip
                                        when /host/i then
@@ -576,15 +576,22 @@ class BuildServer
                                name = dsn[1].strip
                                host = dsn[2].strip
                        end
+
+                       File.open("create_db.txt","w") do |f|
+                               f.puts "GRANT ALL ON #{name}.* TO '#{@db_user}'@'%' IDENTIFIED BY '#{@db_passwd}';"
+                               f.puts "CREATE DATABASE #{name};"
+                       end
+
                        if host.eql? "localhost" or host.eql? "127.0.0.1" then
-                               File.open("create_db.txt","w") do |f|
-                                       f.puts "GRANT ALL ON #{name}.* TO '#{@db_user}'@'#{host}' IDENTIFIED BY '#{@db_passwd}';"
-                                       f.puts "CREATE DATABASE #{name};"
-                               end
                                socket_str = ""
                                socket_str = "--socket=#{socket}" if not socket.nil?
                                puts "Mysql DB #{name} generating"
                                system("mysql -h #{host} #{socket_str} -u #{@db_user} --password=#{@db_passwd} < create_db.txt")
+                       else
+                               port_str = ""
+                               port_str = "-P #{port}" if not port.nil?
+                               puts "Mysql DB #{name} generating"
+                               system("mysql -h #{host} #{port_str} -u #{@db_user} --password=#{@db_passwd} < create_db.txt")
                        end
                else puts "not support DB #{@db_dsn}"
                end