diff options
author | Anton Tananaev <anton@traccar.org> | 2022-10-13 10:31:54 -0700 |
---|---|---|
committer | Anton Tananaev <anton@traccar.org> | 2022-10-13 10:31:54 -0700 |
commit | 4c8e98ed409df6e12128591eb1d8d0cf0856deb7 (patch) | |
tree | 83da3517bb14977ab4809aecf3681b777785e83d /src/main/java/org/traccar/storage/query | |
parent | acedd28b8584a18022d9e2343558f9acbad1666f (diff) | |
download | trackermap-server-4c8e98ed409df6e12128591eb1d8d0cf0856deb7.tar.gz trackermap-server-4c8e98ed409df6e12128591eb1d8d0cf0856deb7.tar.bz2 trackermap-server-4c8e98ed409df6e12128591eb1d8d0cf0856deb7.zip |
Refactor database code (fix #4961)
Diffstat (limited to 'src/main/java/org/traccar/storage/query')
-rw-r--r-- | src/main/java/org/traccar/storage/query/Columns.java | 3 | ||||
-rw-r--r-- | src/main/java/org/traccar/storage/query/Condition.java | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/main/java/org/traccar/storage/query/Columns.java b/src/main/java/org/traccar/storage/query/Columns.java index 545995b3c..a00400b36 100644 --- a/src/main/java/org/traccar/storage/query/Columns.java +++ b/src/main/java/org/traccar/storage/query/Columns.java @@ -17,6 +17,7 @@ package org.traccar.storage.query; import org.traccar.storage.QueryIgnore; +import java.beans.Introspector; import java.lang.reflect.Method; import java.util.Arrays; import java.util.LinkedList; @@ -36,7 +37,7 @@ public abstract class Columns { if (method.getName().startsWith(type) && method.getParameterTypes().length == parameterCount && !method.isAnnotationPresent(QueryIgnore.class) && !method.getName().equals("getClass")) { - columns.add(method.getName().substring(3).toLowerCase()); + columns.add(Introspector.decapitalize(method.getName().substring(3))); } } return columns; diff --git a/src/main/java/org/traccar/storage/query/Condition.java b/src/main/java/org/traccar/storage/query/Condition.java index 136b0402b..08b199052 100644 --- a/src/main/java/org/traccar/storage/query/Condition.java +++ b/src/main/java/org/traccar/storage/query/Condition.java @@ -34,12 +34,8 @@ public interface Condition { } class Equals extends Compare { - public Equals(String column, String variable) { - this(column, variable, null); - } - - public Equals(String column, String variable, Object value) { - super(column, "=", variable, value); + public Equals(String column, Object value) { + super(column, "=", column, value); } } |