From 9bebcfba20d194bc01d59f47d94c5ee1ce0cf2fe Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Fri, 12 Sep 2014 10:47:20 +0200
Subject: [PATCH] SONAR-5561 Fix query on Oracle

---
 .../server/issue/db/IssueAuthorizationDao.java | 12 ++++++------
 .../issue/db/IssueAuthorizationDaoTest.java    |  2 +-
 .../core/issue/db/IssueAuthorizationMapper.xml | 18 +++++++++++++-----
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/db/IssueAuthorizationDao.java b/server/sonar-server/src/main/java/org/sonar/server/issue/db/IssueAuthorizationDao.java
index ba3eb90f954..a222720e1ce 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/db/IssueAuthorizationDao.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/db/IssueAuthorizationDao.java
@@ -69,9 +69,9 @@ public class IssueAuthorizationDao extends BaseDao<IssueAuthorizationMapper, Iss
       public void handleResult(ResultContext context) {
         Map<String, Object> row = (Map<String, Object>) context.getResultObject();
         String project = (String) row.get("project");
-        String user = (String) row.get("user");
-        String group = (String) row.get("permission_group");
-        Date updatedAt = (Date) row.get("updated_at");
+        String user = (String) row.get("permissionUser");
+        String group = (String) row.get("permissionGroup");
+        Date updatedAt = (Date) row.get("updatedAt");
         IssueAuthorizationDto issueAuthorizationDto = authorizationDtoMap.get(project);
         if (issueAuthorizationDto == null) {
           issueAuthorizationDto = new IssueAuthorizationDto()
@@ -119,9 +119,9 @@ public class IssueAuthorizationDao extends BaseDao<IssueAuthorizationMapper, Iss
     List<Map<String, Object>> rows = session.selectList("org.sonar.core.issue.db.IssueAuthorizationMapper.selectAfterDate", params);
     for (Map<String, Object> row : rows) {
       String project = (String) row.get("project");
-      String user = (String) row.get("user");
-      String group = (String) row.get("permission_group");
-      Date updatedAt = (Date) row.get("updated_at");
+      String user = (String) row.get("permissionUser");
+      String group = (String) row.get("permissionGroup");
+      Date updatedAt = (Date) row.get("updatedAt");
       IssueAuthorizationDto issueAuthorizationDto = authorizationDtoMap.get(project);
       if (issueAuthorizationDto == null) {
         issueAuthorizationDto = new IssueAuthorizationDto()
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/db/IssueAuthorizationDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/db/IssueAuthorizationDaoTest.java
index c8fe6f25142..82d5c732450 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/db/IssueAuthorizationDaoTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/db/IssueAuthorizationDaoTest.java
@@ -67,7 +67,7 @@ public class IssueAuthorizationDaoTest extends AbstractDaoTestCase {
     assertThat(dto.getPermission()).isEqualTo("user");
     assertThat(dto.getGroups()).containsExactly("Anyone", "devs");
     assertThat(dto.getUsers()).containsExactly("user1");
-    assertThat(dto.getUpdatedAt()).isNotNull();
+    assertThat(dto.getUpdatedAt()).isEqualTo(DateUtils.parseDate("2014-01-01"));
   }
 
   @Test
diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueAuthorizationMapper.xml b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueAuthorizationMapper.xml
index e516c13ec39..fe8b5b3981b 100644
--- a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueAuthorizationMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueAuthorizationMapper.xml
@@ -4,13 +4,21 @@
 
 <mapper namespace="org.sonar.core.issue.db.IssueAuthorizationMapper">
 
-  <select id="selectAfterDate" parameterType="map" resultType="map">
+  <resultMap id="resultMap" type="map">
+    <result property="project" column="project" />
+    <result property="permissionUser" column="permissionUser"/>
+    <result property="permissionGroup" column="permissionGroup"/>
+    <result property="permissionRole" column="permissionRole"/>
+    <result property="updatedAt" column="updatedAt" javaType="java.util.Date"/>
+  </resultMap>
+
+  <select id="selectAfterDate" parameterType="map" resultMap="resultMap">
     SELECT
       project_authorization.project as "project",
-      project_authorization.login as "user",
-      project_authorization.permission_group as "permission_group",
-      project_authorization.permission_role as "permission_role",
-      project_authorization.updated_at as "updated_at"
+      project_authorization.login as "permissionUser",
+      project_authorization.permission_group as "permissionGroup",
+      project_authorization.permission_role as "permissionRole",
+      project_authorization.updated_at as "updatedAt"
     FROM (
       -- users
       SELECT
-- 
2.39.5