Ticket #5286: mythtv-5286-no_backup_for_new_database.patch

libs/libmyth/dbutil.h

@@ -30 +30 @@
     bool BackupDB(QString &filename);
 
     static QMap<QString,bool> GetTableMap(void);
+    static bool IsNewDatabase(void);
     static bool IsBackupInProgress(void);
 
     static const int kUnknownVersionNumber;

libs/libmyth/dbutil.cpp

@@ -70 +70 @@
     return result;
 }
 
-/** \fn DBUtil::BackupInProgress(void)
+/** \fn DBUtil::IsNewDatabase(void)
+ *  \brief Returns true for a new (empty) database.
+ */
+bool DBUtil::IsNewDatabase(void)
+{
+    const QStringList tables = GetTables();
+    const int size = tables.size();
+    // Usually there will be a single table called schemalock, but check for
+    // no tables, also, just in case.
+    return (((size == 1) && (tables.at(0) == "schemalock")) ||
+            (size == 0));
+}
+
+/** \fn DBUtil::IsBackupInProgress(void)
  *  \brief Test to see if a DB backup is in progress
  *
  */
@@ -162 +175 @@
  */
 bool DBUtil::BackupDB(QString &filename)
 {
+    filename = "";
+    if (IsNewDatabase())
+    {
+        VERBOSE(VB_IMPORTANT, "New database detected.  Skipping backup.");
+        return true;
+    }
+
     bool result = false;
     MSqlQuery query(MSqlQuery::InitCon());
 

libs/libmythtv/dbcheck.cpp

@@ -555 +555 @@
 
     QString backupResult = "";
 #ifndef USING_MINGW
-    if (dbver != "0")
         dbutil.BackupDB(backupResult);
 #endif