fix geography detection (fixes #11375)

jef-n · jef-n · commit dfafa5dd4764 · 2014-10-16T01:58:03.000+02:00
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -2193,7 +2193,7 @@ bool QgsPostgresProvider::changeGeometryValues( QgsGeometryMap & geometry_map )
                        .arg( result.PQresultStatus() ).arg( PGRES_TUPLES_OK ) );
           throw PGException( result );
         }
-        // TODO: watch out for NULL , handle somehow
+        // TODO: watch out for NULL, handle somehow
         old_tg_id = result.PQgetvalue( 0, 0 ).toLong();
         QgsDebugMsg( QString( "Old TG id is %1" ).arg( old_tg_id ) );
       }
@@ -2681,15 +2681,15 @@ bool QgsPostgresProvider::getGeometryDetails()
     if ( !mIsQuery )
     {
       layerProperty.schemaName = schemaName;
-      layerProperty.tableName = tableName;
+      layerProperty.tableName  = tableName;
     }
     else
     {
       layerProperty.schemaName = "";
-      layerProperty.tableName = mQuery;
+      layerProperty.tableName  = mQuery;
     }
     layerProperty.geometryColName = mGeometryColumn;
-    layerProperty.geometryColType = sctNone;
+    layerProperty.geometryColType = mSpatialColType;
     layerProperty.force2d         = false;
 
     QString delim = "";
@@ -2773,7 +2773,7 @@ bool QgsPostgresProvider::getGeometryDetails()
   return mValid;
 }
 
-bool QgsPostgresProvider::convertField( QgsField &field , const QMap<QString, QVariant>* options )
+bool QgsPostgresProvider::convertField( QgsField &field, const QMap<QString, QVariant> *options )
 {
   //determine field type to use for strings
   QString stringFieldType = "varchar";
@@ -3427,7 +3427,7 @@ QGISEXTERN bool saveStyle( const QString& uri, const QString& qmlStyle, const QS
           .arg( QgsPostgresConn::quotedValue( styleName.isEmpty() ? dsUri.table() : styleName ) )
           // Must be the final .arg replacement - see above
           .arg( QgsPostgresConn::quotedValue( qmlStyle ),
-                  QgsPostgresConn::quotedValue( sldStyle ) );
+                QgsPostgresConn::quotedValue( sldStyle ) );
   }
 
   if ( useAsDefault )

Original file line number	Diff line number	Diff line change
`@@ -2193,7 +2193,7 @@ bool QgsPostgresProvider::changeGeometryValues( QgsGeometryMap & geometry_map )`
`2193`	`2193`	`.arg( result.PQresultStatus() ).arg( PGRES_TUPLES_OK ) );`
`2194`	`2194`	`throw PGException( result );`
`2195`	`2195`	`}`
`2196`		`- // TODO: watch out for NULL , handle somehow`
	`2196`	`+ // TODO: watch out for NULL, handle somehow`
`2197`	`2197`	`old_tg_id = result.PQgetvalue( 0, 0 ).toLong();`
`2198`	`2198`	`QgsDebugMsg( QString( "Old TG id is %1" ).arg( old_tg_id ) );`
`2199`	`2199`	`}`
`@@ -2681,15 +2681,15 @@ bool QgsPostgresProvider::getGeometryDetails()`
`2681`	`2681`	`if ( !mIsQuery )`
`2682`	`2682`	`{`
`2683`	`2683`	`layerProperty.schemaName = schemaName;`
`2684`		`- layerProperty.tableName = tableName;`
	`2684`	`+ layerProperty.tableName = tableName;`
`2685`	`2685`	`}`
`2686`	`2686`	`else`
`2687`	`2687`	`{`
`2688`	`2688`	`layerProperty.schemaName = "";`
`2689`		`- layerProperty.tableName = mQuery;`
	`2689`	`+ layerProperty.tableName = mQuery;`
`2690`	`2690`	`}`
`2691`	`2691`	`layerProperty.geometryColName = mGeometryColumn;`
`2692`		`- layerProperty.geometryColType = sctNone;`
	`2692`	`+ layerProperty.geometryColType = mSpatialColType;`
`2693`	`2693`	`layerProperty.force2d = false;`
`2694`	`2694`
`2695`	`2695`	`QString delim = "";`
`@@ -2773,7 +2773,7 @@ bool QgsPostgresProvider::getGeometryDetails()`
`2773`	`2773`	`return mValid;`
`2774`	`2774`	`}`
`2775`	`2775`
`2776`		`-bool QgsPostgresProvider::convertField( QgsField &field , const QMap<QString, QVariant>* options )`
	`2776`	`+bool QgsPostgresProvider::convertField( QgsField &field, const QMap<QString, QVariant> *options )`
`2777`	`2777`	`{`
`2778`	`2778`	`//determine field type to use for strings`
`2779`	`2779`	`QString stringFieldType = "varchar";`
`@@ -3427,7 +3427,7 @@ QGISEXTERN bool saveStyle( const QString& uri, const QString& qmlStyle, const QS`
`3427`	`3427`	`.arg( QgsPostgresConn::quotedValue( styleName.isEmpty() ? dsUri.table() : styleName ) )`
`3428`	`3428`	`// Must be the final .arg replacement - see above`
`3429`	`3429`	`.arg( QgsPostgresConn::quotedValue( qmlStyle ),`
`3430`		`- QgsPostgresConn::quotedValue( sldStyle ) );`
	`3430`	`+ QgsPostgresConn::quotedValue( sldStyle ) );`
`3431`	`3431`	`}`
`3432`	`3432`
`3433`	`3433`	`if ( useAsDefault )`