mirror of
https://github.com/osm-search/Nominatim.git
synced 2026-02-15 10:57:58 +00:00
use psql for executing sql files
This allows to run larger files without needing to keep them in memory.
This commit is contained in:
@@ -5,26 +5,37 @@ import psycopg2
|
||||
import pytest
|
||||
|
||||
import nominatim.db.utils as db_utils
|
||||
from nominatim.errors import UsageError
|
||||
|
||||
def test_execute_file_success(temp_db_conn, tmp_path):
|
||||
@pytest.fixture
|
||||
def dsn(temp_db):
|
||||
return 'dbname=' + temp_db
|
||||
|
||||
def test_execute_file_success(dsn, temp_db_cursor, tmp_path):
|
||||
tmpfile = tmp_path / 'test.sql'
|
||||
tmpfile.write_text('CREATE TABLE test (id INT);\nINSERT INTO test VALUES(56);')
|
||||
|
||||
db_utils.execute_file(temp_db_conn, tmpfile)
|
||||
db_utils.execute_file(dsn, tmpfile)
|
||||
|
||||
with temp_db_conn.cursor() as cur:
|
||||
cur.execute('SELECT * FROM test')
|
||||
temp_db_cursor.execute('SELECT * FROM test')
|
||||
|
||||
assert cur.rowcount == 1
|
||||
assert cur.fetchone()[0] == 56
|
||||
assert temp_db_cursor.rowcount == 1
|
||||
assert temp_db_cursor.fetchone()[0] == 56
|
||||
|
||||
def test_execute_file_bad_file(temp_db_conn, tmp_path):
|
||||
def test_execute_file_bad_file(dsn, tmp_path):
|
||||
with pytest.raises(FileNotFoundError):
|
||||
db_utils.execute_file(temp_db_conn, tmp_path / 'test2.sql')
|
||||
db_utils.execute_file(dsn, tmp_path / 'test2.sql')
|
||||
|
||||
def test_execute_file_bad_sql(temp_db_conn, tmp_path):
|
||||
def test_execute_file_bad_sql(dsn, tmp_path):
|
||||
tmpfile = tmp_path / 'test.sql'
|
||||
tmpfile.write_text('CREATE STABLE test (id INT)')
|
||||
|
||||
with pytest.raises(psycopg2.ProgrammingError):
|
||||
db_utils.execute_file(temp_db_conn, tmpfile)
|
||||
with pytest.raises(UsageError):
|
||||
db_utils.execute_file(dsn, tmpfile)
|
||||
|
||||
|
||||
def test_execute_file_bad_sql_ignore_errors(dsn, tmp_path):
|
||||
tmpfile = tmp_path / 'test.sql'
|
||||
tmpfile.write_text('CREATE STABLE test (id INT)')
|
||||
|
||||
db_utils.execute_file(dsn, tmpfile, ignore_errors=True)
|
||||
|
||||
Reference in New Issue
Block a user