sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Prioritise provider default literals over reused values when

Browse Source 
creating a new feature
This commit is contained in:
Nyall Dawson 2016-11-14 09:24:06 +10:00 committed by Matthias Kuhn
parent 631bd48aa0
commit 249c8dca20
2 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/core/qgsvectorlayerutils.cpp
View File

@ -27,18 +27,6 @@ bool QgsVectorLayerUtils::valueExists( const QgsVectorLayer* layer, int fieldInd
if ( fieldIndex < 0 || fieldIndex >= fields.count() )
return false;
// check - if value is a provider side defaultValueClause then we exclude it from the check
if ( fields.fieldOrigin( fieldIndex ) == QgsFields::OriginProvider )
{
int providerIdx = fields.fieldOriginIndex( fieldIndex );
QString providerDefaultClause = layer->dataProvider()->defaultValueClause( providerIdx );
if ( !providerDefaultClause.isEmpty() && value.toString() == providerDefaultClause )
{
// exempt from check
return false;
}
}
QString fieldName = fields.at( fieldIndex ).name();
// build up an optimised feature request
@ -272,19 +260,24 @@ QgsFeature QgsVectorLayerUtils::createFeature( QgsVectorLayer* layer, const QgsG
}
}
// 3. passed attribute value
// note - deliberately not using else if!
if ( !v.isValid() && attributes.contains( idx ) )
{
v = attributes.value( idx );
}
// 4. provider side default literal
// 3. provider side default literal
// note - deliberately not using else if!
if ( !v.isValid() && fields.fieldOrigin( idx ) == QgsFields::OriginProvider )
{
int providerIndex = fields.fieldOriginIndex( idx );
v = layer->dataProvider()->defaultValue( providerIndex );
if ( v.isValid() )
{
//trust that the provider default has been sensibly set not to violate any constraints
checkUnique = false;
}
}
// 4. passed attribute value
// note - deliberately not using else if!
if ( !v.isValid() && attributes.contains( idx ) )
{
v = attributes.value( idx );
}
// last of all... check that unique constraints are respected

8
tests/src/python/test_provider_spatialite.py
View File

@ -474,14 +474,14 @@ class TestQgsSpatialiteProvider(unittest.TestCase, ProviderTestCase):
f = QgsVectorLayerUtils.createFeature(vl)
self.assertEqual(f.attributes(), [None, "qgis 'is good", 5, 5.7, None])
# check that provider passed attribute values take precedence over default literals
# check that provider default literals take precedence over passed attribute values
f = QgsVectorLayerUtils.createFeature(vl, attributes={1: 'qgis is great', 0: 3})
self.assertEqual(f.attributes(), [3, "qgis is great", 5, 5.7, None])
self.assertEqual(f.attributes(), [3, "qgis 'is good", 5, 5.7, None])
# test take vector layer default value expression overrides postgres provider default clause
# test that vector layer default value expression overrides provider default literal
vl.setDefaultValueExpression(3, "4*3")
f = QgsVectorLayerUtils.createFeature(vl, attributes={1: 'qgis is great', 0: 3})
self.assertEqual(f.attributes(), [3, "qgis is great", 5, 12, None])
self.assertEqual(f.attributes(), [3, "qgis 'is good", 5, 12, None])
if __name__ == '__main__':
unittest.main()