When requesting a specific type/srid don't try to detect its validity

Avoids double-checking from browser and data selector See #32276
qgis · Oct 17, 2019 · e6a8a2f · e6a8a2f
1 parent cc8c2b6
commit e6a8a2f
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -3529,7 +3529,7 @@ bool QgsPostgresProvider::getGeometryDetails()
     }
   }
 
-  QString detectedType;
+  QString detectedType = mRequestedGeomType == QgsWkbTypes::Unknown ? QString() : QgsPostgresConn::postgisWkbTypeName( mRequestedGeomType );
   QString detectedSrid = mRequestedSrid;
   if ( !schemaName.isEmpty() )
   {
@@ -3545,14 +3545,17 @@ bool QgsPostgresProvider::getGeometryDetails()
 
     if ( result.PQntuples() == 1 )
     {
-      detectedType = result.PQgetvalue( 0, 0 );
+      QString dt = result.PQgetvalue( 0, 0 );
+      if ( dt != "GEOMETRY" ) detectedType = dt;
+
       QString dim = result.PQgetvalue( 0, 2 );
       if ( dim == QLatin1String( "3" ) && !detectedType.endsWith( 'M' ) )
         detectedType += QLatin1String( "Z" );
       else if ( dim == QLatin1String( "4" ) )
         detectedType += QLatin1String( "ZM" );
 
-      detectedSrid = result.PQgetvalue( 0, 1 );
+      QString ds = result.PQgetvalue( 0, 1 );
+      if ( ds != "0" ) detectedSrid = ds;
       mSpatialColType = SctGeometry;
     }
     else
@@ -3574,8 +3577,10 @@ bool QgsPostgresProvider::getGeometryDetails()
 
       if ( result.PQntuples() == 1 )
       {
-        detectedType = result.PQgetvalue( 0, 0 );
-        detectedSrid = result.PQgetvalue( 0, 1 );
+        QString dt = result.PQgetvalue( 0, 0 );
+        if ( dt != "GEOMETRY" ) detectedType = dt;
+        QString ds = result.PQgetvalue( 0, 1 );
+        if ( ds != "0" ) detectedSrid = ds;
         mSpatialColType = SctGeography;
       }
       else