Fix crash when connection is invalid (nullptr)

qgis · Jul 6, 2021 · ebfed52 · ebfed52
1 parent 5d5e828
commit ebfed52
Showing 1 changed file with 23 additions and 20 deletions.
diff --git a/src/gui/qgsqueryresultwidget.cpp b/src/gui/qgsqueryresultwidget.cpp
@@ -64,26 +64,6 @@ QgsQueryResultWidget::QgsQueryResultWidget( QWidget *parent, QgsAbstractDatabase
   mStatusLabel->hide();
   mSqlErrorText->hide();
 
-  // Configure the load layer interface
-  if ( ! connection->sqlLayerDefinitionCapabilities().testFlag( QgsAbstractDatabaseProviderConnection::SqlLayerDefinitionCapability::PrimaryKeys ) )
-  {
-    mPkColumnsCheckBox->hide();
-    mPkColumnsComboBox->hide();
-  }
-
-  if ( ! connection->sqlLayerDefinitionCapabilities().testFlag( QgsAbstractDatabaseProviderConnection::SqlLayerDefinitionCapability::GeometryColumn ) )
-  {
-    mGeometryColumnCheckBox->hide();
-    mGeometryColumnComboBox->hide();
-  }
-
-  if ( ! connection->sqlLayerDefinitionCapabilities().testFlag( QgsAbstractDatabaseProviderConnection::SqlLayerDefinitionCapability::Filters ) )
-  {
-    mFilterLabel->hide();
-    mFilterToolButton->hide();
-    mFilterLineEdit->hide();
-  }
-
   mLoadAsNewLayerGroupBox->setCollapsed( true );
   setConnection( connection );
 }
@@ -315,7 +295,30 @@ void QgsQueryResultWidget::setConnection( QgsAbstractDatabaseProviderConnection
 
   if ( connection )
   {
+
+    // Configure the load layer interface
+    if ( ! connection->sqlLayerDefinitionCapabilities().testFlag( QgsAbstractDatabaseProviderConnection::SqlLayerDefinitionCapability::PrimaryKeys ) )
+    {
+      mPkColumnsCheckBox->hide();
+      mPkColumnsComboBox->hide();
+    }
+
+    if ( ! connection->sqlLayerDefinitionCapabilities().testFlag( QgsAbstractDatabaseProviderConnection::SqlLayerDefinitionCapability::GeometryColumn ) )
+    {
+      mGeometryColumnCheckBox->hide();
+      mGeometryColumnComboBox->hide();
+    }
+
+    if ( ! connection->sqlLayerDefinitionCapabilities().testFlag( QgsAbstractDatabaseProviderConnection::SqlLayerDefinitionCapability::Filters ) )
+    {
+      mFilterLabel->hide();
+      mFilterToolButton->hide();
+      mFilterLineEdit->hide();
+    }
+
     mSqlEditor->setFieldNames( QStringList( ) );
+    // Add provider specific APIs
+    // TODO mSqlEditor->lexer()->apis()
     mSqlErrorText->setFieldNames( QStringList( ) );
     mApiFetcher = new QgsConnectionsApiFetcher( connection );
     mApiFetcher->moveToThread( &mWorkerThread );