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

postgres provider: fix indexing of default values (fixes #12996)

Browse Source
This commit is contained in:
Juergen E. Fischer 2015-06-19 15:19:52 +02:00
parent cecae9f107
commit 61f39d6ff3
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/providers/postgres/qgspostgresprovider.cpp
View File

@ -905,8 +905,8 @@ bool QgsPostgresProvider::loadFields()
fields << fieldName;
mAttrPalIndexName.insert( i, fieldName );
mDefaultValues.insert( mAttributeFields.size(), defValMap[tableoid][attnum] );
mAttributeFields.append( QgsField( fieldName, fieldType, fieldTypeName, fieldSize, fieldPrec, fieldComment ) );
mDefaultValues.insert( i, defValMap[tableoid][attnum] );
}
return true;
@ -1778,23 +1778,24 @@ bool QgsPostgresProvider::addFeatures( QgsFeatureList &flist )
for ( int i = 0; i < fieldId.size(); i++ )
{
QVariant value = attrs[ fieldId[i] ];
int attrIdx = fieldId[i];
QVariant value = attrs[ attrIdx ];
QString v;
if ( value.isNull() )
{
const QgsField &fld = field( fieldId[i] );
v = paramValue( defaultValues[i], defaultValues[i] );
features->setAttribute( fieldId[i], convertValue( fld.type(), v ) );
const QgsField &fld = field( attrIdx );
v = paramValue( defaultValues[ attrIdx ], defaultValues[ attrIdx ] );
features->setAttribute( idx, convertValue( fld.type(), v ) );
}
else
{
v = paramValue( value.toString(), defaultValues[i] );
v = paramValue( value.toString(), defaultValues[ attrIdx ] );
if ( v != value.toString() )
{
const QgsField &fld = field( fieldId[i] );
features->setAttribute( fieldId[i], convertValue( fld.type(), v ) );
const QgsField &fld = field( attrIdx );
features->setAttribute( attrIdx, convertValue( fld.type(), v ) );
}
}