From 07665cf0d6d3f98d2c19f1cde3a46bc4e0a28a82 Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Thu, 4 Sep 2014 04:06:19 +0000
Subject: [PATCH] Fix a problem with Devices for viewing the key assignments
 for MySQL

---
 app/devices/device_edit.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php
index b8f8f87408..0847ae8abe 100644
--- a/app/devices/device_edit.php
+++ b/app/devices/device_edit.php
@@ -319,7 +319,12 @@ require_once "resources/require.php";
 	$sql .= "WHEN 'programmable' THEN 3 ";
 	$sql .= "WHEN 'expansion' THEN 4 ";
 	$sql .= "ELSE 100 END, ";
-	$sql .= "cast(device_key_id as numeric) asc ";
+	if ($db_type == "mysql") {
+		$sql .= "device_key_id asc ";
+	}
+	else {
+		$sql .= "cast(device_key_id as numeric) asc ";
+	}
 	$prep_statement = $db->prepare(check_sql($sql));
 	$prep_statement->execute();
 	$device_keys = $prep_statement->fetchAll(PDO::FETCH_NAMED);