From 4a0213397b4609010c2dc08e40f562c1123d4953 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Mon, 2 Mar 2015 18:00:12 -0800
Subject: [PATCH] GUAC-1103: Convert string identifiers to integer where known
 to be integers.

---
 .../auth/jdbc/connection/ConnectionMapper.xml    | 16 ++++++++--------
 .../jdbc/connection/ConnectionRecordMapper.xml   |  4 ++--
 .../auth/jdbc/connection/ParameterMapper.xml     |  6 +++---
 .../connectiongroup/ConnectionGroupMapper.xml    | 16 ++++++++--------
 .../ConnectionGroupPermissionMapper.xml          |  8 ++++----
 .../permission/ConnectionPermissionMapper.xml    |  8 ++++----
 .../jdbc/permission/UserPermissionMapper.xml     |  8 ++++----
 7 files changed, 33 insertions(+), 33 deletions(-)

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
-            <if test="parentIdentifier != null">parent_id = #{parentIdentifier,jdbcType=VARCHAR}</if>
+            <if test="parentIdentifier != null">parent_id = #{parentIdentifier,jdbcType=INTEGER}</if>
             <if test="parentIdentifier == null">parent_id IS NULL</if>
     </select>
 
@@ -64,7 +64,7 @@
         FROM guacamole_connection
         JOIN guacamole_connection_permission ON guacamole_connection_permission.connection_id = guacamole_connection.connection_id
         WHERE
-            <if test="parentIdentifier != null">parent_id = #{parentIdentifier,jdbcType=VARCHAR}</if>
+            <if test="parentIdentifier != null">parent_id = #{parentIdentifier,jdbcType=INTEGER}</if>
             <if test="parentIdentifier == null">parent_id IS NULL</if>
             AND user_id = #{user.objectID,jdbcType=INTEGER}
             AND permission = 'READ'
@@ -82,7 +82,7 @@
         WHERE connection_id IN
             <foreach collection="identifiers" item="identifier"
                      open="(" separator="," close=")">
-                #{identifier,jdbcType=VARCHAR}
+                #{identifier,jdbcType=INTEGER}
             </foreach>
 
     </select>
@@ -100,7 +100,7 @@
         WHERE guacamole_connection.connection_id IN
             <foreach collection="identifiers" item="identifier"
                      open="(" separator="," close=")">
-                #{identifier,jdbcType=VARCHAR}
+                #{identifier,jdbcType=INTEGER}
             </foreach>
             AND user_id = #{user.objectID,jdbcType=INTEGER}
             AND permission = 'READ'
@@ -117,7 +117,7 @@
             protocol 
         FROM guacamole_connection
         WHERE 
-            <if test="parentIdentifier != null">parent_id = #{parentIdentifier,jdbcType=VARCHAR}</if>
+            <if test="parentIdentifier != null">parent_id = #{parentIdentifier,jdbcType=INTEGER}</if>
             <if test="parentIdentifier == null">parent_id IS NULL</if>
             AND connection_name = #{name,jdbcType=VARCHAR}
 
@@ -126,7 +126,7 @@
     <!-- Delete single connection by identifier -->
     <delete id="delete">
         DELETE FROM guacamole_connection
-        WHERE connection_id = #{identifier,jdbcType=VARCHAR}
+        WHERE connection_id = #{identifier,jdbcType=INTEGER}
     </delete>
 
     <!-- Insert single connection -->
@@ -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 id="update" parameterType="org.glyptodon.guacamole.auth.jdbc.connection.ConnectionModel">
         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}
     </update>
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}
     </select>
 
     <!-- Delete all parameters of a given connection -->
     <delete id="delete">
         DELETE FROM guacamole_connection_parameter
-        WHERE connection_id = #{identifier,jdbcType=VARCHAR}
+        WHERE connection_id = #{identifier,jdbcType=INTEGER}
     </delete>
 
     <!-- Insert all given parameters -->
@@ -60,7 +60,7 @@
         )
         VALUES 
             <foreach collection="parameters" item="parameter" separator=",">
-                (#{parameter.connectionIdentifier,jdbcType=VARCHAR},
+                (#{parameter.connectionIdentifier,jdbcType=INTEGER},
                  #{parameter.name,jdbcType=VARCHAR},
                  #{parameter.value,jdbcType=VARCHAR})
             </foreach>
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
-            <if test="parentIdentifier != null">parent_id = #{parentIdentifier,jdbcType=VARCHAR}</if>
+            <if test="parentIdentifier != null">parent_id = #{parentIdentifier,jdbcType=INTEGER}</if>
             <if test="parentIdentifier == null">parent_id IS NULL</if>
     </select>
 
@@ -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
-            <if test="parentIdentifier != null">parent_id = #{parentIdentifier,jdbcType=VARCHAR}</if>
+            <if test="parentIdentifier != null">parent_id = #{parentIdentifier,jdbcType=INTEGER}</if>
             <if test="parentIdentifier == null">parent_id IS NULL</if>
             AND user_id = #{user.objectID,jdbcType=INTEGER}
             AND permission = 'READ'
@@ -83,7 +83,7 @@
         WHERE connection_group_id IN
             <foreach collection="identifiers" item="identifier"
                      open="(" separator="," close=")">
-                #{identifier,jdbcType=VARCHAR}
+                #{identifier,jdbcType=INTEGER}
             </foreach>
 
     </select>
@@ -101,7 +101,7 @@
         WHERE guacamole_connection_group.connection_group_id IN
             <foreach collection="identifiers" item="identifier"
                      open="(" separator="," close=")">
-                #{identifier,jdbcType=VARCHAR}
+                #{identifier,jdbcType=INTEGER}
             </foreach>
             AND user_id = #{user.objectID,jdbcType=INTEGER}
             AND permission = 'READ'
@@ -118,7 +118,7 @@
             type
         FROM guacamole_connection_group
         WHERE 
-            <if test="parentIdentifier != null">parent_id = #{parentIdentifier,jdbcType=VARCHAR}</if>
+            <if test="parentIdentifier != null">parent_id = #{parentIdentifier,jdbcType=INTEGER}</if>
             <if test="parentIdentifier == null">parent_id IS NULL</if>
             AND connection_group_name = #{name,jdbcType=VARCHAR}
 
@@ -127,7 +127,7 @@
     <!-- Delete single connection group by identifier -->
     <delete id="delete">
         DELETE FROM guacamole_connection_group
-        WHERE connection_group_id = #{identifier,jdbcType=VARCHAR}
+        WHERE connection_group_id = #{identifier,jdbcType=INTEGER}
     </delete>
 
     <!-- Insert single connection -->
@@ -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 id="update" parameterType="org.glyptodon.guacamole.auth.jdbc.connectiongroup.ConnectionGroupModel">
         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}
     </update>
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}
 
     </select>
 
@@ -76,7 +76,7 @@
             AND connection_group_id IN
                 <foreach collection="identifiers" item="identifier"
                          open="(" separator="," close=")">
-                    #{identifier,jdbcType=VARCHAR}
+                    #{identifier,jdbcType=INTEGER}
                 </foreach>
             AND permission IN
                 <foreach collection="permissions" item="permission"
@@ -95,7 +95,7 @@
                      open="(" separator="," close=")">
                 (#{permission.userID,jdbcType=INTEGER},
                  #{permission.type,jdbcType=VARCHAR}::guacamole_object_permission_type,
-                 #{permission.objectIdentifier,jdbcType=VARCHAR})
+                 #{permission.objectIdentifier,jdbcType=INTEGER}::integer)
             </foreach>
 
     </delete>
@@ -112,7 +112,7 @@
             <foreach collection="permissions" item="permission" separator=",">
                 (#{permission.userID,jdbcType=INTEGER},
                  #{permission.type,jdbcType=VARCHAR}::guacamole_object_permission_type,
-                 #{permission.objectIdentifier,jdbcType=VARCHAR})
+                 #{permission.objectIdentifier,jdbcType=INTEGER})
             </foreach>
 
     </insert>
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}
 
     </select>
 
@@ -76,7 +76,7 @@
             AND connection_id IN
                 <foreach collection="identifiers" item="identifier"
                          open="(" separator="," close=")">
-                    #{identifier,jdbcType=VARCHAR}
+                    #{identifier,jdbcType=INTEGER}
                 </foreach>
             AND permission IN
                 <foreach collection="permissions" item="permission"
@@ -95,7 +95,7 @@
                      open="(" separator="," close=")">
                 (#{permission.userID,jdbcType=INTEGER},
                  #{permission.type,jdbcType=VARCHAR}::guacamole_object_permission_type,
-                 #{permission.objectIdentifier,jdbcType=VARCHAR})
+                 #{permission.objectIdentifier,jdbcType=INTEGER})
             </foreach>
 
     </delete>
@@ -112,7 +112,7 @@
             <foreach collection="permissions" item="permission" separator=",">
                 (#{permission.userID,jdbcType=INTEGER},
                  #{permission.type,jdbcType=VARCHAR}::guacamole_object_permission_type,
-                 #{permission.objectIdentifier,jdbcType=VARCHAR})
+                 #{permission.objectIdentifier,jdbcType=INTEGER})
             </foreach>
 
     </insert>
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}
 
     </select>
 
@@ -79,7 +79,7 @@
             AND username IN
                 <foreach collection="identifiers" item="identifier"
                          open="(" separator="," close=")">
-                    #{identifier,jdbcType=VARCHAR}
+                    #{identifier,jdbcType=INTEGER}
                 </foreach>
             AND permission IN
                 <foreach collection="permissions" item="permission"
@@ -101,7 +101,7 @@
                          open="(" separator="," close=")">
                     (#{permission.userID,jdbcType=INTEGER},
                      #{permission.type,jdbcType=VARCHAR}::guacamole_object_permission_type,
-                     #{permission.objectIdentifier,jdbcType=VARCHAR})
+                     #{permission.objectIdentifier,jdbcType=INTEGER})
                 </foreach>
 
     </delete>
@@ -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
             </foreach>
         AS permissions
         JOIN guacamole_user ON guacamole_user.username = permissions.username;