From 02c060666c682141aa1647c434c5b0448bf83021 Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Tue, 3 Sep 2013 10:37:08 +0200 Subject: [PATCH] SONAR-4603, SONAR-4589 Update project query in dryRun DB factory --- .../sonar/core/persistence/DryRunDatabaseFactory.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DryRunDatabaseFactory.java b/sonar-core/src/main/java/org/sonar/core/persistence/DryRunDatabaseFactory.java index 8134c3d278e..979d956f482 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/DryRunDatabaseFactory.java +++ b/sonar-core/src/main/java/org/sonar/core/persistence/DryRunDatabaseFactory.java @@ -215,11 +215,12 @@ public class DryRunDatabaseFactory implements ServerComponent { .append("SELECT p.").append(returnOnlyIds ? "id" : "*") .append(" FROM projects p INNER JOIN snapshots s ON p.id = s.project_id") .append(" WHERE s.islast=").append(database.getDialect().getTrueSqlValue()) - .append(" AND (") - .append(" s.root_project_id=").append(projectId) - .append(" OR p.id=").append(projectId) - .append(" OR p.root_id=").append(projectId) - .append(" )").toString(); + .append(" AND s.root_project_id=").append(projectId) + .append(" UNION") + .append(" SELECT p.").append(returnOnlyIds ? "id" : "*") + .append(" FROM projects p") + .append(" WHERE p.id=").append(projectId) + .append(" OR p.root_id=").append(projectId).toString(); } private BasicDataSource create(String dialect, String driver, String user, String password, String url) { -- 2.39.5