From d651892bedd8881e8d06ff2fd0328eae189c57aa Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Thu, 17 May 2012 22:43:40 +0200 Subject: [PATCH] log more verbose error messages if the view primary key selection is wrong. --- .../postgres/qgspostgresprovider.cpp | 31 +++++++++++++++---- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp index 1724bde16f37..42812e040d4c 100644 --- a/src/providers/postgres/qgspostgresprovider.cpp +++ b/src/providers/postgres/qgspostgresprovider.cpp @@ -1423,20 +1423,39 @@ bool QgsPostgresProvider::determinePrimaryKey() else if ( type == "v" ) // the relation is a view { QString primaryKey = mUri.keyColumn(); - int idx = fieldNameIndex( mUri.keyColumn() ); + mPrimaryKeyType = pktUnknown; - if ( idx >= 0 && ( mAttributeFields[idx].type() == QVariant::Int || mAttributeFields[idx].type() == QVariant::LongLong ) ) + if ( !primaryKey.isEmpty() ) { - if ( mUseEstimatedMetadata || uniqueData( mQuery, primaryKey ) ) + int idx = fieldNameIndex( primaryKey ); + + if ( idx >= 0 ) + { + if ( mAttributeFields[idx].type() == QVariant::Int || mAttributeFields[idx].type() == QVariant::LongLong ) + { + if ( mUseEstimatedMetadata || uniqueData( mQuery, primaryKey ) ) + { + mPrimaryKeyType = pktInt; + mPrimaryKeyAttrs << idx; + } + else + { + QgsMessageLog::logMessage( tr( "Primary key field '%1' for view not unique." ).arg( primaryKey ), tr( "PostGIS" ) ); + } + } + else + { + QgsMessageLog::logMessage( tr( "Type '%1' of primary key field '%2' for view invalid." ).arg( mAttributeFields[idx].typeName() ).arg( primaryKey ), tr( "PostGIS" ) ); + } + } + else { - mPrimaryKeyType = pktInt; - mPrimaryKeyAttrs << idx; + QgsMessageLog::logMessage( tr( "Key field '%1' for view not found." ).arg( primaryKey ), tr( "PostGIS" ) ); } } else { QgsMessageLog::logMessage( tr( "No key field for view given." ), tr( "PostGIS" ) ); - mPrimaryKeyType = pktUnknown; } } else