You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@guacamole.apache.org by necouchman <gi...@git.apache.org> on 2018/03/13 22:02:31 UTC
[GitHub] guacamole-client pull request #264: GUACAMOLE-525: Fix issues with SQL Serve...
GitHub user necouchman opened a pull request:
https://github.com/apache/guacamole-client/pull/264
GUACAMOLE-525: Fix issues with SQL Server compatibility
Fixes a couple of issues reported with SQL Server compatibility and the lack of support for the LIMIT keyword.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/necouchman/guacamole-client jira/525
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/guacamole-client/pull/264.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #264
----
commit cb580c4ae99fb8ff21618d9117aee9f22bf6e3ff
Author: Nick Couchman <vn...@...>
Date: 2018-03-13T21:47:35Z
GUACAMOLE-525: Remove LIMIT and use TOP in SQL Server module.
commit 62a706896ae7cd788337128a4cbc95db763ada9d
Author: Nick Couchman <vn...@...>
Date: 2018-03-13T21:58:54Z
GUACAMOLE-525: Fix up password history delete to be more compatible.
----
---
[GitHub] guacamole-client pull request #264: GUACAMOLE-525: Fix issues with SQL Serve...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/guacamole-client/pull/264
---
[GitHub] guacamole-client pull request #264: GUACAMOLE-525: Fix issues with SQL Serve...
Posted by necouchman <gi...@git.apache.org>.
Github user necouchman commented on a diff in the pull request:
https://github.com/apache/guacamole-client/pull/264#discussion_r174303456
--- Diff: extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/user/PasswordRecordMapper.xml ---
@@ -66,12 +65,11 @@
);
DELETE FROM [guacamole_user_password_history]
- WHERE password_history_id IN (
- SELECT password_history_id
+ WHERE password_history_id NOT IN (
--- End diff --
Ummm...yes. Probably not the behavior we want.
---
[GitHub] guacamole-client pull request #264: GUACAMOLE-525: Fix issues with SQL Serve...
Posted by necouchman <gi...@git.apache.org>.
Github user necouchman commented on a diff in the pull request:
https://github.com/apache/guacamole-client/pull/264#discussion_r174318995
--- Diff: extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/user/PasswordRecordMapper.xml ---
@@ -66,12 +65,11 @@
);
DELETE FROM [guacamole_user_password_history]
- WHERE password_history_id IN (
- SELECT password_history_id
+ WHERE password_history_id NOT IN (
--- End diff --
> I think I see what you're trying to do here now. Maybe needs an AND user_id = #{record.userID,jdbcType=INTEGER} at the level of the outer select?
Yep! Commit coming right up...
---
[GitHub] guacamole-client pull request #264: GUACAMOLE-525: Fix issues with SQL Serve...
Posted by necouchman <gi...@git.apache.org>.
Github user necouchman commented on a diff in the pull request:
https://github.com/apache/guacamole-client/pull/264#discussion_r174339121
--- Diff: extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/user/PasswordRecordMapper.xml ---
@@ -66,12 +65,11 @@
);
DELETE FROM [guacamole_user_password_history]
- WHERE password_history_id IN (
- SELECT password_history_id
+ WHERE password_history_id NOT IN (
--- End diff --
Should be fixed.
---
[GitHub] guacamole-client pull request #264: GUACAMOLE-525: Fix issues with SQL Serve...
Posted by mike-jumper <gi...@git.apache.org>.
Github user mike-jumper commented on a diff in the pull request:
https://github.com/apache/guacamole-client/pull/264#discussion_r174302432
--- Diff: extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/user/PasswordRecordMapper.xml ---
@@ -66,12 +65,11 @@
);
DELETE FROM [guacamole_user_password_history]
- WHERE password_history_id IN (
- SELECT password_history_id
+ WHERE password_history_id NOT IN (
--- End diff --
I think I see what you're trying to do here now. Maybe needs an `AND user_id = #{record.userID,jdbcType=INTEGER}` at the level of the outer select?
---
[GitHub] guacamole-client pull request #264: GUACAMOLE-525: Fix issues with SQL Serve...
Posted by mike-jumper <gi...@git.apache.org>.
Github user mike-jumper commented on a diff in the pull request:
https://github.com/apache/guacamole-client/pull/264#discussion_r174300331
--- Diff: extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/user/PasswordRecordMapper.xml ---
@@ -66,12 +65,11 @@
);
DELETE FROM [guacamole_user_password_history]
- WHERE password_history_id IN (
- SELECT password_history_id
+ WHERE password_history_id NOT IN (
--- End diff --
Won't this now delete password history for all other users?
---