[spatialite] Avoid the term "Error", saving style to DB is optional

m-kuhn · m-kuhn · commit b4f3055d02cb · 2017-10-07T15:23:56.000+02:00
diff --git a/src/providers/spatialite/qgsspatialiteprovider.cpp b/src/providers/spatialite/qgsspatialiteprovider.cpp
@@ -5711,15 +5711,15 @@ QGISEXTERN QString loadStyle( const QString &uri, QString &errCause )
 {
   QgsDataSourceUri dsUri( uri );
   QString sqlitePath = dsUri.database();
-  QgsDebugMsg( "Database is: " + sqlitePath );
+  QgsDebugMsgLevel( "Database is: " + sqlitePath, 5 );
 
   // trying to open the SQLite DB
   QgsSqliteHandle *handle = QgsSqliteHandle::openDb( sqlitePath );
   if ( !handle )
   {
     QgsDebugMsg( "Connection to database failed. Save style aborted." );
     errCause = QObject::tr( "Connection to database failed" );
-    return QLatin1String( "" );
+    return QString();
   }
 
   sqlite3 *sqliteHandle = handle->handle();
@@ -5743,9 +5743,9 @@ QGISEXTERN QString loadStyle( const QString &uri, QString &errCause )
   if ( SQLITE_OK != ret )
   {
     QgsSqliteHandle::closeDb( handle );
-    QgsMessageLog::logMessage( QObject::tr( "Error executing query: %1" ).arg( selectQmlQuery ) );
+    QgsMessageLog::logMessage( QObject::tr( "Could not load styles from %1 (Query: %2)" ).arg( sqlitePath, selectQmlQuery ) );
     errCause = QObject::tr( "Error executing loading style. The query was logged" );
-    return QLatin1String( "" );
+    return QString();
   }
 
   QString style = ( rows == 1 ) ? QString::fromUtf8( results[( rows * columns ) + 0 ] ) : QLatin1String( "" );
@@ -5894,7 +5894,7 @@ QGISEXTERN QString getStyleById( const QString &uri, QString styleId, QString &e
   }
   else
   {
-    QgsMessageLog::logMessage( QObject::tr( "Error executing query: %1" ).arg( selectQmlQuery ) );
+    QgsMessageLog::logMessage( QObject::tr( "Style with id %1 not found in %2 (Query: %3)" ).arg( styleId, sqlitePath, selectQmlQuery ) );
     errCause = QObject::tr( "Error executing the select query. The query was logged" );
   }
 

Original file line number	Diff line number	Diff line change
`@@ -5711,15 +5711,15 @@ QGISEXTERN QString loadStyle( const QString &uri, QString &errCause )`
`5711`	`5711`	`{`
`5712`	`5712`	`QgsDataSourceUri dsUri( uri );`
`5713`	`5713`	`QString sqlitePath = dsUri.database();`
`5714`		`- QgsDebugMsg( "Database is: " + sqlitePath );`
	`5714`	`+ QgsDebugMsgLevel( "Database is: " + sqlitePath, 5 );`
`5715`	`5715`
`5716`	`5716`	`// trying to open the SQLite DB`
`5717`	`5717`	`QgsSqliteHandle *handle = QgsSqliteHandle::openDb( sqlitePath );`
`5718`	`5718`	`if ( !handle )`
`5719`	`5719`	`{`
`5720`	`5720`	`QgsDebugMsg( "Connection to database failed. Save style aborted." );`
`5721`	`5721`	`errCause = QObject::tr( "Connection to database failed" );`
`5722`		`- return QLatin1String( "" );`
	`5722`	`+ return QString();`
`5723`	`5723`	`}`
`5724`	`5724`
`5725`	`5725`	`sqlite3 *sqliteHandle = handle->handle();`
`@@ -5743,9 +5743,9 @@ QGISEXTERN QString loadStyle( const QString &uri, QString &errCause )`
`5743`	`5743`	`if ( SQLITE_OK != ret )`
`5744`	`5744`	`{`
`5745`	`5745`	`QgsSqliteHandle::closeDb( handle );`
`5746`		`- QgsMessageLog::logMessage( QObject::tr( "Error executing query: %1" ).arg( selectQmlQuery ) );`
	`5746`	`+ QgsMessageLog::logMessage( QObject::tr( "Could not load styles from %1 (Query: %2)" ).arg( sqlitePath, selectQmlQuery ) );`
`5747`	`5747`	`errCause = QObject::tr( "Error executing loading style. The query was logged" );`
`5748`		`- return QLatin1String( "" );`
	`5748`	`+ return QString();`
`5749`	`5749`	`}`
`5750`	`5750`
`5751`	`5751`	`QString style = ( rows == 1 ) ? QString::fromUtf8( results[( rows * columns ) + 0 ] ) : QLatin1String( "" );`
`@@ -5894,7 +5894,7 @@ QGISEXTERN QString getStyleById( const QString &uri, QString styleId, QString &e`
`5894`	`5894`	`}`
`5895`	`5895`	`else`
`5896`	`5896`	`{`
`5897`		`- QgsMessageLog::logMessage( QObject::tr( "Error executing query: %1" ).arg( selectQmlQuery ) );`
	`5897`	`+ QgsMessageLog::logMessage( QObject::tr( "Style with id %1 not found in %2 (Query: %3)" ).arg( styleId, sqlitePath, selectQmlQuery ) );`
`5898`	`5898`	`errCause = QObject::tr( "Error executing the select query. The query was logged" );`
`5899`	`5899`	`}`
`5900`	`5900`