start_date = valid_date(date_range[0] if date_range[0] else min_date)
end_date = valid_date(date_range[1] if date_range[1] else max_date)
days = []
- sql = 'SELECT date FROM days WHERE date >= ? AND date <= ?'
+ sql = 'SELECT id FROM days WHERE id >= ? AND id <= ?'
for row in db_conn.exec(sql, (start_date, end_date)):
- days += [cls.by_date(db_conn, row[0])]
+ days += [cls.by_id(db_conn, row[0])]
days.sort()
if fill_gaps and len(days) > 1:
gapless_days = []
return days
@classmethod
- def by_date(cls, db_conn: DatabaseConnection,
- date: str, create: bool = False) -> Day:
+ def by_id(cls, db_conn: DatabaseConnection,
+ date: str, create: bool = False) -> Day:
"""Retrieve Day by date if in DB (prefer cache), else return None."""
- if date in db_conn.cached_days.keys():
- day = db_conn.cached_days[date]
- assert isinstance(day, Day)
- return day
- for row in db_conn.exec('SELECT * FROM days WHERE date = ?', (date,)):
- day = cls.from_table_row(db_conn, row)
+ day, _ = super()._by_id(db_conn, date)
+ if day:
assert isinstance(day, Day)
return day
if not create: