You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2018/03/13 19:49:39 UTC
[1/2] guacamole-client git commit: GUACAMOLE-505: Remove stray left
join in SQL Server UserMapper.
Repository: guacamole-client
Updated Branches:
refs/heads/master b8a5f0bd2 -> a6579ce4e
GUACAMOLE-505: Remove stray left join in SQL Server UserMapper.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/d3dcd843
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/d3dcd843
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/d3dcd843
Branch: refs/heads/master
Commit: d3dcd84379eb0c49b2af5341215c5784ac4ed628
Parents: b8a5f0b
Author: Nick Couchman <vn...@apache.org>
Authored: Tue Mar 13 10:47:31 2018 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Tue Mar 13 10:47:31 2018 -0400
----------------------------------------------------------------------
.../org/apache/guacamole/auth/jdbc/user/UserMapper.xml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/d3dcd843/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/user/UserMapper.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/user/UserMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/user/UserMapper.xml
index e9c5b02..177ab93 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/user/UserMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/user/UserMapper.xml
@@ -176,8 +176,8 @@
resultSets="users,arbitraryAttributes">
SELECT
- [guacamole_user].user_id,
- [guacamole_user].username,
+ user_id,
+ username,
password_hash,
password_salt,
password_date,
@@ -198,7 +198,6 @@
WHERE [guacamole_user_history].user_id = [guacamole_user].user_id
) AS last_active
FROM [guacamole_user]
- LEFT JOIN [guacamole_user_history] ON [guacamole_user_history].user_id = [guacamole_user].user_id
WHERE
[guacamole_user].username = #{username,jdbcType=VARCHAR};
[2/2] guacamole-client git commit: GUACAMOLE-505: Merge changes
fixing the behavior SQL Server version of the "selectOne" query for retrieval
of user account information (the query must return at most one row).
Posted by mj...@apache.org.
GUACAMOLE-505: Merge changes fixing the behavior SQL Server version of the "selectOne" query for retrieval of user account information (the query must return at most one row).
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/a6579ce4
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/a6579ce4
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/a6579ce4
Branch: refs/heads/master
Commit: a6579ce4e1c70ea436fa1acc26a9ce2bb1e7fe84
Parents: b8a5f0b d3dcd84
Author: Michael Jumper <mj...@apache.org>
Authored: Tue Mar 13 12:47:10 2018 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue Mar 13 12:47:10 2018 -0700
----------------------------------------------------------------------
.../org/apache/guacamole/auth/jdbc/user/UserMapper.xml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------