db version
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
import datetime
|
||||
from dataclasses import dataclass
|
||||
|
||||
from sqlalchemy import INTEGER, REAL, TEXT, insert
|
||||
from sqlalchemy.ext.asyncio import create_async_engine
|
||||
from sqlalchemy import REAL, TEXT, insert, text
|
||||
from sqlalchemy.ext.asyncio import AsyncConnection, create_async_engine
|
||||
from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
|
||||
|
||||
|
||||
@@ -10,15 +10,9 @@ class Base(DeclarativeBase):
|
||||
pass
|
||||
|
||||
|
||||
class Version(Base):
|
||||
__tablename__ = "version"
|
||||
version_type: Mapped[str] = mapped_column(type_=TEXT, primary_key=True)
|
||||
version: Mapped[int] = mapped_column(type_=INTEGER)
|
||||
|
||||
|
||||
class Location(Base):
|
||||
__tablename__ = "location"
|
||||
people: Mapped[str] = mapped_column(type_=TEXT, primary_key=True)
|
||||
person: Mapped[str] = mapped_column(type_=TEXT, primary_key=True)
|
||||
datetime: Mapped[str] = mapped_column(type_=TEXT, primary_key=True)
|
||||
latitude: Mapped[float] = mapped_column(type_=REAL)
|
||||
longitude: Mapped[float] = mapped_column(type_=REAL)
|
||||
@@ -33,22 +27,29 @@ class LocationData:
|
||||
|
||||
|
||||
class LocationRecorder:
|
||||
USER_VERSION = 2
|
||||
|
||||
def __init__(self, db_path: str) -> None:
|
||||
self._db_path = "sqlite+aiosqlite:///" + db_path
|
||||
|
||||
async def create_db_engine(self) -> None:
|
||||
self._engine = create_async_engine(self._db_path)
|
||||
async with self._engine.begin() as conn:
|
||||
await conn.run_sync(Base.metadata.create_all)
|
||||
user_version = await self._get_user_version(conn=conn)
|
||||
if user_version == 0:
|
||||
await conn.run_sync(Base.metadata.create_all)
|
||||
await self._set_user_version(conn=conn, user_version=2)
|
||||
if user_version != LocationRecorder.USER_VERSION:
|
||||
await self._migrate(conn=conn)
|
||||
|
||||
async def dispose_db_engine(self) -> None:
|
||||
await self._engine.dispose()
|
||||
|
||||
async def insert_location(self, people: str, datetime: str, location: LocationData) -> None:
|
||||
async def insert_location(self, person: str, datetime: str, location: LocationData) -> None:
|
||||
async with self._engine.connect() as conn:
|
||||
await conn.execute(
|
||||
insert(Location).values(
|
||||
people=people,
|
||||
person=person,
|
||||
datetime=datetime,
|
||||
latitude=location.latitude,
|
||||
longitude=location.longitude,
|
||||
@@ -58,7 +59,25 @@ class LocationRecorder:
|
||||
await conn.commit()
|
||||
await conn.aclose()
|
||||
|
||||
async def insert_location_now(self, people: str, location: LocationData) -> None:
|
||||
async def insert_location_now(self, person: str, location: LocationData) -> None:
|
||||
now = datetime.datetime.now(tz=datetime.UTC)
|
||||
now_str = now.strftime("%Y-%m-%dT%H:%M:%S%z")
|
||||
await self.insert_location(people, now_str, location)
|
||||
await self.insert_location(person, now_str, location)
|
||||
|
||||
async def _get_user_version(self, conn: AsyncConnection) -> int:
|
||||
return (await conn.execute(text("PRAGMA user_version"))).first()[0]
|
||||
|
||||
async def _set_user_version(self, conn: AsyncConnection, user_version: int) -> None:
|
||||
await conn.execute(text("PRAGMA user_version = " + str(user_version)))
|
||||
|
||||
async def _migrate(self, conn: AsyncConnection) -> None:
|
||||
user_version = (await conn.execute(text("PRAGMA user_version"))).first()[0]
|
||||
if user_version == 1:
|
||||
await self._migrate_1_2(conn=conn)
|
||||
user_version = (await conn.execute(text("PRAGMA user_version"))).first()[0]
|
||||
|
||||
async def _migrate_1_2(self, conn: AsyncConnection) -> None:
|
||||
print("Location Recorder: migrate from db ver 1 to 2.")
|
||||
await conn.execute(text("DROP TABLE version"))
|
||||
await conn.execute(text("ALTER TABLE location RENAME people TO person"))
|
||||
await self._set_user_version(conn=conn, user_version=2)
|
||||
|
||||
Reference in New Issue
Block a user