src/core/qgscoordinatereferencesystem.cpp

@@ -1051,27 +1051,38 @@ bool QgsCoordinateReferenceSystem::readXML( QDomNode & theNode )
   {
     bool initialized = false;
 
-    QDomNode myNode = srsNode.namedItem( "authid" );
-    if ( !myNode.isNull() )
-    {
-      operator=( QgsCRSCache::instance()->crsByAuthId( myNode.toElement().text() ) );
-      if ( isValid() )
-      {
-        initialized = true;
-      }
-    }
+    long srsid = srsNode.namedItem( "srsid" ).toElement().text().toLong();
 
-    if ( !initialized )
+    QDomNode myNode;
+
+    if ( srsid < USER_CRS_START_ID )
     {
-      myNode = srsNode.namedItem( "epsg" );
+      myNode = srsNode.namedItem( "authid" );
       if ( !myNode.isNull() )
       {
-        operator=( QgsCRSCache::instance()->crsByEpsgId( myNode.toElement().text().toLong() ) );
+        operator=( QgsCRSCache::instance()->crsByAuthId( myNode.toElement().text() ) );
         if ( isValid() )
         {
           initialized = true;
         }
       }
+
+      if ( !initialized )
+      {
+        myNode = srsNode.namedItem( "epsg" );
+        if ( !myNode.isNull() )
+        {
+          operator=( QgsCRSCache::instance()->crsByEpsgId( myNode.toElement().text().toLong() ) );
+          if ( isValid() )
+          {
+            initialized = true;
+          }
+        }
+      }
+    }
+    else
+    {
+      QgsDebugMsg( "Ignoring authid/epsg for user crs." );
     }
 
     if ( initialized )

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