GUACAMOLE-394: Disambiguate "user_id" column, now that connection query joins the connection history table.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/58054719 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/58054719 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/58054719 Branch: refs/heads/master Commit: 58054719b3949d6407bbeaa872e423077458d7a1 Parents: 28e7d21 Author: Michael Jumper <[email protected]> Authored: Mon Sep 18 11:56:14 2017 -0700 Committer: Michael Jumper <[email protected]> Committed: Mon Dec 11 23:51:57 2017 -0800 ---------------------------------------------------------------------- .../org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml | 2 +- .../org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml | 2 +- .../org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/58054719/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml index 7c20935..cbffdd4 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml @@ -146,7 +146,7 @@ open="(" separator="," close=")"> #{identifier,jdbcType=VARCHAR} </foreach> - AND user_id = #{user.objectID,jdbcType=INTEGER} + AND guacamole_connection_permission.user_id = #{user.objectID,jdbcType=INTEGER} AND permission = 'READ' GROUP BY guacamole_connection.connection_id; http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/58054719/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml index b9356b0..dc8fdd4 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml @@ -146,7 +146,7 @@ open="(" separator="," close=")"> #{identifier,jdbcType=INTEGER}::integer </foreach> - AND user_id = #{user.objectID,jdbcType=INTEGER} + AND guacamole_connection_permission.user_id = #{user.objectID,jdbcType=INTEGER} AND permission = 'READ' GROUP BY guacamole_connection.connection_id; http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/58054719/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml index b31b45f..7e0e7fd 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml @@ -146,7 +146,7 @@ open="(" separator="," close=")"> #{identifier,jdbcType=INTEGER} </foreach> - AND user_id = #{user.objectID,jdbcType=INTEGER} + AND [guacamole_connection_permission].user_id = #{user.objectID,jdbcType=INTEGER} AND permission = 'READ' GROUP BY [guacamole_connection].connection_id;
