Version 3.8.1

* Removed exception in table validation. Now only printing a warning if table count does not match.
  This ensures a complete database even if validation finds issues.
* Now keeping indexes when finishing DFD database. This avoids the `preparing database` message in
  Little Navmap when loading the database the first time.

Author: albar965

CHANGELOG.txt

@@ -3,6 +3,15 @@ For example: #3 is https://github.com/albar965/littlenavmap/issues/3.
 
 ===============================================================================
 
+# Version 3.8.1
+
+* Removed exception in table validation. Now only printing a warning if table count does not match.
+  This ensures a complete database even if validation finds issues.
+* Now keeping indexes when finishing DFD database. This avoids the `preparing database` message in
+  Little Navmap when loading the database the first time.
+
+===============================================================================
+
 # Version 3.8.0
 
 * Fixed issue in scenery library loader where airports were wrongly recognized as MSFS POI dummies.

src/atools.cpp

@@ -35,7 +35,7 @@ const static QChar SEP(QDir::separator());
 
 QString version()
 {
-  return "3.8.0"; // VERSION_NUMBER - atools
+  return "3.8.1"; // VERSION_NUMBER - atools
 }
 
 QString gitRevision()

src/fs/navdatabase.cpp

@@ -88,12 +88,22 @@ void NavDatabase::create(const QString& codec)
   if(options != nullptr)
     qDebug() << Q_FUNC_INFO << *options;
 
-  createInternal(codec);
+  bool foundError = false;
+  createInternal(codec, foundError);
   if(aborted)
     // Remove all (partial) changes
     db->rollback();
   else
     createDatabaseReportShort();
+
+  if(foundError)
+  {
+    qWarning() << Qt::endl;
+    qWarning() << "*****************************************************************************";
+    qWarning() << "*** Found warnings during basic validation. See log for more information. ***";
+    qWarning() << "*****************************************************************************";
+    qWarning() << Qt::endl;
+  }
 }
 
 void NavDatabase::createAirspaceSchema()
@@ -551,7 +561,7 @@ int NavDatabase::countMsSimSteps()
   return total;
 }
 
-void NavDatabase::createInternal(const QString& sceneryConfigCodec)
+void NavDatabase::createInternal(const QString& sceneryConfigCodec, bool& foundError)
 {
   SceneryCfg sceneryCfg(sceneryConfigCodec);
 
@@ -837,7 +847,7 @@ void NavDatabase::createInternal(const QString& sceneryConfigCodec)
   }
 
   if(options->isBasicValidation())
-    basicValidation(&progress);
+    basicValidation(&progress, foundError);
 
   if(options->isDatabaseReport())
   {
@@ -1195,29 +1205,32 @@ bool NavDatabase::loadFsxP3dMsfsPost(ProgressHandler *progress)
   return false;
 }
 
-bool NavDatabase::basicValidation(ProgressHandler *progress)
+bool NavDatabase::basicValidation(ProgressHandler *progress, bool& foundError)
 {
   if((aborted = progress->reportOther(tr("Basic Validation"))))
     return true;
 
   const QMap<QString, int>& basicValidationTables = options->getBasicValidationTables();
   for(auto it = basicValidationTables.begin(); it != basicValidationTables.end(); ++it)
-    basicValidateTable(it.key(), it.value());
+    basicValidateTable(it.key(), it.value(), foundError);
 
   return false;
 }
 
-void NavDatabase::basicValidateTable(const QString& table, int minCount)
+void NavDatabase::basicValidateTable(const QString& table, int minCount, bool& foundError)
 {
   SqlUtil util(db);
   if(!util.hasTable(table))
     throw Exception("Table \"" + table + "\" not found.");
 
   int count = 0;
   if((count = util.rowCount(table)) < minCount)
-    throw Exception(QString("Table \"%1\" has only %2 rows. Minimum required is %3").arg(table).arg(count).arg(minCount));
-
-  qInfo() << "Table" << table << "is OK. Has" << count << "rows. Minimum required is" << minCount;
+  {
+    qWarning() << "*** Table" << table << "has only" << count << "rows. Minimum required is" << minCount << "***";
+    foundError = true;
+  }
+  else
+    qInfo() << "Table" << table << "is OK. Has" << count << "rows. Minimum required is" << minCount;
 }
 
 void NavDatabase::runPreparationPost245(atools::sql::SqlDatabase& db)

src/fs/navdatabase.h

@@ -126,7 +126,7 @@ class NavDatabase
   void createSchemaInternal(atools::fs::ProgressHandler *progress = nullptr);
 
   /* Internal creation of the full database */
-  void createInternal(const QString& sceneryConfigCodec);
+  void createInternal(const QString& sceneryConfigCodec, bool& foundError);
 
   /* Read FSX/P3D scenery configuration */
   void readSceneryConfigFsxP3d(atools::fs::scenery::SceneryCfg& cfg);
@@ -163,8 +163,8 @@ class NavDatabase
   /* Print row counts to log file */
   void createDatabaseReportShort();
 
-  bool basicValidation(ProgressHandler *progress);
-  void basicValidateTable(const QString& table, int minCount);
+  bool basicValidation(ProgressHandler *progress, bool& foundError);
+  void basicValidateTable(const QString& table, int minCount, bool& foundError);
   void reportCoordinateViolations(QDebug& out, atools::sql::SqlUtil& util, const QStringList& tables);
 
   /* Count files in FSX/P3D scenery configuration */