VeniVidiVici
/
gdal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GPKG: fix FID vs field of same name consistency check when field is not set 

Related to #11527
This commit is contained in:
Even Rouault 2024-12-20 02:24:25 +01:00
parent e7b6c09d3b
commit 84ae5447d6
No known key found for this signature in database
GPG Key ID: 33EBBFC47B3DD87D
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
autotest/ogr/ogr_gpkg.py
View File

@ -5159,6 +5159,11 @@ def test_ogr_gpkg_creation_fid(tmp_vsimem):
assert lyr.SetFeature(f) == ogr.OGRERR_NONE
f = None
f = ogr.Feature(lyr.GetLayerDefn())
f.SetFID(14)
assert lyr.CreateFeature(f) == ogr.OGRERR_NONE
assert f.GetFID() == 14
lyr = ds.CreateLayer("fid_integer64")
assert lyr.CreateField(ogr.FieldDefn("fid", ogr.OFTInteger64)) == ogr.OGRERR_NONE

23
ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
View File

@ -2219,7 +2219,7 @@ void OGRGeoPackageTableLayer::CheckGeometryType(const OGRFeature *poFeature)
static bool CheckFIDAndFIDColumnConsistency(const OGRFeature *poFeature,
int iFIDAsRegularColumnIndex)
{
bool ok = false;
bool ok = true;
if (!poFeature->IsFieldSetAndNotNull(iFIDAsRegularColumnIndex))
{
// nothing to do
@ -2233,21 +2233,26 @@ static bool CheckFIDAndFIDColumnConsistency(const OGRFeature *poFeature,
if (GDALIsValueInRange<int64_t>(dfFID))
{
const auto nFID = static_cast<GIntBig>(dfFID);
if (nFID == poFeature->GetFID())
if (nFID != poFeature->GetFID())
{
ok = true;
ok = false;
CPLError(CE_Failure, CPLE_AppDefined,
"Inconsistent values of FID (" CPL_FRMT_GIB
") and field of same name (%g)",
poFeature->GetFID(),
poFeature->GetFieldAsDouble(iFIDAsRegularColumnIndex));
}
}
}
else if (poFeature->GetFieldAsInteger64(iFIDAsRegularColumnIndex) ==
else if (poFeature->GetFieldAsInteger64(iFIDAsRegularColumnIndex) !=
poFeature->GetFID())
{
ok = true;
}
if (!ok)
{
ok = false;
CPLError(CE_Failure, CPLE_AppDefined,
"Inconsistent values of FID and field of same name");
"Inconsistent values of FID (" CPL_FRMT_GIB
") and field of same name (" CPL_FRMT_GIB ")",
poFeature->GetFID(),
poFeature->GetFieldAsInteger64(iFIDAsRegularColumnIndex));
}
return ok;
}