From da818dd706b7301ad39a237e36d664654a68791d Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Tue, 22 Oct 2019 16:32:32 +0200 Subject: [PATCH] Do not hard-code default estimatedMetadata default in wrong place Re-uses existing static function in QgsPostgresConn class --- src/providers/postgres/qgspostgresdataitems.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/providers/postgres/qgspostgresdataitems.cpp b/src/providers/postgres/qgspostgresdataitems.cpp index 6d95a5264b0..1d19cb3d7f7 100644 --- a/src/providers/postgres/qgspostgresdataitems.cpp +++ b/src/providers/postgres/qgspostgresdataitems.cpp @@ -336,20 +336,19 @@ QString QgsPGLayerItem::createUri() return QString(); } - QgsDataSourceUri uri( QgsPostgresConn::connUri( connItem->name() ).connectionInfo( false ) ); + const QString &connName = connItem->name(); + + QgsDataSourceUri uri( QgsPostgresConn::connUri( connName ).connectionInfo( false ) ); const QgsSettings &settings = QgsSettings(); - QString basekey = QStringLiteral( "/PostgreSQL/connections/%1" ).arg( connItem->name() ); + QString basekey = QStringLiteral( "/PostgreSQL/connections/%1" ).arg( connName ); QStringList defPk( settings.value( QStringLiteral( "%1/keys/%2/%3" ).arg( basekey, mLayerProperty.schemaName, mLayerProperty.tableName ), QVariant( !mLayerProperty.pkCols.isEmpty() ? QStringList( mLayerProperty.pkCols.at( 0 ) ) : QStringList() ) ).toStringList() ); - bool useEstimatedMetadata( settings.value( - QStringLiteral( "%1/estimatedMetadata" ).arg( basekey ), - false - ).toBool() ); + const bool useEstimatedMetadata = QgsPostgresConn::useEstimatedMetadata( connName ); uri.setUseEstimatedMetadata( useEstimatedMetadata ); QStringList cols;