Skip to content

Commit f01d577

Browse files
style(api): pulisce gli spazi nelle query SQL
Rimuove spazi finali e uniforma l'apertura delle SELECT in ApiController senza modificare il comportamento delle query.
1 parent 066cafa commit f01d577

1 file changed

Lines changed: 17 additions & 17 deletions

File tree

app/controllers/ApiController.php

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ function adminGtfsUpdateStart() {
7979
// Refactored from dbControll::api_gtfsIdentify
8080
function api_gtfsIdentify() {
8181
$tableJoins = "
82-
INNER JOIN trips ON routes.route_id = trips.route_id
83-
INNER JOIN stop_times ON trips.trip_id = stop_times.trip_id
84-
INNER JOIN stops ON stop_times.stop_id = stops.stop_id
82+
INNER JOIN trips ON routes.route_id = trips.route_id
83+
INNER JOIN stop_times ON trips.trip_id = stop_times.trip_id
84+
INNER JOIN stops ON stop_times.stop_id = stops.stop_id
8585
INNER JOIN calendar ON trips.service_id = calendar.service_id
8686
";
8787

@@ -105,7 +105,7 @@ function gtfsTripBuilder() {
105105
$db = $this->getDb();
106106

107107
$stops = $db->query(
108-
"SELECT
108+
"SELECT
109109
stops.stop_id,
110110
stops.stop_code,
111111
stops.stop_name,
@@ -559,15 +559,15 @@ function tripStops() {
559559
$selectedTripId = $tripByHeadsign[0]['trip_id'];
560560
} else {
561561
$deepQuery = "
562-
SELECT t.trip_id
562+
SELECT t.trip_id
563563
FROM trips t
564564
WHERE t.route_id = ?
565565
AND (
566-
SELECT s.stop_name
567-
FROM stop_times st
568-
JOIN stops s ON st.stop_id = s.stop_id
569-
WHERE st.trip_id = t.trip_id
570-
ORDER BY st.stop_sequence DESC
566+
SELECT s.stop_name
567+
FROM stop_times st
568+
JOIN stops s ON st.stop_id = s.stop_id
569+
WHERE st.trip_id = t.trip_id
570+
ORDER BY st.stop_sequence DESC
571571
LIMIT 1
572572
) LIKE ?
573573
LIMIT 1
@@ -594,7 +594,7 @@ function tripStops() {
594594

595595
// 3. Get stops for selected trip
596596
$stopsQuery = "
597-
SELECT
597+
SELECT
598598
s.stop_id as id,
599599
s.stop_name as name,
600600
s.stop_lat as lat,
@@ -640,9 +640,9 @@ function logJsError() {
640640

641641
function gtfsResolve() {
642642
$tableJoins = "
643-
INNER JOIN trips ON routes.route_id = trips.route_id
644-
INNER JOIN stop_times ON trips.trip_id = stop_times.trip_id
645-
INNER JOIN stops ON stop_times.stop_id = stops.stop_id
643+
INNER JOIN trips ON routes.route_id = trips.route_id
644+
INNER JOIN stop_times ON trips.trip_id = stop_times.trip_id
645+
INNER JOIN stops ON stop_times.stop_id = stops.stop_id
646646
INNER JOIN calendar ON trips.service_id = calendar.service_id
647647
";
648648

@@ -821,9 +821,9 @@ function busPosition() {
821821
$shapePoints = [];
822822
if (!empty($tripInfo) && !empty($tripInfo[0]['shape_id'])) {
823823
$shapeId = $tripInfo[0]['shape_id'];
824-
$sqlShape = "SELECT lat, lng, sequence, dist_traveled
825-
FROM shapes_refined
826-
WHERE shape_id = ?
824+
$sqlShape = "SELECT lat, lng, sequence, dist_traveled
825+
FROM shapes_refined
826+
WHERE shape_id = ?
827827
ORDER BY sequence ASC";
828828
$shapePoints = $db->query($sqlShape, [$shapeId]);
829829
}

0 commit comments

Comments
 (0)