From 64dce58bc5982c0c112d71219289b9ef111f566e Mon Sep 17 00:00:00 2001
From: Exodus4D <exodus4d@gmail.com>
Date: Sat, 13 Aug 2016 21:33:44 +0200
Subject: [PATCH] - route search SQL mayor performance  improvements

---
 app/main/controller/api/route.php | 47 ++++++++++++++++---------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/app/main/controller/api/route.php b/app/main/controller/api/route.php
index af00a0a7..4c9a3610 100644
--- a/app/main/controller/api/route.php
+++ b/app/main/controller/api/route.php
@@ -151,45 +151,46 @@ class Route extends \Controller\AccessController {
             // search connections -------------------------------------------------------
 
             if( !empty($includeScopes) ){
-                $whereQuery .= " connection.scope IN ('" . implode("', '", $includeScopes) . "') AND ";
+                $whereQuery .= " `connection`.`scope` IN ('" . implode("', '", $includeScopes) . "') AND ";
 
                 if( !empty($includeTypes) ){
-                    $whereQuery .= " connection.type REGEXP '" . implode("|", $includeTypes) . "' AND ";
+                    $whereQuery .= " `connection`.`type` REGEXP '" . implode("|", $includeTypes) . "' AND ";
                 }
 
 
                 $query = "SELECT
-                        system_src.regionId regionId,
-                        system_src.constellationId constellationId,
-                        system_src.name systemName,
-                        system_src.systemId systemId,
+                        `system_src`.`regionId` regionId,
+                        `system_src`.`constellationId` constellationId,
+                        `system_src`.`name` systemName,
+                        `system_src`.`systemId` systemId,
                         (
                           SELECT
-                            GROUP_CONCAT( NULLIF(system_tar.name, NULL) SEPARATOR ':')
+                            GROUP_CONCAT( NULLIF(`system_tar`.`name`, NULL) SEPARATOR ':')
                           FROM
-                            connection INNER JOIN
-                            system system_tar ON
-                              system_tar.id = connection.source OR
-                              system_tar.id = connection.target
+                            `connection` INNER JOIN
+                            `system` system_tar ON
+                              `system_tar`.`id` = `connection`.`source` OR
+                              `system_tar`.`id` = `connection`.`target`
                           WHERE
+                            `connection`.`mapId` IN (" . implode(', ', $mapIds) . ") AND
+                            `connection`.`active` = 1 AND
                             (
-                              connection.source = system_src.id OR
-                              connection.target = system_src.id
+                              `connection`.`source` = `system_src`.`id` OR
+                              `connection`.`target` = `system_src`.`id`
                             ) AND
                             " . $whereQuery . "
-                            connection.active = 1 AND
-                            system_tar.id != system_src.id AND
-                            system_tar.active = 1
+                            `system_tar`.`id` != `system_src`.`id` AND
+                            `system_tar`.`active` = 1
                         ) jumpNodes,
-                        system_src.trueSec trueSec
+                        `system_src`.`trueSec` trueSec
                     FROM
-                        system system_src INNER JOIN
-                        map ON
-                          map.id = system_src.mapId
+                        `system` `system_src` INNER JOIN
+                        `map` ON
+                          `map`.`id` = `system_src`.`mapId`
                     WHERE
-                        system_src.mapId IN (" . implode(', ', $mapIds) . ") AND
-                        system_src.active = 1 AND
-                        map.active = 1
+                        `system_src`.`mapId` IN (" . implode(', ', $mapIds) . ") AND
+                        `system_src`.`active` = 1 AND
+                        `map`.`active` = 1
                     HAVING
                         -- skip systems without neighbors (e.g. WHs)
 	                    jumpNodes IS NOT NULL