From b02fdb673a841d4788f414138de41711114d8f9b Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Thu, 8 Oct 2015 14:35:06 -0700
Subject: [PATCH] GUAC-1193: Fix ordering of record search results (OGNL
 comparison for enums is not string-based).

---
 .../jdbc/connection/ConnectionRecordMapper.xml     | 14 ++++++++++----
 .../jdbc/connection/ConnectionRecordMapper.xml     | 14 ++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml
index 7a2565de6..113c0d209 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml
@@ -113,14 +113,20 @@
             )
         </foreach>
 
+        <!-- Bind sort property enum values for sake of readability -->
+        <bind name="CONNECTION_NAME" value="@org.glyptodon.guacamole.net.auth.ConnectionRecordSet$SortableProperty@CONNECTION_NAME"/>
+        <bind name="USER_IDENTIFIER" value="@org.glyptodon.guacamole.net.auth.ConnectionRecordSet$SortableProperty@USER_IDENTIFIER"/>
+        <bind name="START_DATE"      value="@org.glyptodon.guacamole.net.auth.ConnectionRecordSet$SortableProperty@START_DATE"/>
+        <bind name="END_DATE"        value="@org.glyptodon.guacamole.net.auth.ConnectionRecordSet$SortableProperty@END_DATE"/>
+
         <!-- Sort predicates -->
         <foreach collection="sortPredicates" item="sortPredicate"
                  open="ORDER BY " separator=", ">
             <choose>
-                <when test="sortPredicate.property == 'CONNECTION_NAME'">guacamole_connection.connection_name</when>
-                <when test="sortPredicate.property == 'USER_IDENTIFIER'">guacamole_user.username</when>
-                <when test="sortPredicate.property == 'START_DATE'">guacamole_connection_history.start_date</when>
-                <when test="sortPredicate.property == 'END_DATE'">guacamole_connection_history.end_date</when>
+                <when test="sortPredicate.property == CONNECTION_NAME">guacamole_connection.connection_name</when>
+                <when test="sortPredicate.property == USER_IDENTIFIER">guacamole_user.username</when>
+                <when test="sortPredicate.property == START_DATE">guacamole_connection_history.start_date</when>
+                <when test="sortPredicate.property == END_DATE">guacamole_connection_history.end_date</when>
                 <otherwise>1</otherwise>
             </choose>
             <if test="sortPredicate.descending">DESC</if>
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 fd532d43e..8a7ac1fff 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
@@ -113,14 +113,20 @@
             )
         </foreach>
 
+        <!-- Bind sort property enum values for sake of readability -->
+        <bind name="CONNECTION_NAME" value="@org.glyptodon.guacamole.net.auth.ConnectionRecordSet$SortableProperty@CONNECTION_NAME"/>
+        <bind name="USER_IDENTIFIER" value="@org.glyptodon.guacamole.net.auth.ConnectionRecordSet$SortableProperty@USER_IDENTIFIER"/>
+        <bind name="START_DATE"      value="@org.glyptodon.guacamole.net.auth.ConnectionRecordSet$SortableProperty@START_DATE"/>
+        <bind name="END_DATE"        value="@org.glyptodon.guacamole.net.auth.ConnectionRecordSet$SortableProperty@END_DATE"/>
+
         <!-- Sort predicates -->
         <foreach collection="sortPredicates" item="sortPredicate"
                  open="ORDER BY " separator=", ">
             <choose>
-                <when test="sortPredicate.property == 'CONNECTION_NAME'">guacamole_connection.connection_name</when>
-                <when test="sortPredicate.property == 'USER_IDENTIFIER'">guacamole_user.username</when>
-                <when test="sortPredicate.property == 'START_DATE'">guacamole_connection_history.start_date</when>
-                <when test="sortPredicate.property == 'END_DATE'">guacamole_connection_history.end_date</when>
+                <when test="sortPredicate.property == CONNECTION_NAME">guacamole_connection.connection_name</when>
+                <when test="sortPredicate.property == USER_IDENTIFIER">guacamole_user.username</when>
+                <when test="sortPredicate.property == START_DATE">guacamole_connection_history.start_date</when>
+                <when test="sortPredicate.property == END_DATE">guacamole_connection_history.end_date</when>
                 <otherwise>1</otherwise>
             </choose>
             <if test="sortPredicate.descending">DESC</if>