Fix crash and test

qgis · Jul 6, 2021 · 4acc1bd · 4acc1bd
1 parent 1f40090
commit 4acc1bd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/gui/qgsqueryresultwidget.cpp b/src/gui/qgsqueryresultwidget.cpp
@@ -161,7 +161,7 @@ void QgsQueryResultWidget::updateButtons()
 {
   mFilterToolButton->setEnabled( false );
   mExecuteButton->setEnabled( ! mSqlEditor->text().isEmpty() );
-  mLoadAsNewLayerGroupBox->setVisible( mConnection->capabilities().testFlag( QgsAbstractDatabaseProviderConnection::Capability::SqlLayers ) );
+  mLoadAsNewLayerGroupBox->setVisible( mConnection && mConnection->capabilities().testFlag( QgsAbstractDatabaseProviderConnection::Capability::SqlLayers ) );
   mLoadAsNewLayerGroupBox->setEnabled(
     mSqlErrorMessage.isEmpty() &&
     mFirstRowFetched

diff --git a/tests/src/gui/testqgsqueryresultwidget.cpp b/tests/src/gui/testqgsqueryresultwidget.cpp
@@ -85,8 +85,8 @@ void TestQgsQueryResultWidget::testWidgetCrash()
   auto res = new QgsAbstractDatabaseProviderConnection::QueryResult( mConn->execSql( QStringLiteral( "SELECT * FROM qgis_test.random_big_data" ) ) );
   auto model = new QgsQueryResultModel( *res );
   bool exited { false };
-  QTimer::singleShot( 0, model, [ & ] { delete res; } );
-  QTimer::singleShot( 1, model, [ & ] { exited = true; } );
+  QTimer::singleShot( 1, model, [ & ] { delete res; } );
+  QTimer::singleShot( 2, model, [ & ] { exited = true; } );
   while ( ! exited )
     QgsApplication::processEvents();
   const auto rowCount { model->rowCount( model->index( -1, -1 ) ) };
@@ -140,9 +140,9 @@ void TestQgsQueryResultWidget::testCodeEditorApis()
   connect( w->mApiFetcher, &QgsConnectionsApiFetcher::fetchingFinished, w.get(), [ & ] { exited = true; } );
   while ( ! exited )
     QgsApplication::processEvents();
-  QVERIFY( w->mSqlEditor->fieldNames().contains( QStringLiteral( "qgis_test" ) ) );
-  QVERIFY( w->mSqlEditor->fieldNames().contains( QStringLiteral( "random_big_data" ) ) );
-  QVERIFY( w->mSqlEditor->fieldNames().contains( QStringLiteral( "descr" ) ) );
+  QVERIFY( w->mSqlEditor->extraKeywords().contains( QStringLiteral( "qgis_test" ) ) );
+  QVERIFY( w->mSqlEditor->extraKeywords().contains( QStringLiteral( "random_big_data" ) ) );
+  QVERIFY( w->mSqlEditor->extraKeywords().contains( QStringLiteral( "descr" ) ) );
 
   // Test feedback interrupt
   w = std::make_unique<QgsQueryResultWidget>( nullptr, makeConn() );