diff --git a/Database.go b/Database.go index c477ec8..6c42b80 100644 --- a/Database.go +++ b/Database.go @@ -40,17 +40,32 @@ func writeSnapshotToDb(snapshotSub *SnapshotSubmission) error { } func getSnapshotRecordsFromDb(rowCount int) ([]*SnapshotRecord, error) { - records := make([]*SnapshotRecord, rowCount) - query := fmt.Sprintf("SELECT * FROM `snapshots` ORDER BY `id` DESC LIMIT %v;", rowCount) + snapshots := make([]*SnapshotRecord, rowCount) + query := fmt.Sprintf("SELECT `%s`, `%s`, `%s`, `%s`, `%s` FROM `snapshots` ORDER BY `id` DESC LIMIT %v;", + "id", + "temp", + "humidity", + "co2", + "time", + rowCount, + ) rows, err := ClimateDb.Query(query) if err != nil { return nil, err } for i := 0; rows.Next(); i++ { - err = rows.Scan(records[i]) + var snapshotRecord SnapshotRecord + err = rows.Scan( + snapshotRecord.Id, + snapshotRecord.Temp, + snapshotRecord.Humidity, + snapshotRecord.Co2, + snapshotRecord.Timestamp, + ) if err != nil { return nil, err } + snapshots = append(snapshots, &snapshotRecord) } - return records, nil + return snapshots, nil } \ No newline at end of file