Fix 5df2014 DB update. Update Perl/Python bindings with new DBSchemaVer

MythTV · Mar 6, 2016 · 658fa09 · 658fa09
1 parent 56ecf17
commit 658fa09
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/mythtv/bindings/perl/MythTV.pm b/mythtv/bindings/perl/MythTV.pm
@@ -115,7 +115,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 = "1343";
+    our $SCHEMA_VERSION = "1344";
 
 # 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 = (0,28,-1,0)
-SCHEMA_VERSION = 1343
+SCHEMA_VERSION = 1344
 NVSCHEMA_VERSION = 1007
 MUSICSCHEMA_VERSION = 1018
 PROTO_VERSION = '88'

diff --git a/mythtv/libs/libmythtv/dbcheck.cpp b/mythtv/libs/libmythtv/dbcheck.cpp
@@ -3277,6 +3277,7 @@ NULL
     if (dbver == "1343")
     {
         const char *updates[] = {
+            "DROP TABLE IF EXISTS bdbookmark;",
             "CREATE TABLE bdbookmark ("
             "  serialid varchar(40) NOT NULL DEFAULT '',"
             "  `name` varchar(128) DEFAULT NULL,"
@@ -3286,8 +3287,8 @@ NULL
             ") ENGINE=MyISAM DEFAULT CHARSET=utf8;",
 
             // #12612 strip \0 characters from channel/channelscan_channel callsign and name
-            "UPDATE channel SET callsign=REPLACE(callsign,'\0',''),"
-            "name=REPLACE(name,'\0','');",
+            "UPDATE channel SET callsign=REPLACE(callsign,'\\0',''),"
+            "name=REPLACE(name,'\\0','');",
 
             // "BackendWSPort" was removed in caaaeef8166722888012f4ecaf3e9b0f09df512a
             "DELETE FROM settings WHERE value='BackendWSPort';",