From 839b692c86223f7bd42cc7d965f6c990460beb42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Latner?= <matyas.latner@nic.cz> Date: Fri, 22 Jul 2016 12:37:03 +0200 Subject: [PATCH] Fixed invalid SQL query after version update merge --- .../at/alladin/rmbt/statisticServer/StatisticsResource.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RMBTStatisticServer/src/at/alladin/rmbt/statisticServer/StatisticsResource.java b/RMBTStatisticServer/src/at/alladin/rmbt/statisticServer/StatisticsResource.java index c503b285..526cba34 100644 --- a/RMBTStatisticServer/src/at/alladin/rmbt/statisticServer/StatisticsResource.java +++ b/RMBTStatisticServer/src/at/alladin/rmbt/statisticServer/StatisticsResource.java @@ -116,7 +116,7 @@ public class StatisticsResource extends AbstractStatisticsResource { " LEFT JOIN device_map adm ON adm.codename=t.model" + " LEFT JOIN network_type nt ON nt.uid=t.network_type" + " WHERE %s" + - " AND t.deleted = false AND t.implausible = false AND t.status = 'FINISHED'" + + " AND t.deleted = false AND t.status = 'FINISHED'" + sqlImplausibleCondition + sqlTimeCondition + (useMobileProvider ? " AND t.mobile_provider_id IS NOT NULL" : "") + @@ -157,7 +157,7 @@ public class StatisticsResource extends AbstractStatisticsResource { (useMobileProvider ? " LEFT JOIN mccmnc2name p ON p.uid = t.mobile_sim_id" : "") + " WHERE %s" + " AND " + (useMobileProvider?"p.country = ? AND ((t.country_location IS NULL OR t.country_location = ?) AND ((NOT t.roaming_type = 2) OR t.roaming_type IS NULL))":"t.country_geoip = ? ") + - " AND t.deleted = false AND t.implausible = false AND t.status = 'FINISHED'" + + " AND t.deleted = false AND t.status = 'FINISHED'" + sqlImplausibleCondition + sqlTimeCondition + ((accuracy > 0) ? " AND t.geo_accuracy < ?" : "") + -- GitLab