diff --git a/core/db/db.go b/core/db/db.go index 692ae0012..066068cdf 100644 --- a/core/db/db.go +++ b/core/db/db.go @@ -58,6 +58,7 @@ func (s *DB) Persist(session interface{}) { } // Return sessions +// TODO make this part of server/db func (s *DB) Sessions() (Sessions, error) { var res Sessions tx := s.db.Find(&res) diff --git a/server/http_session_handler.go b/server/http_session_handler.go index 49f6c6c8c..ff48f1be7 100644 --- a/server/http_session_handler.go +++ b/server/http_session_handler.go @@ -60,8 +60,9 @@ func sessionHandler(w http.ResponseWriter, r *http.Request) { } } - whereQuery := "charged_kwh>=0.05 and strftime('%Y', created) like ? and strftime('%m', created) like ?" - if txn := dbserver.Instance.Where(whereQuery, fmtYear, fmtMonth).Order("created desc").Find(&res); txn.Error != nil { + // TODO support other databases than Sqlite + whereQuery := "charged_kwh>=0.05 AND strftime('%Y', created) LIKE ? AND strftime('%m', created) LIKE ?" + if txn := dbserver.Instance.Where(whereQuery, fmtYear, fmtMonth).Order("created DESC").Find(&res); txn.Error != nil { jsonError(w, http.StatusInternalServerError, txn.Error) return }