diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.xml
index 2211da069..249ca6e78 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.xml
@@ -54,7 +54,7 @@
SELECT connection_id
FROM guacamole_connection
WHERE
- parent_id = #{parentIdentifier,jdbcType=VARCHAR}
+ parent_id = #{parentIdentifier,jdbcType=INTEGER}
parent_id IS NULL
@@ -64,7 +64,7 @@
FROM guacamole_connection
JOIN guacamole_connection_permission ON guacamole_connection_permission.connection_id = guacamole_connection.connection_id
WHERE
- parent_id = #{parentIdentifier,jdbcType=VARCHAR}
+ parent_id = #{parentIdentifier,jdbcType=INTEGER}
parent_id IS NULL
AND user_id = #{user.objectID,jdbcType=INTEGER}
AND permission = 'READ'
@@ -82,7 +82,7 @@
WHERE connection_id IN
- #{identifier,jdbcType=VARCHAR}
+ #{identifier,jdbcType=INTEGER}
@@ -100,7 +100,7 @@
WHERE guacamole_connection.connection_id IN
- #{identifier,jdbcType=VARCHAR}
+ #{identifier,jdbcType=INTEGER}
AND user_id = #{user.objectID,jdbcType=INTEGER}
AND permission = 'READ'
@@ -117,7 +117,7 @@
protocol
FROM guacamole_connection
WHERE
- parent_id = #{parentIdentifier,jdbcType=VARCHAR}
+ parent_id = #{parentIdentifier,jdbcType=INTEGER}
parent_id IS NULL
AND connection_name = #{name,jdbcType=VARCHAR}
@@ -126,7 +126,7 @@
DELETE FROM guacamole_connection
- WHERE connection_id = #{identifier,jdbcType=VARCHAR}
+ WHERE connection_id = #{identifier,jdbcType=INTEGER}
@@ -140,7 +140,7 @@
)
VALUES (
#{object.name,jdbcType=VARCHAR},
- #{object.parentIdentifier,jdbcType=VARCHAR},
+ #{object.parentIdentifier,jdbcType=INTEGER},
#{object.protocol,jdbcType=VARCHAR}
)
@@ -150,7 +150,7 @@
UPDATE guacamole_connection
SET connection_name = #{object.name,jdbcType=VARCHAR},
- parent_id = #{object.parentIdentifier,jdbcType=VARCHAR},
+ parent_id = #{object.parentIdentifier,jdbcType=INTEGER},
protocol = #{object.protocol,jdbcType=VARCHAR}
WHERE connection_id = #{object.objectID,jdbcType=INTEGER}
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml
index b5775f607..41601b731 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml
@@ -47,7 +47,7 @@
FROM guacamole_connection_history
JOIN guacamole_user ON guacamole_connection_history.user_id = guacamole_user.user_id
WHERE
- connection_id = #{identifier,jdbcType=VARCHAR}
+ connection_id = #{identifier,jdbcType=INTEGER}
ORDER BY
start_date DESC,
end_date DESC
@@ -64,7 +64,7 @@
end_date
)
VALUES (
- #{record.connectionIdentifier,jdbcType=VARCHAR},
+ #{record.connectionIdentifier,jdbcType=INTEGER},
#{record.userID,jdbcType=INTEGER},
#{record.startDate,jdbcType=TIMESTAMP},
#{record.endDate,jdbcType=TIMESTAMP}
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.xml
index ccd386c14..55212d026 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.xml
@@ -41,13 +41,13 @@
parameter_value
FROM guacamole_connection_parameter
WHERE
- connection_id = #{identifier,jdbcType=VARCHAR}
+ connection_id = #{identifier,jdbcType=INTEGER}
DELETE FROM guacamole_connection_parameter
- WHERE connection_id = #{identifier,jdbcType=VARCHAR}
+ WHERE connection_id = #{identifier,jdbcType=INTEGER}
@@ -60,7 +60,7 @@
)
VALUES
- (#{parameter.connectionIdentifier,jdbcType=VARCHAR},
+ (#{parameter.connectionIdentifier,jdbcType=INTEGER},
#{parameter.name,jdbcType=VARCHAR},
#{parameter.value,jdbcType=VARCHAR})
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.xml
index 4eb20da1c..63bd1abae 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.xml
@@ -55,7 +55,7 @@
SELECT connection_group_id
FROM guacamole_connection_group
WHERE
- parent_id = #{parentIdentifier,jdbcType=VARCHAR}
+ parent_id = #{parentIdentifier,jdbcType=INTEGER}
parent_id IS NULL
@@ -65,7 +65,7 @@
FROM guacamole_connection_group
JOIN guacamole_connection_group_permission ON guacamole_connection_group_permission.connection_group_id = guacamole_connection_group.connection_group_id
WHERE
- parent_id = #{parentIdentifier,jdbcType=VARCHAR}
+ parent_id = #{parentIdentifier,jdbcType=INTEGER}
parent_id IS NULL
AND user_id = #{user.objectID,jdbcType=INTEGER}
AND permission = 'READ'
@@ -83,7 +83,7 @@
WHERE connection_group_id IN
- #{identifier,jdbcType=VARCHAR}
+ #{identifier,jdbcType=INTEGER}
@@ -101,7 +101,7 @@
WHERE guacamole_connection_group.connection_group_id IN
- #{identifier,jdbcType=VARCHAR}
+ #{identifier,jdbcType=INTEGER}
AND user_id = #{user.objectID,jdbcType=INTEGER}
AND permission = 'READ'
@@ -118,7 +118,7 @@
type
FROM guacamole_connection_group
WHERE
- parent_id = #{parentIdentifier,jdbcType=VARCHAR}
+ parent_id = #{parentIdentifier,jdbcType=INTEGER}
parent_id IS NULL
AND connection_group_name = #{name,jdbcType=VARCHAR}
@@ -127,7 +127,7 @@
DELETE FROM guacamole_connection_group
- WHERE connection_group_id = #{identifier,jdbcType=VARCHAR}
+ WHERE connection_group_id = #{identifier,jdbcType=INTEGER}
@@ -141,7 +141,7 @@
)
VALUES (
#{object.name,jdbcType=VARCHAR},
- #{object.parentIdentifier,jdbcType=VARCHAR},
+ #{object.parentIdentifier,jdbcType=INTEGER},
#{object.type,jdbcType=VARCHAR}
)
@@ -151,7 +151,7 @@
UPDATE guacamole_connection_group
SET connection_group_name = #{object.name,jdbcType=VARCHAR},
- parent_id = #{object.parentIdentifier,jdbcType=VARCHAR},
+ parent_id = #{object.parentIdentifier,jdbcType=INTEGER},
type = #{object.type,jdbcType=VARCHAR}
WHERE connection_group_id = #{object.objectID,jdbcType=INTEGER}
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.xml
index 1d10233a9..aad1dc09f 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionGroupPermissionMapper.xml
@@ -62,7 +62,7 @@
WHERE
guacamole_connection_group_permission.user_id = #{user.objectID,jdbcType=INTEGER}
AND permission = #{type,jdbcType=VARCHAR}::guacamole_object_permission_type
- AND connection_group_id = #{identifier,jdbcType=VARCHAR}
+ AND connection_group_id = #{identifier,jdbcType=INTEGER}
@@ -76,7 +76,7 @@
AND connection_group_id IN
- #{identifier,jdbcType=VARCHAR}
+ #{identifier,jdbcType=INTEGER}
AND permission IN
(#{permission.userID,jdbcType=INTEGER},
#{permission.type,jdbcType=VARCHAR}::guacamole_object_permission_type,
- #{permission.objectIdentifier,jdbcType=VARCHAR})
+ #{permission.objectIdentifier,jdbcType=INTEGER}::integer)
@@ -112,7 +112,7 @@
(#{permission.userID,jdbcType=INTEGER},
#{permission.type,jdbcType=VARCHAR}::guacamole_object_permission_type,
- #{permission.objectIdentifier,jdbcType=VARCHAR})
+ #{permission.objectIdentifier,jdbcType=INTEGER})
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.xml
index 4bd33de78..f45778516 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/ConnectionPermissionMapper.xml
@@ -62,7 +62,7 @@
WHERE
guacamole_connection_permission.user_id = #{user.objectID,jdbcType=INTEGER}
AND permission = #{type,jdbcType=VARCHAR}::guacamole_object_permission_type
- AND connection_id = #{identifier,jdbcType=VARCHAR}
+ AND connection_id = #{identifier,jdbcType=INTEGER}
@@ -76,7 +76,7 @@
AND connection_id IN
- #{identifier,jdbcType=VARCHAR}
+ #{identifier,jdbcType=INTEGER}
AND permission IN
(#{permission.userID,jdbcType=INTEGER},
#{permission.type,jdbcType=VARCHAR}::guacamole_object_permission_type,
- #{permission.objectIdentifier,jdbcType=VARCHAR})
+ #{permission.objectIdentifier,jdbcType=INTEGER})
@@ -112,7 +112,7 @@
(#{permission.userID,jdbcType=INTEGER},
#{permission.type,jdbcType=VARCHAR}::guacamole_object_permission_type,
- #{permission.objectIdentifier,jdbcType=VARCHAR})
+ #{permission.objectIdentifier,jdbcType=INTEGER})
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/UserPermissionMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/UserPermissionMapper.xml
index b995dae19..14ac6d9cb 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/UserPermissionMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/UserPermissionMapper.xml
@@ -64,7 +64,7 @@
WHERE
guacamole_user_permission.user_id = #{user.objectID,jdbcType=INTEGER}
AND permission = #{type,jdbcType=VARCHAR}::guacamole_object_permission_type
- AND affected.username = #{identifier,jdbcType=VARCHAR}
+ AND affected.username = #{identifier,jdbcType=INTEGER}
@@ -79,7 +79,7 @@
AND username IN
- #{identifier,jdbcType=VARCHAR}
+ #{identifier,jdbcType=INTEGER}
AND permission IN
(#{permission.userID,jdbcType=INTEGER},
#{permission.type,jdbcType=VARCHAR}::guacamole_object_permission_type,
- #{permission.objectIdentifier,jdbcType=VARCHAR})
+ #{permission.objectIdentifier,jdbcType=INTEGER})
@@ -119,7 +119,7 @@
open="(" separator="UNION ALL" close=")">
SELECT #{permission.userID,jdbcType=INTEGER} AS user_id,
#{permission.type,jdbcType=VARCHAR}::guacamole_object_permission_type AS permission,
- #{permission.objectIdentifier,jdbcType=VARCHAR} AS username
+ #{permission.objectIdentifier,jdbcType=INTEGER} AS username
AS permissions
JOIN guacamole_user ON guacamole_user.username = permissions.username;