GUACAMOLE-394: Disambiguate "user_id" column, now that connection query joins the connection history table.

This commit is contained in:
Michael Jumper committed 2017-12-11 23:51:57 -08:00
1 parent 28e7d215ac
commit 58054719b3
3 files changed
+3 -3

No files matched your search

@@ -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;
@@ -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;
@@ -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;