Delete/recreate recording extender tables for consistency.

There were a couple of changes to the format of the recording extender tables to force the use of a MYISAM database. Fixes #480. (cherry picked from commit 8d08c75)
MythTV · Feb 16, 2022 · c2ac97c · c2ac97c
1 parent 50b019d
commit c2ac97c
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 10 deletions.
diff --git a/mythtv/bindings/perl/MythTV.pm b/mythtv/bindings/perl/MythTV.pm
@@ -116,7 +116,7 @@ package MythTV;
 # schema version supported in the main code.  We need to check that the schema
 # version in the database is as expected by the bindings, which are expected
 # to be kept in sync with the main code.
-    our $SCHEMA_VERSION = "1375";
+    our $SCHEMA_VERSION = "1376";
 
 # NUMPROGRAMLINES is defined in mythtv/libs/libmythtv/programinfo.h and is
 # the number of items in a ProgramInfo QStringList group used by

diff --git a/mythtv/bindings/python/MythTV/static.py b/mythtv/bindings/python/MythTV/static.py
@@ -5,7 +5,7 @@
 """
 
 OWN_VERSION = (32,0,-1,0)
-SCHEMA_VERSION = 1375
+SCHEMA_VERSION = 1376
 NVSCHEMA_VERSION = 1007
 MUSICSCHEMA_VERSION = 1025
 PROTO_VERSION = '91'

diff --git a/mythtv/libs/libmythbase/mythversion.h b/mythtv/libs/libmythbase/mythversion.h
@@ -74,7 +74,7 @@
  *      mythtv/bindings/php/MythBackend.php
  */
 
-#define MYTH_DATABASE_VERSION "1375"
+#define MYTH_DATABASE_VERSION "1376"
 
 MBASE_PUBLIC  const char *GetMythSourceVersion();
 MBASE_PUBLIC  const char *GetMythSourcePath();

diff --git a/mythtv/libs/libmythtv/dbcheck.cpp b/mythtv/libs/libmythtv/dbcheck.cpp
@@ -3859,13 +3859,10 @@ static bool doUpgradeTVDatabaseSchema(void)
 
     if (dbver == "1371")
     {
-        // Create the new tables first.
-        DBUpdates updates = getRecordingExtenderDbInfo(1);
-        if (!performUpdateSeries("MythtTV", updates))
-            return false;
+        // Recording extender tables are now created later.
 
         // If that worked, modify existing tables.
-        updates = getRecordingExtenderDbInfo(0);
+        DBUpdates updates = getRecordingExtenderDbInfo(0);
         if (!performActualUpdate("MythTV", "DBSchemaVer",
                                  updates, "1372", dbver))
             return false;
@@ -3901,11 +3898,30 @@ static bool doUpgradeTVDatabaseSchema(void)
 
     if (dbver == "1374")
     {
+        // Recording extender tables are now created later.
+        DBUpdates updates {};
+        if (!performActualUpdate("MythTV", "DBSchemaVer",
+                                 updates, "1375", dbver))
+            return false;
+    }
+
+    if (dbver == "1375")
+    {
+        // Delete any existing recording extender tables.
+        DBUpdates updates = getRecordingExtenderDbInfo(-1);
+        if (!performUpdateSeries("MythtTV", updates))
+            return false;
+
+        // Now (re)create them.
+        updates = getRecordingExtenderDbInfo(1);
+        if (!performUpdateSeries("MythtTV", updates))
+            return false;
+
         // Add new tv listing name ->api name mappings for college
         // basketball.
-        DBUpdates updates = getRecordingExtenderDbInfo(2);
+        updates = getRecordingExtenderDbInfo(2);
         if (!performActualUpdate("MythTV", "DBSchemaVer",
-                                 updates, "1375", dbver))
+                                 updates, "1376", dbver))
             return false;
     }
 
@@ -5262,6 +5278,13 @@ DBUpdates getRecordingExtenderDbInfo (int version)
 {
     switch (version)
     {
+      case -1:
+        return {
+            R"(DROP TABLE IF EXISTS sportscleanup;)",
+            R"(DROP TABLE IF EXISTS sportslisting;)",
+            R"(DROP TABLE IF EXISTS sportsapi;)",
+        };
+
       case 0:
         return {
             R"(ALTER TABLE record ADD COLUMN autoextend