From 659abb8d3534ac2c96906812af5bd4d1073f278f Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Tue, 14 Feb 2012 17:34:17 +0100
Subject: [PATCH] postgres provider: - fix primary key detection, if column is
 behind geometry column - add support for varchar length limits

---
 .../postgres/qgspostgresprovider.cpp          | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
index 0f6a84f65ef..eb11bbe005a 100644
--- a/src/providers/postgres/qgspostgresprovider.cpp
+++ b/src/providers/postgres/qgspostgresprovider.cpp
@@ -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;