hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

add SQLAlchemy table schema for Nominatim tables

Browse Source 
Also defines an extended connection object that includes access to
the table definitions. Makes it easier to access the tables from
code that has been split off into separate modules.
This commit is contained in:
Sarah Hoffmann
2023-01-26 17:36:11 +01:00
parent c7e8a82d68
commit 5226cd2a0b
5 changed files with 199 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nominatim/api/status.py
View File

@@ -11,9 +11,9 @@ from typing import Optional, cast
import datetime as dt
import sqlalchemy as sa
from sqlalchemy.ext.asyncio.engine import AsyncConnection
import asyncpg
from nominatim.api.connection import SearchConnection
from nominatim import version
class StatusResult:
@@ -28,7 +28,7 @@ class StatusResult:
self.database_version: Optional[version.NominatimVersion] = None
async def _get_database_date(conn: AsyncConnection) -> Optional[dt.datetime]:
async def _get_database_date(conn: SearchConnection) -> Optional[dt.datetime]:
""" Query the database date.
"""
sql = sa.text('SELECT lastimportdate FROM import_status LIMIT 1')
@@ -40,7 +40,7 @@ async def _get_database_date(conn: AsyncConnection) -> Optional[dt.datetime]:
return None
async def _get_database_version(conn: AsyncConnection) -> Optional[version.NominatimVersion]:
async def _get_database_version(conn: SearchConnection) -> Optional[version.NominatimVersion]:
sql = sa.text("""SELECT value FROM nominatim_properties
WHERE property = 'database_version'""")
result = await conn.execute(sql)
@@ -51,7 +51,7 @@ async def _get_database_version(conn: AsyncConnection) -> Optional[version.Nomin
return None
async def get_status(conn: AsyncConnection) -> StatusResult:
async def get_status(conn: SearchConnection) -> StatusResult:
""" Execute a status API call.
"""
status = StatusResult(0, 'OK')