Fix #12932 - Send and show layer load errors to user

NathanW2 · NathanW2 · commit 66c7d6868c74 · 2017-11-13T15:51:36.000+10:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -10021,7 +10021,8 @@ QgsVectorLayer *QgisApp::addVectorLayer( const QString &vectorLayerPath, const Q
   }
   else
   {
-    QString msg = tr( "The layer %1 is not a valid layer and can not be added to the map" ).arg( vectorLayerPath );
+    QString message = layer->dataProvider()->error().message( QgsErrorMessage::Text );
+    QString msg = tr( "The layer %1 is not a valid layer and can not be added to the map. Reason: %2" ).arg( vectorLayerPath ).arg( message );
     messageBar()->pushMessage( tr( "Layer is not valid" ), msg, QgsMessageBar::CRITICAL, messageTimeout() );
 
     delete layer;
diff --git a/src/providers/mssql/qgsmssqlprovider.cpp b/src/providers/mssql/qgsmssqlprovider.cpp
@@ -363,6 +363,12 @@ void QgsMssqlProvider::loadMetadata()
   }
 }
 
+void QgsMssqlProvider::setLastError( const QString &error )
+{
+  appendError( error );
+  mLastError = error;
+}
+
 void QgsMssqlProvider::loadFields()
 {
   bool isIdentity = false;
diff --git a/src/providers/mssql/qgsmssqlprovider.h b/src/providers/mssql/qgsmssqlprovider.h
@@ -207,10 +207,7 @@ class QgsMssqlProvider : public QgsVectorDataProvider
     QString mSqlWhereClause;
 
     // Sets the error messages
-    void setLastError( const QString &error )
-    {
-      mLastError = error;
-    }
+    void setLastError( const QString &error );
 
     static void mssqlWkbTypeAndDimension( QgsWkbTypes::Type wkbType, QString &geometryType, int &dim );
     static QgsWkbTypes::Type getWkbType( const QString &wkbType );

Original file line number	Diff line number	Diff line change
`@@ -10021,7 +10021,8 @@ QgsVectorLayer *QgisApp::addVectorLayer( const QString &vectorLayerPath, const Q`
`10021`	`10021`	`}`
`10022`	`10022`	`else`
`10023`	`10023`	`{`
`10024`		`- QString msg = tr( "The layer %1 is not a valid layer and can not be added to the map" ).arg( vectorLayerPath );`
	`10024`	`+ QString message = layer->dataProvider()->error().message( QgsErrorMessage::Text );`
	`10025`	`+ QString msg = tr( "The layer %1 is not a valid layer and can not be added to the map. Reason: %2" ).arg( vectorLayerPath ).arg( message );`
`10025`	`10026`	`messageBar()->pushMessage( tr( "Layer is not valid" ), msg, QgsMessageBar::CRITICAL, messageTimeout() );`
`10026`	`10027`
`10027`	`10028`	`delete layer;`
Original file line number	Diff line number	Diff line change
`@@ -363,6 +363,12 @@ void QgsMssqlProvider::loadMetadata()`
`363`	`363`	`}`
`364`	`364`	`}`
`365`	`365`
	`366`	`+void QgsMssqlProvider::setLastError( const QString &error )`
	`367`	`+{`
	`368`	`+ appendError( error );`
	`369`	`+ mLastError = error;`
	`370`	`+}`
	`371`	`+`
`366`	`372`	`void QgsMssqlProvider::loadFields()`
`367`	`373`	`{`
`368`	`374`	`bool isIdentity = false;`