From 5afb5176c63e97b1a99ef54aa7af09927fb1f3f2 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Mon, 20 Jun 2022 07:14:23 -0700
Subject: Simplify select statements

---
 src/main/java/org/traccar/storage/DatabaseStorage.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/main/java/org/traccar/storage/DatabaseStorage.java b/src/main/java/org/traccar/storage/DatabaseStorage.java
index 052f11ad2..eec72b510 100644
--- a/src/main/java/org/traccar/storage/DatabaseStorage.java
+++ b/src/main/java/org/traccar/storage/DatabaseStorage.java
@@ -54,7 +54,11 @@ public class DatabaseStorage extends Storage {
     @Override
     public <T> List<T> getObjects(Class<T> clazz, Request request) throws StorageException {
         StringBuilder query = new StringBuilder("SELECT ");
-        query.append(formatColumns(request.getColumns(), clazz, "get", c -> c));
+        if (request.getColumns() instanceof Columns.All) {
+            query.append('*');
+        } else {
+            query.append(formatColumns(request.getColumns(), clazz, "get", c -> c));
+        }
         query.append(" FROM ").append(getStorageName(clazz));
         query.append(formatCondition(request.getCondition()));
         query.append(formatOrder(request.getOrder()));
-- 
cgit v1.2.3