sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

postgres provider:

Browse Source 
- fix primary key detection, if column is behind geometry column
- add support for varchar length limits
This commit is contained in:
Juergen E. Fischer 2012-02-14 17:34:17 +01:00
parent 54b2cd2c52
commit 659abb8d35
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1096,9 +1096,22 @@ bool QgsPostgresProvider::loadFields()
}
}
}
else if ( fieldTypeName == "varchar" )
{
fieldType = QVariant::String;
QRegExp re( "character varying\\((\\d+)\\)" );
if ( re.exactMatch( formattedFieldType ) )
{
fieldSize = re.cap( 1 ).toInt();
}
else
{
fieldSize = -1;
}
}
else if ( fieldTypeName == "text" ||
fieldTypeName == "bpchar" ||
fieldTypeName == "varchar" ||
fieldTypeName == "bool" ||
fieldTypeName == "geometry" ||
fieldTypeName == "money" ||
@ -1449,20 +1462,20 @@ bool QgsPostgresProvider::determinePrimaryKey()
{
QString name = res.PQgetvalue( i, 0 );
int j;
for ( j = 0; j < mAttributeFields.size() && mAttributeFields[j].name() != name; j++ )
;
int idx = mAttributeFields.key( name, -1 );
if ( j == mAttributeFields.size() )
if ( idx < 0 )
{
QgsDebugMsg( "Skipping " + name );
continue;
}
if ( isInt && mAttributeFields[j].type() != QVariant::Int && mAttributeFields[j].type() != QVariant::LongLong )
if ( isInt &&
mAttributeFields[idx].type() != QVariant::Int &&
mAttributeFields[idx].type() != QVariant::LongLong )
isInt = false;
mPrimaryKeyAttrs << j;
mPrimaryKeyAttrs << idx;
}
mPrimaryKeyType = ( mPrimaryKeyAttrs.size() == 1 && isInt ) ? pktInt : pktFidMap;