[Title] reduce db access

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

Change-Id: I2d28a307d4b2a40a766dc496775eae9c10a0e40a

diff --git a/src/build_server/CommonProject.rb b/src/build_server/CommonProject.rb
index 7c639b51d6fe006bf0d4d074977650e2b3fbc320..25e42babf046060142791bb59d58cd0af7e748cd 100644 (file)
--- a/src/build_server/CommonProject.rb
+++ b/src/build_server/CommonProject.rb
@@ -203,10 +203,8 @@ class CommonProject
 
        protected
        def self.load_row(name, dist_name, db)
-               row = db.select_one("SELECT * FROM distributions WHERE name='#{dist_name}'")
-               if row.nil? then return nil end
-               dist_id = row['id']
-               row = db.select_one("SELECT * FROM projects WHERE name='#{name}' and distribution_id=#{dist_id}")
+               row = db.select_one("SELECT projects.* FROM projects,distributions WHERE projects.name='#{name}' and 
+                                                       projects.distribution_id=distribuitons.id and distributions.name='#{dist_name}'")
                if row.nil? then return nil end
 
                # get supported_os
@@ -336,10 +334,7 @@ class CommonProject
 
        public
        def self.get_project_row(name, dist_name, db)
-               row = db.select_one("SELECT * FROM distributions WHERE name='#{dist_name}'")
-               dist_id = row['id']
-               row = db.select_one("SELECT * FROM projects WHERE name='#{name}' and distribution_id=#{dist_id}")
-               return row
+               return db.select_one("SELECT * FROM projects WHERE name='#{name}' AND distribution_id=(SELECT id FROM distributions WHERE name='#{dist_name}')")
        end
 
        public