diff -Nur --exclude='*.lib' --exclude='*.o' mythtv/libs/libmythtv/dbcheck.cpp mythtv-guide/libs/libmythtv/dbcheck.cpp
old
|
new
|
|
11 | 11 | #include "datadirect.h" // for DataDirectProcessor::FixProgramIDs |
12 | 12 | |
13 | 13 | /// This is the DB schema version expected by the running MythTV instance. |
14 | | const QString currentDatabaseVersion = "1198"; |
| 14 | const QString currentDatabaseVersion = "1199"; |
15 | 15 | |
16 | 16 | static bool UpdateDBVersionNumber(const QString &newnumber); |
17 | 17 | static bool performActualUpdate(const QString updates[], QString version, |
… |
… |
|
43 | 43 | <tr><td>dtv_privatetypes |
44 | 44 | <tr><td>dvb_signal_quality <td>pk(id) k(sampletime,cardid) |
45 | 45 | <tr><td>favorites <td>pk(favid) |
| 46 | <tr><td>favoritegroups <td>pk(favgrpid) |
46 | 47 | <tr><td>housekeeping <td>pk(tag) |
47 | 48 | <tr><td>jobqueue <td>pk(id) uk(chanid,starttime,type,inserttime) |
48 | 49 | <tr><td>jumppoints <td>pk(destination,hostname) |
… |
… |
|
3236 | 3237 | return false; |
3237 | 3238 | } |
3238 | 3239 | |
| 3240 | if (dbver == "1198") |
| 3241 | { |
| 3242 | const QString updates[] = { |
| 3243 | "ALTER TABLE favorites ADD COLUMN favgrpid int(11) NOT NULL default 1;", |
| 3244 | "CREATE TABLE IF NOT EXISTS favoritegroups (" |
| 3245 | " favgrpid int(11) unsigned NOT NULL auto_increment," |
| 3246 | " name varchar(64) NOT NULL default ''," |
| 3247 | " PRIMARY KEY (favgrpid));", |
| 3248 | "", |
| 3249 | }; |
| 3250 | if (!performActualUpdate(updates, "1199", dbver)) |
| 3251 | return false; |
| 3252 | } |
| 3253 | |
3239 | 3254 | //"ALTER TABLE cardinput DROP COLUMN preference;" in 0.22 |
3240 | 3255 | //"ALTER TABLE channel DROP COLUMN atscsrcid;" in 0.22 |
3241 | 3256 | //"ALTER TABLE recordedmarkup DROP COLUMN offset;" in 0.22 |
… |
… |
|
3408 | 3423 | " favid int(11) unsigned NOT NULL auto_increment," |
3409 | 3424 | " userid int(11) unsigned NOT NULL default '0'," |
3410 | 3425 | " chanid int(11) unsigned NOT NULL default '0'," |
| 3426 | " favgrpid int(11) unsigned NOT NULL default '1'," |
3411 | 3427 | " PRIMARY KEY (favid)" |
3412 | 3428 | ");", |
| 3429 | "CREATE TABLE IF NOT EXISTS favoritegroups (" |
| 3430 | " favgrpid int(11) unsigned NOT NULL auto_increment," |
| 3431 | " name varchar(64) NOT NULL default ''," |
| 3432 | " PRIMARY KEY (favgrpid)" |
| 3433 | ");", |
3413 | 3434 | "CREATE TABLE IF NOT EXISTS housekeeping (" |
3414 | 3435 | " tag varchar(64) NOT NULL default ''," |
3415 | 3436 | " lastrun datetime default NULL," |