Complete DB fix from 4f549f7.

Does not alter existing behavior, nor could this conceivably
introduce bugs to existing code, nor is this a new feature, merely
the completion of some work from earlier.

Author: Robert McNamara

mythtv/bindings/perl/MythTV.pm

@@ -114,7 +114,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 = "1297";
+    our $SCHEMA_VERSION = "1298";
 
 # NUMPROGRAMLINES is defined in mythtv/libs/libmythtv/programinfo.h and is
 # the number of items in a ProgramInfo QStringList group used by

mythtv/bindings/python/MythTV/static.py

@@ -5,7 +5,7 @@
 """
 
 OWN_VERSION = (0,25,-1,3)
-SCHEMA_VERSION = 1297
+SCHEMA_VERSION = 1298
 NVSCHEMA_VERSION = 1007
 MUSICSCHEMA_VERSION = 1018
 PROTO_VERSION = '72'

mythtv/libs/libmythbase/mythversion.h

@@ -54,7 +54,7 @@
  *  MythTV PHP Bindings
  *      mythtv/bindings/php/MythBackend.php
  */
-#define MYTH_DATABASE_VERSION "1297"
+#define MYTH_DATABASE_VERSION "1298"
 
 
  MBASE_PUBLIC  const char *GetMythSourceVersion();

mythtv/libs/libmythmetadata/videometadata.cpp

@@ -480,7 +480,7 @@ void VideoMetadataImp::Reset()
                     VIDEO_COVERFILE_DEFAULT, VIDEO_SCREENSHOT_DEFAULT, VIDEO_BANNER_DEFAULT,
                     VIDEO_FANART_DEFAULT, VideoMetadata::FilenameToMeta(m_filename, 1), QString(),
                     VideoMetadata::FilenameToMeta(m_filename, 4), VIDEO_YEAR_DEFAULT,
-                    QDate(), VIDEO_INETREF_DEFAULT, 0, QString(), VIDEO_DIRECTOR_DEFAULT,
+                    QDate(), VIDEO_INETREF_DEFAULT, -1, QString(), VIDEO_DIRECTOR_DEFAULT,
                     QString(), VIDEO_PLOT_DEFAULT, 0.0,
                     VIDEO_RATING_DEFAULT, 0, 0,
                     VideoMetadata::FilenameToMeta(m_filename, 2).toInt(),

mythtv/libs/libmythtv/dbcheck.cpp

@@ -6245,6 +6245,19 @@ NULL
             return false;
     }
 
+    if (dbver == "1297")
+    {
+        const char *updates[] = {
+"ALTER TABLE videometadata CHANGE collectionref collectionref INT(10) "
+"NOT NULL DEFAULT -1",
+"UPDATE videometadata SET collectionref = '-1'",
+NULL
+};
+
+        if (!performActualUpdate(updates, "1298", dbver))
+            return false;
+    }
+
     return true;
 }