diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-08-05 00:24:02 +1200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-05 00:24:02 +1200 |
commit | 441b80aee6dd90d4e472c0036ca00ecad2ee9c91 (patch) | |
tree | 8714fbdbd89e39c963ada727271f877fc3e45fb4 | |
parent | 3bc4e07dff292c22e29a1fa3bf9d07796d2e89b7 (diff) | |
parent | adf043bb8167ddb25fe96fcabc4cc35ff2deaf37 (diff) | |
download | trackermap-server-441b80aee6dd90d4e472c0036ca00ecad2ee9c91.tar.gz trackermap-server-441b80aee6dd90d4e472c0036ca00ecad2ee9c91.tar.bz2 trackermap-server-441b80aee6dd90d4e472c0036ca00ecad2ee9c91.zip |
Merge pull request #3416 from Abyss777/fix_3411
Write all fields on insert action
-rw-r--r-- | src/org/traccar/database/DataManager.java | 2 | ||||
-rw-r--r-- | test/org/traccar/database/DataManagerTest.java | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java index ea90d4d67..17c1299e8 100644 --- a/src/org/traccar/database/DataManager.java +++ b/src/org/traccar/database/DataManager.java @@ -146,7 +146,7 @@ public class DataManager { skip = !method.isAnnotationPresent(QueryExtended.class); } else { skip = method.isAnnotationPresent(QueryIgnore.class) - || method.isAnnotationPresent(QueryExtended.class); + || method.isAnnotationPresent(QueryExtended.class) && !action.equals(ACTION_INSERT); } if (!skip && method.getName().startsWith("get") && method.getParameterTypes().length == 0) { String name = Introspector.decapitalize(method.getName().substring(3)); diff --git a/test/org/traccar/database/DataManagerTest.java b/test/org/traccar/database/DataManagerTest.java index 3383c3d22..3d6f5201e 100644 --- a/test/org/traccar/database/DataManagerTest.java +++ b/test/org/traccar/database/DataManagerTest.java @@ -26,7 +26,6 @@ public class DataManagerTest { Assert.assertFalse(insertDevice.contains("class")); Assert.assertFalse(insertDevice.contains("id")); Assert.assertFalse(insertDevice.contains("status")); - Assert.assertFalse(insertDevice.contains("lastUpdate")); Assert.assertFalse(insertDevice.contains("geofenceIds")); String updateDeviceStatus = DataManager.constructObjectQuery("update", Device.class, true); |