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

error out when a SQLite database does not exist

Browse Source 
Requires to mark the databse r/w when it is newly created in the
convert function.
This commit is contained in:
Sarah Hoffmann
2023-12-07 10:24:53 +01:00
parent 3f5484f48f
commit 89094cf92e
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nominatim/api/core.py
View File

@@ -101,6 +101,10 @@ class NominatimAPIAsync: #pylint: disable=too-many-instance-attributes
dburl = sa.engine.URL.create('sqlite+aiosqlite', dburl = sa.engine.URL.create('sqlite+aiosqlite',
database=params.get('dbname')) database=params.get('dbname'))
if not ('NOMINATIM_DATABASE_RW' in self.config.environ
and self.config.get_bool('DATABASE_RW')) \
and not Path(params.get('dbname', '')).is_file():
raise UsageError(f"SQlite database '{params.get('dbname')}' does not exist.")
else: else:
dsn = self.config.get_database_params() dsn = self.config.get_database_params()
query = {k: v for k, v in dsn.items() query = {k: v for k, v in dsn.items()

3
nominatim/tools/convert_sqlite.py
View File

@@ -28,7 +28,8 @@ async def convert(project_dir: Path, outfile: Path, options: Set[str]) -> None:
try: try:
outapi = napi.NominatimAPIAsync(project_dir, outapi = napi.NominatimAPIAsync(project_dir,
{'NOMINATIM_DATABASE_DSN': f"sqlite:dbname={outfile}"}) {'NOMINATIM_DATABASE_DSN': f"sqlite:dbname={outfile}",
'NOMINATIM_DATABASE_RW': '1'})
try: try:
async with api.begin() as src, outapi.begin() as dest: async with api.begin() as src, outapi.begin() as dest: