Skip to content

Commit

Permalink
Enable to use SQLite3 in v1_23_change_oauth2_sub_username_to_user_id.py
Browse files Browse the repository at this point in the history
  • Loading branch information
jirik committed Jan 10, 2024
1 parent 845698c commit 454d351
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
docker compose -f docker-compose.deps.demo.yml -f docker-compose.demo.yml run --rm --no-deps -u root -e LAYMAN_WAGTAIL_DB_URI=<URI_of_Wagtail_db> layman bash -c "cd src && python3 -B v1_23_change_oauth2_sub_username_to_user_id.py"
```
- `URI_of_Wagtail_db` is PostgreSQL connection URI to Wagtail database, e.g. `postgresql://user:[email protected]:5432/wagtail_db_name`
- In case of development settings, run following script instead:
```bash
docker compose -f docker-compose.deps.yml -f docker-compose.dev.yml run --rm --no-deps -u root -e LAYMAN_WAGTAIL_DB_URI=<URI_of_Wagtail_db> layman_dev bash -c "cd src && python3 -B v1_23_change_oauth2_sub_username_to_user_id.py"
```
### Migrations and checks
#### Schema migrations
- [#165](https://github.com/LayerManager/layman/issues/165) Add column `role_name` to table `rights` in prime DB schema. Add constraint that exactly one of columns `role_name` and `id_user` is not null.
Expand Down
1 change: 1 addition & 0 deletions docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ services:
- ./deps/geoserver/data:/geoserver/data_dir
- ./deps/geoserver/sample/geoserver_data:/geoserver/initial_data_dir
- ./deps/qgis/data:/qgis/data
- ./deps/wagtail/data:/wagtail/data
depends_on:
- timgen
- redis
Expand Down
33 changes: 32 additions & 1 deletion src/db/util.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import contextlib
import logging
import re
import sqlite3
from urllib import parse
import psycopg2
import psycopg2.pool
Expand Down Expand Up @@ -35,6 +37,35 @@ def get_connection_pool(db_uri_str=None, encapsulate_exception=True):


def run_query(query, data=None, uri_str=None, encapsulate_exception=True, log_query=False):
if uri_str is None or uri_str.startswith('postgres:') or uri_str.startswith('postgresql:'):
method = _run_query_postgres
elif uri_str.startswith('sqlite:'):
method = _run_query_sqlite
else:
raise NotImplementedError(f"Unsupported database protocol: {uri_str}")

return method(query, data=data, uri_str=uri_str, encapsulate_exception=encapsulate_exception, log_query=log_query)


def _run_query_sqlite(query, data=None, *, uri_str, encapsulate_exception=True, log_query=False):
assert data is None, f"data is not yet implemented"
db_uri_parsed = parse.urlparse(uri_str)
db_path = db_uri_parsed.path
try:
if log_query:
logger.info(f"query={query}")
with contextlib.closing(sqlite3.connect(db_path)) as conn: # auto-closes
with conn: # auto-commits
result = list(conn.execute(query))
except BaseException as exc:
if encapsulate_exception:
logger.error(f"_run_query_sqlite, query={query}, data={data}, exc={exc}")
raise Error(2) from exc
raise exc
return result


def _run_query_postgres(query, data=None, uri_str=None, encapsulate_exception=True, log_query=False):
pool = get_connection_pool(db_uri_str=uri_str, encapsulate_exception=encapsulate_exception, )
conn = pool.getconn()
conn.autocommit = True
Expand All @@ -47,7 +78,7 @@ def run_query(query, data=None, uri_str=None, encapsulate_exception=True, log_qu
conn.commit()
except BaseException as exc:
if encapsulate_exception:
logger.error(f"run_query, query={query}, data={data}, exc={exc}")
logger.error(f"_run_query_postgres, query={query}, data={data}, exc={exc}")
raise Error(2) from exc
raise exc
finally:
Expand Down

0 comments on commit 454d351

Please sign in to comment.