diff --git a/src/storage_deviceInfo.cpp b/src/storage_deviceInfo.cpp index b6e9762..177bd35 100644 --- a/src/storage_deviceInfo.cpp +++ b/src/storage_deviceInfo.cpp @@ -138,7 +138,7 @@ namespace uCentral { DevicesRecordList Records; - std::string St{"select " + DBFIELDS_DEVICES_SELECT + " from " + DBNAME_DEVICES + " ORDER BY SerialNumber "}; + std::string St{"select " + DBFIELDS_DEVICES_SELECT + " from " + DBNAME_DEVICES + " ORDER BY SerialNumber ASC "}; Select << ConvertParams(St) + ComputeRange(From, HowMany), Poco::Data::Keywords::into(Records); Select.execute(); diff --git a/src/storage_firmwares.cpp b/src/storage_firmwares.cpp index 224b43f..6ff792e 100644 --- a/src/storage_firmwares.cpp +++ b/src/storage_firmwares.cpp @@ -246,11 +246,11 @@ namespace uCentral { std::string st; if(Compatible.empty()) { - st = "SELECT " + DBFIELDS_FIRMWARES_SELECT + " FROM " + DBNAME_FIRMWARES + " ORDER BY Id "; + st = "SELECT " + DBFIELDS_FIRMWARES_SELECT + " FROM " + DBNAME_FIRMWARES + " ORDER BY Id ASC "; Select << ConvertParams(st) + ComputeRange(From, HowMany), Poco::Data::Keywords::into(Records); } else { - st = "SELECT " + DBFIELDS_FIRMWARES_SELECT + " FROM " + DBNAME_FIRMWARES + " where DeviceType=? ORDER BY Id "; + st = "SELECT " + DBFIELDS_FIRMWARES_SELECT + " FROM " + DBNAME_FIRMWARES + " where DeviceType=? ORDER BY Id ASC "; Select << ConvertParams(st) + ComputeRange(From, HowMany), Poco::Data::Keywords::into(Records), Poco::Data::Keywords::use(Compatible); diff --git a/src/storage_history.cpp b/src/storage_history.cpp index b46a146..78fefb9 100644 --- a/src/storage_history.cpp +++ b/src/storage_history.cpp @@ -47,7 +47,7 @@ namespace uCentral { Poco::Data::Statement Select(Sess); std::string st{"SELECT " + DBFIELDS_HISTORY_SELECT + - " FROM " + DBNAME_HISTORY + " where SerialNumber=? ORDER BY Upgraded " }; + " FROM " + DBNAME_HISTORY + " where SerialNumber=? ORDER BY Upgraded DESC " }; Select << ConvertParams(st) + ComputeRange(From, HowMany), Poco::Data::Keywords::into(Records),