From 48f1f149958bdced8304553d5147ac6d497e884d Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Wed, 28 Sep 2016 12:22:17 +0200
Subject: [PATCH] Rename MyBatis alias UserRole to UserPermission

---
 sonar-db/src/main/java/org/sonar/db/MyBatis.java             | 2 +-
 sonar-db/src/main/resources/org/sonar/db/user/RoleMapper.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sonar-db/src/main/java/org/sonar/db/MyBatis.java b/sonar-db/src/main/java/org/sonar/db/MyBatis.java
index ba781421ed7..d68b66bcef7 100644
--- a/sonar-db/src/main/java/org/sonar/db/MyBatis.java
+++ b/sonar-db/src/main/java/org/sonar/db/MyBatis.java
@@ -209,7 +209,7 @@ public class MyBatis {
     confBuilder.loadAlias("ScrapProperty", ScrapPropertyDto.class);
     confBuilder.loadAlias("Snapshot", SnapshotDto.class);
     confBuilder.loadAlias("UserGroup", UserGroupDto.class);
-    confBuilder.loadAlias("UserRole", UserPermissionDto.class);
+    confBuilder.loadAlias("UserPermission", UserPermissionDto.class);
     confBuilder.loadAlias("UserTokenCount", UserTokenCount.class);
     confBuilder.loadAlias("UserToken", UserTokenDto.class);
     confBuilder.loadAlias("User", UserDto.class);
diff --git a/sonar-db/src/main/resources/org/sonar/db/user/RoleMapper.xml b/sonar-db/src/main/resources/org/sonar/db/user/RoleMapper.xml
index 1c5b7b08735..30d46cff505 100644
--- a/sonar-db/src/main/resources/org/sonar/db/user/RoleMapper.xml
+++ b/sonar-db/src/main/resources/org/sonar/db/user/RoleMapper.xml
@@ -54,7 +54,7 @@
     VALUES (#{groupId}, #{resourceId}, #{role})
   </insert>
 
-  <insert id="insertUserRole" parameterType="UserRole" keyColumn="id" useGeneratedKeys="true" keyProperty="id">
+  <insert id="insertUserRole" parameterType="UserPermission" keyColumn="id" useGeneratedKeys="true" keyProperty="id">
     INSERT INTO user_roles (user_id, resource_id, role)
     VALUES (#{userId}, #{componentId}, #{permission})
   </insert>
-- 
2.39.5