Fix for missing column 'subtitles' during migration from other forks.

Fix for invalid literals when searching for episodes

sickbeard/databases/mainDB.py

@@ -181,7 +181,7 @@ class AddSizeAndSceneNameFields(InitialSchema):
 
     def execute(self):
 
-        backupDatabase(11)
+        backupDatabase(10)
 
         if not self.hasColumn("tv_episodes", "file_size"):
             self.addColumn("tv_episodes", "file_size")
@@ -307,19 +307,6 @@ class RenameSeasonFolders(AddSizeAndSceneNameFields):
 
         self.incDBVersion()
 
-
-class AddSubtitlesSupport(RenameSeasonFolders):
-    def test(self):
-        return self.checkDBVersion() >= 12
-
-    def execute(self):
-        self.addColumn("tv_shows", "subtitles")
-        self.addColumn("tv_episodes", "subtitles", "TEXT", "")
-        self.addColumn("tv_episodes", "subtitles_searchcount")
-        self.addColumn("tv_episodes", "subtitles_lastsearch", "TIMESTAMP", str(datetime.datetime.min))
-        self.incDBVersion()
-
-
 class AddIMDbInfo(RenameSeasonFolders):
     def test(self):
         return self.checkDBVersion() >= 13
@@ -547,6 +534,17 @@ class AddDvdOrderOption(AddProperSearch):
 
         self.incDBVersion()
 
+class AddSubtitlesSupport(RenameSeasonFolders):
+    def test(self):
+        return self.hasColumn("tv_shows", "subtitles")
+
+    def execute(self):
+        self.addColumn("tv_shows", "subtitles")
+        self.addColumn("tv_episodes", "subtitles", "TEXT", "")
+        self.addColumn("tv_episodes", "subtitles_searchcount")
+        self.addColumn("tv_episodes", "subtitles_lastsearch", "TIMESTAMP", str(datetime.datetime.min))
+        self.incDBVersion()
+
 class ConvertTVShowsToIndexerScheme(AddDvdOrderOption):
     def test(self):
         return self.checkDBVersion() >= 22

sickbeard/tv.py

@@ -1849,13 +1849,13 @@ class TVEpisode(object):
             '%Q.N': dot(Quality.qualityStrings[epQual]),
             '%Q_N': us(Quality.qualityStrings[epQual]),
             '%S': str(self.season),
-            '%0S': '%02d' % self.season,
+            '%0S': '%02d' % int(self.season) if not self.show.air_by_date else self.season,
             '%E': str(self.episode),
-            '%0E': '%02d' % self.episode,
+            '%0E': '%02d' % int(self.episode)if not self.show.air_by_date else self.episode,
             '%XS': str(self.scene_season),
-            '%0XS': '%02d' % self.scene_season,
+            '%0XS': '%02d' % int(self.scene_season),
             '%XE': str(self.scene_episode),
-            '%0XE': '%02d' % self.scene_episode,
+            '%0XE': '%02d' % int(self.scene_episode),
             '%RN': release_name(self.release_name),
             '%RG': release_group(self.release_name),
             '%AD': str(self.airdate).replace('-', ' '),