Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SQLite] Support SAVEPOINT #11695

Merged
merged 6 commits into from
Jan 20, 2025
+814 −190
Merged

[SQLite] Support SAVEPOINT #11695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d479996
[SQLite] Support SAVEPOINT
elpaso Jan 20, 2025
5a9f797
cast size_t
elpaso Jan 20, 2025
2cb14bb
doxy
elpaso Jan 20, 2025
1ac8ceb
more unsealing
elpaso Jan 20, 2025
3356983
Apply suggestions from code review
elpaso Jan 20, 2025
a64554c
Factor out SQL transaction and remove C api
elpaso Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 54 additions & 2 deletions autotest/ogr/ogr_gpkg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9178,8 +9178,10 @@ def test_ogr_gpkg_read_generated_column(tmp_vsimem):
lyr = ds.GetLayer(0)
assert lyr.GetLayerDefn().GetFieldCount() == 4
assert lyr.GetLayerDefn().GetFieldDefn(2).GetName() == "strfield_generated"
assert lyr.GetLayerDefn().GetFieldDefn(2).IsGenerated()
assert lyr.GetLayerDefn().GetFieldDefn(2).GetType() == ogr.OFTString
assert lyr.GetLayerDefn().GetFieldDefn(3).GetName() == "intfield_generated_stored"
assert lyr.GetLayerDefn().GetFieldDefn(3).IsGenerated()
assert lyr.GetLayerDefn().GetFieldDefn(3).GetType() == ogr.OFTInteger64

f = ogr.Feature(lyr.GetLayerDefn())
Expand All @@ -9191,6 +9193,8 @@ def test_ogr_gpkg_read_generated_column(tmp_vsimem):
assert f["strfield"] == "foo"
assert f["strfield_generated"] == "foo_generated"
assert f["intfield_generated_stored"] == 5
assert f.GetFieldDefnRef(2).IsGenerated()
assert f.GetFieldDefnRef(3).IsGenerated()

assert lyr.SetFeature(f) == ogr.OGRERR_NONE
lyr.ResetReading()
Expand Down Expand Up @@ -10914,8 +10918,56 @@ def test_ogr_gpkg_arrow_stream_numpy_datetime_as_string(tmp_vsimem):
# Test field operations rolling back changes.


def test_ogr_gpkg_field_operations_rollback(tmp_vsimem):
@pytest.mark.parametrize("start_transaction", [False, True])
def test_ogr_gpkg_field_operations_rollback(tmp_vsimem, start_transaction):

filename = str(tmp_vsimem / "test.gpkg")
with ogr.GetDriverByName("GPKG").CreateDataSource(filename) as ds:
ogrtest.check_transaction_rollback(ds, test_geometry=False)
ogrtest.check_transaction_rollback(ds, start_transaction, test_geometry=False)


@pytest.mark.parametrize("start_transaction", [False, True])
def test_ogr_gpkg_field_operations_savepoint_rollback(tmp_vsimem, start_transaction):

filename = str(tmp_vsimem / "test_savepoint.gpkg")
with ogr.GetDriverByName("GPKG").CreateDataSource(filename) as ds:
ogrtest.check_transaction_rollback_with_savepoint(
ds, start_transaction, test_geometry=False
)


@pytest.mark.parametrize("auto_begin_transaction", [False, True])
@pytest.mark.parametrize("start_transaction", [False, True])
@pytest.mark.parametrize(
"release_to,rollback_to,expected",
(
([1], [], ["fld3"]),
([2], [], ["fld3"]),
([3], [], ["fld3"]),
([4], [], ["fld3"]),
([], [1], ["fld1", "fld2", "fld3", "fld4", "fld5"]),
([], [2], ["fld1", "fld3", "fld4", "fld5"]),
([], [3], ["fld1", "fld3", "fld5"]),
([], [4], ["fld3", "fld5"]),
),
)
def test_ogr_gpkg_field_operations_savepoint_release(
tmp_vsimem,
auto_begin_transaction,
start_transaction,
release_to,
rollback_to,
expected,
):

filename = str(tmp_vsimem / "test_savepoint_release.gpkg")
ogrtest.check_transaction_savepoint_release(
filename,
"GPKG",
auto_begin_transaction,
start_transaction,
release_to,
rollback_to,
expected,
test_geometry=False,
)
54 changes: 50 additions & 4 deletions autotest/ogr/ogr_sqlite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4543,10 +4543,56 @@ def test_ogr_sqlite_schema_override(
#


def test_field_rollback(tmp_path):
@pytest.mark.parametrize("start_transaction", [False, True])
def test_ogr_sqlite_field_operations_rollback(tmp_vsimem, start_transaction):

filename = str(tmp_path / "test_field_rollback.db")
filename = str(tmp_vsimem / "test.db")
with ogr.GetDriverByName("SQLite").CreateDataSource(filename) as ds:
ogrtest.check_transaction_rollback(ds, start_transaction, test_geometry=False)


@pytest.mark.parametrize("start_transaction", [False, True])
def test_ogr_sqlite_field_operations_savepoint_rollback(tmp_vsimem, start_transaction):

# Create a new database.
filename = str(tmp_vsimem / "test_savepoint.db")
with ogr.GetDriverByName("SQLite").CreateDataSource(filename) as ds:
ogrtest.check_transaction_rollback(ds, test_geometry=True)
ogrtest.check_transaction_rollback_with_savepoint(
ds, start_transaction, test_geometry=False
)


@pytest.mark.parametrize("auto_begin_transaction", [False, True])
@pytest.mark.parametrize("start_transaction", [False, True])
@pytest.mark.parametrize(
"release_to,rollback_to,expected",
(
([1], [], ["fld3"]),
([2], [], ["fld3"]),
([3], [], ["fld3"]),
([4], [], ["fld3"]),
([], [1], ["fld1", "fld2", "fld3", "fld4", "fld5"]),
([], [2], ["fld1", "fld3", "fld4", "fld5"]),
([], [3], ["fld1", "fld3", "fld5"]),
([], [4], ["fld3", "fld5"]),
),
)
def test_ogr_sqlite_field_operations_savepoint_release(
tmp_vsimem,
auto_begin_transaction,
start_transaction,
release_to,
rollback_to,
expected,
):

filename = str(tmp_vsimem / "test_savepoint_release.db")
ogrtest.check_transaction_savepoint_release(
filename,
"SQLite",
auto_begin_transaction,
start_transaction,
release_to,
rollback_to,
expected,
test_geometry=False,
)
Loading
Loading