http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/66c4b86b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/user/PasswordRecordMapper.xml ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/user/PasswordRecordMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/user/PasswordRecordMapper.xml index 9ad67a6..a9f44e6 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/user/PasswordRecordMapper.xml +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/user/PasswordRecordMapper.xml @@ -35,16 +35,16 @@ <select id="select" resultMap="PasswordRecordResultMap"> SELECT - [guacamole].[user_password_history].user_id, - [guacamole].[user_password_history].password_hash, - [guacamole].[user_password_history].password_salt, - [guacamole].[user_password_history].password_date - FROM [guacamole].[user_password_history] - JOIN [guacamole].[user] ON [guacamole].[user_password_history].user_id = [guacamole].[user].user_id + [dbo].[guacamole_user_password_history].user_id, + [dbo].[guacamole_user_password_history].password_hash, + [dbo].[guacamole_user_password_history].password_salt, + [dbo].[guacamole_user_password_history].password_date + FROM [dbo].[guacamole_user_password_history] + JOIN [dbo].[guacamole_user] ON [dbo].[guacamole_user_password_history].user_id = [dbo].[guacamole_user].user_id WHERE - [guacamole].[user].username = #{username,jdbcType=VARCHAR} + [dbo].[guacamole_user].username = #{username,jdbcType=VARCHAR} ORDER BY - [guacamole].[user_password_history].password_date DESC + [dbo].[guacamole_user_password_history].password_date DESC LIMIT #{maxHistorySize} </select> @@ -52,7 +52,7 @@ <!-- Insert the given password record --> <insert id="insert" parameterType="org.apache.guacamole.auth.jdbc.user.PasswordRecordModel"> - INSERT INTO [guacamole].[user_password_history] ( + INSERT INTO [dbo].[guacamole_user_password_history] ( user_id, password_hash, password_salt, @@ -65,10 +65,10 @@ #{record.passwordDate,jdbcType=TIMESTAMP} ); - DELETE FROM [guacamole].[user_password_history] + DELETE FROM [dbo].[guacamole_user_password_history] WHERE password_history_id IN ( SELECT password_history_id - FROM [guacamole].[user_password_history] + FROM [dbo].[guacamole_user_password_history] WHERE user_id = #{record.userID,jdbcType=INTEGER} ORDER BY password_date DESC OFFSET #{maxHistorySize}
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/66c4b86b/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 a4ceea7..465ef20 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 @@ -46,16 +46,16 @@ <!-- Select all usernames --> <select id="selectIdentifiers" resultType="string"> SELECT username - FROM [guacamole].[user] + FROM [dbo].[guacamole_user] </select> <!-- Select usernames of all readable users --> <select id="selectReadableIdentifiers" resultType="string"> SELECT username - FROM [guacamole].[user] - JOIN [guacamole].[user_permission] ON affected_user_id = [guacamole].[user].user_id + FROM [dbo].[guacamole_user] + JOIN [dbo].[guacamole_user_permission] ON affected_user_id = [dbo].[guacamole_user].user_id WHERE - [guacamole].[user_permission].user_id = #{user.objectID,jdbcType=INTEGER} + [dbo].[guacamole_user_permission].user_id = #{user.objectID,jdbcType=INTEGER} AND permission = 'READ' </select> @@ -79,7 +79,7 @@ email_address, organization, organizational_role - FROM [guacamole].[user] + FROM [dbo].[guacamole_user] WHERE username IN <foreach collection="identifiers" item="identifier" open="(" separator="," close=")"> @@ -92,7 +92,7 @@ <select id="selectReadable" resultMap="UserResultMap"> SELECT - [guacamole].[user].user_id, + [dbo].[guacamole_user].user_id, username, password_hash, password_salt, @@ -108,14 +108,14 @@ email_address, organization, organizational_role - FROM [guacamole].[user] - JOIN [guacamole].[user_permission] ON affected_user_id = [guacamole].[user].user_id + FROM [dbo].[guacamole_user] + JOIN [dbo].[guacamole_user_permission] ON affected_user_id = [dbo].[guacamole_user].user_id WHERE username IN <foreach collection="identifiers" item="identifier" open="(" separator="," close=")"> #{identifier,jdbcType=VARCHAR} </foreach> - AND [guacamole].[user_permission].user_id = #{user.objectID,jdbcType=INTEGER} + AND [dbo].[guacamole_user_permission].user_id = #{user.objectID,jdbcType=INTEGER} AND permission = 'READ' </select> @@ -140,7 +140,7 @@ email_address, organization, organizational_role - FROM [guacamole].[user] + FROM [dbo].[guacamole_user] WHERE username = #{username,jdbcType=VARCHAR} @@ -148,7 +148,7 @@ <!-- Delete single user by username --> <delete id="delete"> - DELETE FROM [guacamole].[user] + DELETE FROM [dbo].[guacamole_user] WHERE username = #{identifier,jdbcType=VARCHAR} </delete> @@ -156,7 +156,7 @@ <insert id="insert" useGeneratedKeys="true" keyProperty="object.objectID" parameterType="org.apache.guacamole.auth.jdbc.user.UserModel"> - INSERT INTO [guacamole].[user] ( + INSERT INTO [dbo].[guacamole_user] ( username, password_hash, password_salt, @@ -195,7 +195,7 @@ <!-- Update single user --> <update id="update" parameterType="org.apache.guacamole.auth.jdbc.user.UserModel"> - UPDATE [guacamole].[user] + UPDATE [dbo].[guacamole_user] SET password_hash = #{object.passwordHash,jdbcType=BINARY}, password_salt = #{object.passwordSalt,jdbcType=BINARY}, password_date = #{object.passwordDate,jdbcType=TIMESTAMP},
