Merge branch 'master' into develop

This commit is contained in:
JackDandy 2016-03-17 19:11:31 +00:00
commit 6e6aada90b
2 changed files with 11 additions and 4 deletions

View file

@ -46,6 +46,11 @@
* Add scene qualities WEB.h264 to SDTV, 720p.WEB.h264 to WEB DL 720p, and 1080p.WEB.h264 to WEB DL 1080p
### 0.11.10 (2016-03-17 19:00:00 UTC)
* Fix dbs that should not have been imported to work
### 0.11.9 (2016-03-17 12:30:00 UTC)
* Fix for import of very rare db structure

View file

@ -1042,8 +1042,9 @@ class AddTvShowOverview(db.SchemaUpgrade):
def execute(self):
db.backup_database('sickbeard.db', self.checkDBVersion())
logger.log(u'Adding column overview to tv_shows')
self.addColumn('tv_shows', 'overview', 'TEXT', '')
if not self.hasColumn('tv_shows', 'overview'):
logger.log(u'Adding column overview to tv_shows')
self.addColumn('tv_shows', 'overview', 'TEXT', '')
self.setDBVersion(20002)
return self.checkDBVersion()
@ -1054,8 +1055,9 @@ class AddTvShowTags(db.SchemaUpgrade):
def execute(self):
db.backup_database('sickbeard.db', self.checkDBVersion())
logger.log(u'Adding tag to tv_shows')
self.addColumn('tv_shows', 'tag', 'TEXT', 'Show List')
if not self.hasColumn('tv_shows', 'tag'):
logger.log(u'Adding tag to tv_shows')
self.addColumn('tv_shows', 'tag', 'TEXT', 'Show List')
self.setDBVersion(20003)
return self.checkDBVersion()