1 files changed, 8 insertions, 6 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index 9b8815e..0fabd17 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -26,6 +26,8 @@
 #
 
 class Project < ActiveRecord::Base
+  extend Model
+
   include ProjectStatus
 
   has_many :commits, ->() { order('CASE WHEN commits.committed_at IS NULL THEN 0 ELSE 1 END', :committed_at, :id) }, dependent: :destroy
@@ -105,19 +107,19 @@ ls -la
     end
 
     def unassigned(runner)
-      joins('LEFT JOIN runner_projects ON runner_projects.project_id = projects.id ' \
-        "AND runner_projects.runner_id = #{runner.id}").
-      where('runner_projects.project_id' => nil)
+      joins('LEFT JOIN ci_runner_projects ON ci_runner_projects.project_id = ci_projects.id ' \
+        "AND ci_runner_projects.runner_id = #{runner.id}").
+      where('ci_runner_projects.project_id' => nil)
     end
 
     def ordered_by_last_commit_date
-      last_commit_subquery = "(SELECT project_id, MAX(committed_at) committed_at FROM commits GROUP BY project_id)"
-      joins("LEFT JOIN #{last_commit_subquery} AS last_commit ON projects.id = last_commit.project_id").
+      last_commit_subquery = "(SELECT project_id, MAX(committed_at) committed_at FROM ci_commits GROUP BY project_id)"
+      joins("LEFT JOIN #{last_commit_subquery} AS last_commit ON ci_projects.id = last_commit.project_id").
         order("CASE WHEN last_commit.committed_at IS NULL THEN 1 ELSE 0 END, last_commit.committed_at DESC")
     end
 
     def search(query)
-      where('LOWER(projects.name) LIKE :query',
+      where('LOWER(ci_projects.name) LIKE :query',
             query: "%#{query.try(:downcase)}%")
     end
   end