Skip to content

Commit 87f4410

Browse files
committed
[OGR provider] Fix opening of GeoPackage datasets with foreign key violation
1 parent e213bde commit 87f4410

File tree

2 files changed

+29
-0
lines changed

2 files changed

+29
-0
lines changed

src/providers/ogr/qgsogrprovider.cpp

+10
Original file line numberDiff line numberDiff line change
@@ -3938,11 +3938,21 @@ GDALDatasetH QgsOgrProviderUtils::GDALOpenWrapper( const char *pszPath, bool bUp
39383938
bIsLocalGpkg = true;
39393939
}
39403940

3941+
bool modify_OGR_GPKG_FOREIGN_KEY_CHECK = !CPLGetConfigOption( "OGR_GPKG_FOREIGN_KEY_CHECK", nullptr );
3942+
if ( modify_OGR_GPKG_FOREIGN_KEY_CHECK )
3943+
{
3944+
CPLSetThreadLocalConfigOption( "OGR_GPKG_FOREIGN_KEY_CHECK", "NO" );
3945+
}
3946+
39413947
const int nOpenFlags = GDAL_OF_VECTOR | ( bUpdate ? GDAL_OF_UPDATE : 0 );
39423948
GDALDatasetH hDS = GDALOpenEx( pszPath, nOpenFlags, nullptr, papszOpenOptions, nullptr );
39433949
CSLDestroy( papszOpenOptions );
39443950

39453951
CPLSetThreadLocalConfigOption( "OGR_SQLITE_JOURNAL", nullptr );
3952+
if ( modify_OGR_GPKG_FOREIGN_KEY_CHECK )
3953+
{
3954+
CPLSetThreadLocalConfigOption( "OGR_GPKG_FOREIGN_KEY_CHECK", nullptr );
3955+
}
39463956

39473957
if ( !hDS )
39483958
{

tests/src/python/test_provider_ogr_gpkg.py

+19
Original file line numberDiff line numberDiff line change
@@ -1344,6 +1344,25 @@ def testUniqueValuesOnFidColumn(self):
13441344
self.assertEqual(vl1.uniqueValues(0), {1, 2})
13451345
self.assertEqual(vl1.uniqueValues(1), {'one', 'two'})
13461346

1347+
def testForeignKeyViolation(self):
1348+
"""Test that we can open a dataset with a foreign key violation"""
1349+
1350+
tmpfile = os.path.join(self.basetestpath, 'testForeignKeyViolation.gpkg')
1351+
ds = ogr.GetDriverByName('GPKG').CreateDataSource(tmpfile)
1352+
lyr = ds.CreateLayer('test', geom_type=ogr.wkbPoint)
1353+
f = ogr.Feature(lyr.GetLayerDefn())
1354+
f.SetGeometry(ogr.CreateGeometryFromWkt('POINT(0 1)'))
1355+
lyr.CreateFeature(f)
1356+
ds.ExecuteSQL("PRAGMA foreign_keys = OFF")
1357+
ds.ExecuteSQL("CREATE TABLE foo(id INTEGER)")
1358+
ds.ExecuteSQL("CREATE TABLE bar(fkey INTEGER, CONSTRAINT fkey_constraint FOREIGN KEY (fkey) REFERENCES foo(id))")
1359+
ds.ExecuteSQL("INSERT INTO bar VALUES (1)")
1360+
ds = None
1361+
vl = QgsVectorLayer('{}'.format(tmpfile) + "|layername=" + "test", 'test', 'ogr')
1362+
self.assertTrue(vl.isValid())
1363+
fids = set([f['fid'] for f in vl.getFeatures()])
1364+
self.assertEqual(len(fids), 1)
1365+
13471366

13481367
if __name__ == '__main__':
13491368
unittest.main()

0 commit comments

Comments
 (0)