This is an automated email from the ASF dual-hosted git repository. vnick pushed a change to branch staging/1.3.0 in repository https://gitbox.apache.org/repos/asf/guacamole-client.git.
from 61dce8b GUACAMOLE-1081: Merge correction to token modifier case within TokenFilter unit tests. add a37e0ac GUACAMOLE-1021: Refactor PostgreSQL queries to NOT duplicate results across related entities. add 349fc36 GUACAMOLE-1021: Refactor MySQL queries to NOT duplicate results across related entities. add 624d498 GUACAMOLE-1021: Refactor SQL Server queries to NOT duplicate results across related entities. new ada45ce GUACAMOLE-1021: Merge do not duplicate objects when permissions are inherited from multiple entities. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../auth/jdbc/connection/ConnectionMapper.xml | 83 +++++++++++-------- .../jdbc/connection/ConnectionRecordMapper.xml | 38 ++++----- .../jdbc/connectiongroup/ConnectionGroupMapper.xml | 96 +++++++++++++--------- .../permission/ConnectionGroupPermissionMapper.xml | 2 +- .../jdbc/permission/ConnectionPermissionMapper.xml | 2 +- .../permission/SharingProfilePermissionMapper.xml | 2 +- .../jdbc/permission/UserGroupPermissionMapper.xml | 2 +- .../auth/jdbc/permission/UserPermissionMapper.xml | 2 +- .../jdbc/sharingprofile/SharingProfileMapper.xml | 57 ++++++++----- .../apache/guacamole/auth/jdbc/user/UserMapper.xml | 65 ++++++++++----- .../auth/jdbc/user/UserParentUserGroupMapper.xml | 13 ++- .../guacamole/auth/jdbc/user/UserRecordMapper.xml | 20 ++--- .../auth/jdbc/usergroup/UserGroupMapper.xml | 65 ++++++++++----- .../usergroup/UserGroupMemberUserGroupMapper.xml | 13 ++- .../jdbc/usergroup/UserGroupMemberUserMapper.xml | 13 ++- .../usergroup/UserGroupParentUserGroupMapper.xml | 13 ++- .../auth/jdbc/connection/ConnectionMapper.xml | 83 +++++++++++-------- .../jdbc/connection/ConnectionRecordMapper.xml | 38 ++++----- .../jdbc/connectiongroup/ConnectionGroupMapper.xml | 96 +++++++++++++--------- .../permission/ConnectionGroupPermissionMapper.xml | 2 +- .../jdbc/permission/ConnectionPermissionMapper.xml | 2 +- .../permission/SharingProfilePermissionMapper.xml | 2 +- .../jdbc/permission/UserGroupPermissionMapper.xml | 2 +- .../auth/jdbc/permission/UserPermissionMapper.xml | 2 +- .../jdbc/sharingprofile/SharingProfileMapper.xml | 57 ++++++++----- .../apache/guacamole/auth/jdbc/user/UserMapper.xml | 65 ++++++++++----- .../auth/jdbc/user/UserParentUserGroupMapper.xml | 13 ++- .../guacamole/auth/jdbc/user/UserRecordMapper.xml | 21 +++-- .../auth/jdbc/usergroup/UserGroupMapper.xml | 65 ++++++++++----- .../usergroup/UserGroupMemberUserGroupMapper.xml | 13 ++- .../jdbc/usergroup/UserGroupMemberUserMapper.xml | 13 ++- .../usergroup/UserGroupParentUserGroupMapper.xml | 13 ++- .../auth/jdbc/connection/ConnectionMapper.xml | 83 +++++++++++-------- .../jdbc/connection/ConnectionRecordMapper.xml | 38 ++++----- .../jdbc/connectiongroup/ConnectionGroupMapper.xml | 96 +++++++++++++--------- .../permission/ConnectionGroupPermissionMapper.xml | 2 +- .../jdbc/permission/ConnectionPermissionMapper.xml | 2 +- .../permission/SharingProfilePermissionMapper.xml | 2 +- .../jdbc/permission/UserGroupPermissionMapper.xml | 2 +- .../auth/jdbc/permission/UserPermissionMapper.xml | 2 +- .../jdbc/sharingprofile/SharingProfileMapper.xml | 57 ++++++++----- .../apache/guacamole/auth/jdbc/user/UserMapper.xml | 65 ++++++++++----- .../auth/jdbc/user/UserParentUserGroupMapper.xml | 13 ++- .../guacamole/auth/jdbc/user/UserRecordMapper.xml | 20 ++--- .../auth/jdbc/usergroup/UserGroupMapper.xml | 65 ++++++++++----- .../usergroup/UserGroupMemberUserGroupMapper.xml | 13 ++- .../jdbc/usergroup/UserGroupMemberUserMapper.xml | 13 ++- .../usergroup/UserGroupParentUserGroupMapper.xml | 13 ++- 48 files changed, 862 insertions(+), 597 deletions(-)