From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Mon, 19 Nov 2012 20:40:55 +0000 (+0100)
Subject: SONAR-3889 fix compatibility with PostgreSQL
X-Git-Tag: 3.4~322
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=505c913789ff8004139c90cd859192599cff226a;p=sonarqube.git

SONAR-3889 fix compatibility with PostgreSQL
---

diff --git a/sonar-core/src/main/java/org/sonar/core/user/AuthorDao.java b/sonar-core/src/main/java/org/sonar/core/user/AuthorDao.java
index 0b709f8d45d..610ba326709 100644
--- a/sonar-core/src/main/java/org/sonar/core/user/AuthorDao.java
+++ b/sonar-core/src/main/java/org/sonar/core/user/AuthorDao.java
@@ -63,6 +63,7 @@ public class AuthorDao implements BatchComponent, ServerComponent {
       session.commit();
     } catch (RuntimeException e) {
       // break the unique index on LOGIN ?
+      session.rollback();
       AuthorDto persistedAuthor = mapper.selectByLogin(authorDto.getLogin());
       if (persistedAuthor != null) {
         authorDto.setId(persistedAuthor.getId());
diff --git a/sonar-core/src/main/resources/org/sonar/core/user/AuthorMapper.xml b/sonar-core/src/main/resources/org/sonar/core/user/AuthorMapper.xml
index 684bdd2efad..4071f72247b 100644
--- a/sonar-core/src/main/resources/org/sonar/core/user/AuthorMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/user/AuthorMapper.xml
@@ -4,7 +4,7 @@
 <mapper namespace="org.sonar.core.user.AuthorMapper">
 
   <select id="selectByLogin" parameterType="string" resultType="Author">
-    SELECT id, person_id AS "personId", login, created_at AS "createdAt", updated_at AS "updatedAt"
+    SELECT id, person_id AS personId, login, created_at AS createdAt, updated_at AS updatedAt
     FROM authors WHERE login=#{id}
   </select>