postgres provider: fix b85af12

jef-n · jef-n · commit 0caf6650c1c9 · 2013-05-14T14:26:31.000+02:00
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -2640,8 +2640,13 @@ bool QgsPostgresProvider::getGeometryDetails()
     }
   }
 
-  if ( QgsPostgresConn::wkbTypeFromPostgis( detectedType ) == QGis::WKBUnknown )
+  mDetectedGeomType = QgsPostgresConn::wkbTypeFromPostgis( detectedType );
+  mDetectedSrid     = detectedSrid;
+
+  if ( mDetectedGeomType == QGis::WKBUnknown )
   {
+    mDetectedSrid = "";
+
     QgsPostgresLayerProperty layerProperty;
     if ( !mIsQuery )
     {
@@ -2675,9 +2680,6 @@ bool QgsPostgresProvider::getGeometryDetails()
       {
         QgsMessageLog::logMessage( tr( "Geometry type and srid for empty column %1 of %2 undefined." ).arg( mGeometryColumn ).arg( mQuery ) );
       }
-
-      detectedType = "";
-      detectedSrid = "";
     }
     else
     {
@@ -2697,29 +2699,18 @@ bool QgsPostgresProvider::getGeometryDetails()
         if ( layerProperty.size() == 1 )
         {
           // only what we requested is available
-          detectedType = layerProperty.types[ 0 ];
-          detectedSrid = layerProperty.srids[ 0 ];
-        }
-        else
-        {
-          // we need to filter
-          detectedType = "";
-          detectedSrid = "";
+          mDetectedGeomType = layerProperty.types[ 0 ];
+          mDetectedSrid     = QString::number( layerProperty.srids[ 0 ] );
         }
       }
       else
       {
         // geometry type undetermined or not unrequested
         QgsMessageLog::logMessage( tr( "Feature type or srid for %1 of %2 could not be determined or was not requested." ).arg( mGeometryColumn ).arg( mQuery ) );
-        detectedType = "";
-        detectedSrid = "";
       }
     }
   }
 
-  mDetectedGeomType = QgsPostgresConn::wkbTypeFromPostgis( detectedType );
-  mDetectedSrid     = detectedSrid;
-
   QgsDebugMsg( QString( "Detected SRID is %1" ).arg( mDetectedSrid ) );
   QgsDebugMsg( QString( "Requested SRID is %1" ).arg( mRequestedSrid ) );
   QgsDebugMsg( QString( "Detected type is %1" ).arg( mDetectedGeomType ) );

Original file line number	Diff line number	Diff line change
`@@ -2640,8 +2640,13 @@ bool QgsPostgresProvider::getGeometryDetails()`
`2640`	`2640`	`}`
`2641`	`2641`	`}`
`2642`	`2642`
`2643`		`- if ( QgsPostgresConn::wkbTypeFromPostgis( detectedType ) == QGis::WKBUnknown )`
	`2643`	`+ mDetectedGeomType = QgsPostgresConn::wkbTypeFromPostgis( detectedType );`
	`2644`	`+ mDetectedSrid = detectedSrid;`
	`2645`	`+`
	`2646`	`+ if ( mDetectedGeomType == QGis::WKBUnknown )`
`2644`	`2647`	`{`
	`2648`	`+ mDetectedSrid = "";`
	`2649`	`+`
`2645`	`2650`	`QgsPostgresLayerProperty layerProperty;`
`2646`	`2651`	`if ( !mIsQuery )`
`2647`	`2652`	`{`
`@@ -2675,9 +2680,6 @@ bool QgsPostgresProvider::getGeometryDetails()`
`2675`	`2680`	`{`
`2676`	`2681`	`QgsMessageLog::logMessage( tr( "Geometry type and srid for empty column %1 of %2 undefined." ).arg( mGeometryColumn ).arg( mQuery ) );`
`2677`	`2682`	`}`
`2678`		`-`
`2679`		`- detectedType = "";`
`2680`		`- detectedSrid = "";`
`2681`	`2683`	`}`
`2682`	`2684`	`else`
`2683`	`2685`	`{`
`@@ -2697,29 +2699,18 @@ bool QgsPostgresProvider::getGeometryDetails()`
`2697`	`2699`	`if ( layerProperty.size() == 1 )`
`2698`	`2700`	`{`
`2699`	`2701`	`// only what we requested is available`
`2700`		`- detectedType = layerProperty.types[ 0 ];`
`2701`		`- detectedSrid = layerProperty.srids[ 0 ];`
`2702`		`- }`
`2703`		`- else`
`2704`		`- {`
`2705`		`- // we need to filter`
`2706`		`- detectedType = "";`
`2707`		`- detectedSrid = "";`
	`2702`	`+ mDetectedGeomType = layerProperty.types[ 0 ];`
	`2703`	`+ mDetectedSrid = QString::number( layerProperty.srids[ 0 ] );`
`2708`	`2704`	`}`
`2709`	`2705`	`}`
`2710`	`2706`	`else`
`2711`	`2707`	`{`
`2712`	`2708`	`// geometry type undetermined or not unrequested`
`2713`	`2709`	`QgsMessageLog::logMessage( tr( "Feature type or srid for %1 of %2 could not be determined or was not requested." ).arg( mGeometryColumn ).arg( mQuery ) );`
`2714`		`- detectedType = "";`
`2715`		`- detectedSrid = "";`
`2716`	`2710`	`}`
`2717`	`2711`	`}`
`2718`	`2712`	`}`
`2719`	`2713`
`2720`		`- mDetectedGeomType = QgsPostgresConn::wkbTypeFromPostgis( detectedType );`
`2721`		`- mDetectedSrid = detectedSrid;`
`2722`		`-`
`2723`	`2714`	`QgsDebugMsg( QString( "Detected SRID is %1" ).arg( mDetectedSrid ) );`
`2724`	`2715`	`QgsDebugMsg( QString( "Requested SRID is %1" ).arg( mRequestedSrid ) );`
`2725`	`2716`	`QgsDebugMsg( QString( "Detected type is %1" ).arg( mDetectedGeomType ) );`