Skip to content

Commit

Permalink
fix geography detection (fixes #11375)
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Oct 15, 2014
1 parent 962a7d9 commit dfafa5d
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/providers/postgres/qgspostgresprovider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) );
}
Expand Down Expand Up @@ -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 = "";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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 )
Expand Down

0 comments on commit dfafa5d

Please sign in to comment.