diff options
| author | Simon Brandhof <simon.brandhof@gmail.com> | 2013-06-29 17:55:18 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@gmail.com> | 2013-06-29 17:55:18 +0200 |
| commit | 70b6abe27893c2bef042cce311e0e4d90654e23f (patch) | |
| tree | 11c0638e94a47b27be61e54fd6ee55e36c01d004 /sonar-core | |
| parent | a740c7f2fa413287f04d9f53e9dfb5f1d707a396 (diff) | |
| download | sonarqube-70b6abe27893c2bef042cce311e0e4d90654e23f.tar.gz sonarqube-70b6abe27893c2bef042cce311e0e4d90654e23f.zip | |
Fix SQL requests on Oracle and SQLServer
Diffstat (limited to 'sonar-core')
| -rw-r--r-- | sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml | 1 | ||||
| -rw-r--r-- | sonar-core/src/main/resources/org/sonar/core/user/RoleMapper.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml index 61ef848f10f..575f3d92e02 100644 --- a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml @@ -237,6 +237,7 @@ <when test="returnOnlyIdAndSortColumns == true"> i.id <include refid="sortColumn"/> + from issues i </when> <otherwise> <include refid="issueColumns"/> diff --git a/sonar-core/src/main/resources/org/sonar/core/user/RoleMapper.xml b/sonar-core/src/main/resources/org/sonar/core/user/RoleMapper.xml index 1d2c7bf584f..1a267371a9b 100644 --- a/sonar-core/src/main/resources/org/sonar/core/user/RoleMapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/user/RoleMapper.xml @@ -97,7 +97,7 @@ INNER JOIN group_roles AS gr ON gr.group_id = gu.group_id INNER JOIN groups AS g ON g.id = gu.group_id WHERE (ur.role = 'admin' AND ur.resource_id IS NULL) OR (gr.role = 'admin' AND gr.resource_id IS NULL) - AND u.active = TRUE + AND u.active = ${_true} <if test="groupName != null"> AND g.name != #{groupName} </if> |