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 0b709f8d45d1c6ba4f90500618354f50894cb7a5..610ba3267093929baf0ba0ea626e4485a028d33c 100644 (file)
--- 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 684bdd2efada6ab1f4ce30329993a2fa01174f07..4071f72247bd6055af4da1209fa24b9ac82ed3f8 100644 (file)
--- 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>