[Title] remote build server load_all method aware host_os_name

[Type] Enhancement
[Module] Toolchain /
[Priority] Major
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

Change-Id: I5b913d77b9f0356f05c3a66e60c928cf54dc3912

diff --git a/src/build_server/RemoteBuildServer.rb b/src/build_server/RemoteBuildServer.rb
index 355f0fbb8177e44c332d8f8004cb58b8ad96686c..b038be109e91803f360ccfaa01235cb52e127c40 100644 (file)
--- a/src/build_server/RemoteBuildServer.rb
+++ b/src/build_server/RemoteBuildServer.rb
@@ -211,7 +211,9 @@ class RemoteBuildServer
 
        def self.load_all(db)
                result = []
-               rows = db.select_all("SELECT *,\"\" as host_os_name FROM remote_build_servers")
+               rows = db.select_all("SELECT *,'' as host_os_name FROM remote_build_servers WHERE supported_os_id IS NULL
+                                                        UNION ALL
+                                                        SELECT remote_build_servers.*, supported_os.name as host_os_name FROM remote_build_servers, supported_os WHERE remote_build_servers.supported_os_id = supported_os.id")
                rows.each do |row|
                        result.push load_row(row)
                end