API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Jan 14th, 2021
54
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 13.00 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/mythplugins/mytharchive/mytharchive/archivedbcheck.cpp b/mythplugins/mytharchive/mytharchive/archivedbcheck.cpp
  2. index 2a2278f43f..483ce3f687 100644
  3. --- a/mythplugins/mytharchive/mytharchive/archivedbcheck.cpp
  4. +++ b/mythplugins/mytharchive/mytharchive/archivedbcheck.cpp
  5. @@ -12,7 +12,7 @@
  6. // mytharchive
  7. #include "archivedbcheck.h"
  8.  
  9. -const QString currentDatabaseVersion = "1005";
  10. +const QString currentDatabaseVersion = "1006";
  11. const QString MythArchiveVersionName = "ArchiveDBSchemaVer";
  12.  
  13. bool UpgradeArchiveDatabaseSchema(void)
  14. @@ -93,12 +93,12 @@ bool UpgradeArchiveDatabaseSchema(void)
  15. qPrintable(QString("ALTER DATABASE %1 DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;")
  16. .arg(gContext->GetDatabaseParams().m_dbName)),
  17. "ALTER TABLE archiveitems"
  18. - " DEFAULT CHARACTER SET default,"
  19. - " MODIFY title varchar(128) CHARACTER SET utf8 default NULL,"
  20. - " MODIFY subtitle varchar(128) CHARACTER SET utf8 default NULL,"
  21. + " DEFAULT CHARACTER SET utf8,"
  22. + " MODIFY title varchar(128) CHARACTER SET utf8 NULL,"
  23. + " MODIFY subtitle varchar(128) CHARACTER SET utf8 NULL,"
  24. " MODIFY description text CHARACTER SET utf8,"
  25. - " MODIFY startdate varchar(30) CHARACTER SET utf8 default NULL,"
  26. - " MODIFY starttime varchar(30) CHARACTER SET utf8 default NULL,"
  27. + " MODIFY startdate varchar(30) CHARACTER SET utf8 NULL,"
  28. + " MODIFY starttime varchar(30) CHARACTER SET utf8 NULL,"
  29. " MODIFY filename text CHARACTER SET utf8 NOT NULL,"
  30. " MODIFY cutlist text CHARACTER SET utf8;"
  31. };
  32. @@ -140,6 +140,25 @@ bool UpgradeArchiveDatabaseSchema(void)
  33. return false;
  34. }
  35.  
  36. + // Repeat 1003 DBs pre MySQL v8 systems that may have not be set to utf8
  37. +
  38. + if (dbver == "1005")
  39. + {
  40. + DBUpdates updates
  41. + {
  42. + "ALTER TABLE archiveitems"
  43. + " DEFAULT CHARACTER SET utf8,"
  44. + " MODIFY title varchar(128) CHARACTER SET utf8 NULL,"
  45. + " MODIFY subtitle varchar(128) CHARACTER SET utf8 NULL,"
  46. + " MODIFY startdate varchar(30) CHARACTER SET utf8 NULL,"
  47. + " MODIFY starttime varchar(30) CHARACTER SET utf8 NULL;"
  48. + };
  49. +
  50. + if (!performActualUpdate("MythArchive", MythArchiveVersionName,
  51. + updates, "1006", dbver))
  52. + return false;
  53. + }
  54. +
  55. return true;
  56. }
  57.  
  58. diff --git a/mythplugins/mythgame/mythgame/gamedbcheck.cpp b/mythplugins/mythgame/mythgame/gamedbcheck.cpp
  59. index 5277125548..5647a663e7 100644
  60. --- a/mythplugins/mythgame/mythgame/gamedbcheck.cpp
  61. +++ b/mythplugins/mythgame/mythgame/gamedbcheck.cpp
  62. @@ -10,7 +10,7 @@
  63. #include "gamedbcheck.h"
  64. #include "gamesettings.h"
  65.  
  66. -const QString currentDatabaseVersion = "1019";
  67. +const QString currentDatabaseVersion = "1020";
  68. const QString MythGameVersionName = "GameDBSchemaVer";
  69.  
  70. static bool InitializeDatabase(void)
  71. @@ -293,7 +293,7 @@ qPrintable(QString("ALTER DATABASE %1 DEFAULT CHARACTER SET latin1;")
  72. qPrintable(QString("ALTER DATABASE %1 DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;")
  73. .arg(gContext->GetDatabaseParams().m_dbName)),
  74. "ALTER TABLE gamemetadata"
  75. -" DEFAULT CHARACTER SET default,"
  76. +" DEFAULT CHARACTER SET utf8,"
  77. " MODIFY `system` varchar(128) CHARACTER SET utf8 NOT NULL default '',"
  78. " MODIFY romname varchar(128) CHARACTER SET utf8 NOT NULL default '',"
  79. " MODIFY gamename varchar(128) CHARACTER SET utf8 NOT NULL default '',"
  80. @@ -306,7 +306,7 @@ qPrintable(QString("ALTER DATABASE %1 DEFAULT CHARACTER SET utf8 COLLATE utf8_ge
  81. " MODIFY crc_value varchar(64) CHARACTER SET utf8 NOT NULL default '',"
  82. " MODIFY version varchar(64) CHARACTER SET utf8 NOT NULL default '';",
  83. "ALTER TABLE gameplayers"
  84. -" DEFAULT CHARACTER SET default,"
  85. +" DEFAULT CHARACTER SET utf8,"
  86. " MODIFY playername varchar(64) CHARACTER SET utf8 NOT NULL default '',"
  87. " MODIFY workingpath varchar(255) CHARACTER SET utf8 NOT NULL default '',"
  88. " MODIFY rompath varchar(255) CHARACTER SET utf8 NOT NULL default '',"
  89. @@ -315,7 +315,7 @@ qPrintable(QString("ALTER DATABASE %1 DEFAULT CHARACTER SET utf8 COLLATE utf8_ge
  90. " MODIFY gametype varchar(64) CHARACTER SET utf8 NOT NULL default '',"
  91. " MODIFY extensions varchar(128) CHARACTER SET utf8 NOT NULL default '';",
  92. "ALTER TABLE romdb"
  93. -" DEFAULT CHARACTER SET default,"
  94. +" DEFAULT CHARACTER SET utf8,"
  95. " MODIFY crc varchar(64) CHARACTER SET utf8 NOT NULL default '',"
  96. " MODIFY name varchar(128) CHARACTER SET utf8 NOT NULL default '',"
  97. " MODIFY description varchar(128) CHARACTER SET utf8 NOT NULL default '',"
  98. @@ -399,5 +399,21 @@ qPrintable(QString("ALTER DATABASE %1 DEFAULT CHARACTER SET utf8 COLLATE utf8_ge
  99. return false;
  100. }
  101.  
  102. + // Repeat 1013 DBs pre MySQL v8 systems that may have not be set to utf8
  103. +
  104. + if (dbver == "1019")
  105. + {
  106. + DBUpdates updates {
  107. +"ALTER TABLE gamemetadata DEFAULT CHARACTER SET utf8;",
  108. +"ALTER TABLE gameplayers DEFAULT CHARACTER SET utf8;",
  109. +"ALTER TABLE romdb DEFAULT CHARACTER SET utf8;"
  110. +};
  111. +
  112. + if (!performActualUpdate("MythGame", MythGameVersionName,
  113. + updates, "1020", dbver))
  114. + return false;
  115. + }
  116. +
  117. return true;
  118. +
  119. }
  120. diff --git a/mythplugins/mythmusic/mythmusic/musicdbcheck.cpp b/mythplugins/mythmusic/mythmusic/musicdbcheck.cpp
  121. index 453fa73a87..dd2b94a1c5 100644
  122. --- a/mythplugins/mythmusic/mythmusic/musicdbcheck.cpp
  123. +++ b/mythplugins/mythmusic/mythmusic/musicdbcheck.cpp
  124. @@ -12,7 +12,7 @@
  125.  
  126. #include "musicdbcheck.h"
  127.  
  128. -const QString currentDatabaseVersion = "1024";
  129. +const QString currentDatabaseVersion = "1025";
  130. const QString MythMusicVersionName = "MusicDBSchemaVer";
  131.  
  132. static bool doUpgradeMusicDatabaseSchema(QString &dbver);
  133. @@ -731,40 +731,40 @@ static bool doUpgradeMusicDatabaseSchema(QString &dbver)
  134. .arg(gContext->GetDatabaseParams().m_dbName)),
  135. // NOLINTNEXTLINE(bugprone-suspicious-missing-comma)
  136. "ALTER TABLE music_albumart"
  137. - " DEFAULT CHARACTER SET default,"
  138. + " DEFAULT CHARACTER SET utf8,"
  139. " MODIFY filename varchar(255) CHARACTER SET utf8 NOT NULL default '';",
  140. "ALTER TABLE music_albums"
  141. - " DEFAULT CHARACTER SET default,"
  142. + " DEFAULT CHARACTER SET utf8,"
  143. " MODIFY album_name varchar(255) CHARACTER SET utf8 NOT NULL default '';",
  144. "ALTER TABLE music_artists"
  145. - " DEFAULT CHARACTER SET default,"
  146. + " DEFAULT CHARACTER SET utf8,"
  147. " MODIFY artist_name varchar(255) CHARACTER SET utf8 NOT NULL default '';",
  148. "ALTER TABLE music_directories"
  149. - " DEFAULT CHARACTER SET default,"
  150. + " DEFAULT CHARACTER SET utf8,"
  151. " MODIFY path text CHARACTER SET utf8 NOT NULL;",
  152. "ALTER TABLE music_genres"
  153. - " DEFAULT CHARACTER SET default,"
  154. + " DEFAULT CHARACTER SET utf8,"
  155. " MODIFY genre varchar(255) CHARACTER SET utf8 NOT NULL default '';",
  156. "ALTER TABLE music_playlists"
  157. - " DEFAULT CHARACTER SET default,"
  158. + " DEFAULT CHARACTER SET utf8,"
  159. " MODIFY playlist_name varchar(255) CHARACTER SET utf8 NOT NULL default '',"
  160. " MODIFY playlist_songs text CHARACTER SET utf8 NOT NULL,"
  161. " MODIFY hostname varchar(64) CHARACTER SET utf8 NOT NULL default '';",
  162. "ALTER TABLE music_smartplaylist_categories"
  163. - " DEFAULT CHARACTER SET default,"
  164. + " DEFAULT CHARACTER SET utf8,"
  165. " MODIFY name varchar(128) CHARACTER SET utf8 NOT NULL;",
  166. "ALTER TABLE music_smartplaylist_items"
  167. - " DEFAULT CHARACTER SET default,"
  168. + " DEFAULT CHARACTER SET utf8,"
  169. " MODIFY field varchar(50) CHARACTER SET utf8 NOT NULL,"
  170. " MODIFY operator varchar(20) CHARACTER SET utf8 NOT NULL,"
  171. " MODIFY value1 varchar(255) CHARACTER SET utf8 NOT NULL,"
  172. " MODIFY value2 varchar(255) CHARACTER SET utf8 NOT NULL;",
  173. "ALTER TABLE music_smartplaylists"
  174. - " DEFAULT CHARACTER SET default,"
  175. + " DEFAULT CHARACTER SET utf8,"
  176. " MODIFY name varchar(128) CHARACTER SET utf8 NOT NULL,"
  177. " MODIFY orderby varchar(128) CHARACTER SET utf8 NOT NULL default '';",
  178. "ALTER TABLE music_songs"
  179. - " DEFAULT CHARACTER SET default,"
  180. + " DEFAULT CHARACTER SET utf8,"
  181. " MODIFY filename text CHARACTER SET utf8 NOT NULL,"
  182. " MODIFY name varchar(255) CHARACTER SET utf8 NOT NULL default '',"
  183. " MODIFY format varchar(4) CHARACTER SET utf8 NOT NULL default '0',"
  184. @@ -773,7 +773,7 @@ static bool doUpgradeMusicDatabaseSchema(QString &dbver)
  185. " MODIFY comment varchar(255) CHARACTER SET utf8 default NULL,"
  186. " MODIFY eq_preset varchar(255) CHARACTER SET utf8 default NULL;",
  187. "ALTER TABLE music_stats"
  188. - " DEFAULT CHARACTER SET default,"
  189. + " DEFAULT CHARACTER SET utf8,"
  190. " MODIFY total_time varchar(12) CHARACTER SET utf8 NOT NULL default '0',"
  191. " MODIFY total_size varchar(10) CHARACTER SET utf8 NOT NULL default '0';"
  192. };
  193. @@ -935,5 +935,31 @@ static bool doUpgradeMusicDatabaseSchema(QString &dbver)
  194. return false;
  195. }
  196.  
  197. + // Repeat 1016 DBs pre MySQL v8 systems that may have not be set to utf8
  198. +
  199. + if (dbver == "1024")
  200. + {
  201. + DBUpdates updates
  202. + {
  203. + "ALTER TABLE music_albumart DEFAULT CHARACTER SET utf8;",
  204. + "ALTER TABLE music_albums DEFAULT CHARACTER SET utf8;",
  205. + "ALTER TABLE music_artists DEFAULT CHARACTER SET utf8;",
  206. + "ALTER TABLE music_directories DEFAULT CHARACTER SET utf8;",
  207. + "ALTER TABLE music_genres DEFAULT CHARACTER SET utf8;",
  208. + "ALTER TABLE music_playlists DEFAULT CHARACTER SET utf8;",
  209. + "ALTER TABLE music_smartplaylist_categories"
  210. + " DEFAULT CHARACTER SET utf8;",
  211. + "ALTER TABLE music_smartplaylist_items DEFAULT CHARACTER SET utf8;",
  212. + "ALTER TABLE music_smartplaylists DEFAULT CHARACTER SET utf8;",
  213. + "ALTER TABLE music_songs DEFAULT CHARACTER SET utf8;",
  214. + "ALTER TABLE music_stats DEFAULT CHARACTER SET utf8;"
  215. + };
  216. +
  217. + if (!performActualUpdate("MythMusic", MythMusicVersionName,
  218. + updates, "1025", dbver))
  219. + return false;
  220. + }
  221. +
  222. return true;
  223. +
  224. }
  225. diff --git a/mythplugins/mythweather/mythweather/weatherdbcheck.cpp b/mythplugins/mythweather/mythweather/weatherdbcheck.cpp
  226. index 0e7915b765..56464a0144 100644
  227. --- a/mythplugins/mythweather/mythweather/weatherdbcheck.cpp
  228. +++ b/mythplugins/mythweather/mythweather/weatherdbcheck.cpp
  229. @@ -9,7 +9,7 @@
  230.  
  231. #include "weatherdbcheck.h"
  232.  
  233. -const QString currentDatabaseVersion = "1006";
  234. +const QString currentDatabaseVersion = "1007";
  235. const QString MythWeatherVersionName = "WeatherDBSchemaVer";
  236.  
  237. /*
  238. @@ -125,15 +125,15 @@ bool InitializeDatabase()
  239. qPrintable(QString("ALTER DATABASE %1 DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;")
  240. .arg(gContext->GetDatabaseParams().m_dbName)),
  241. "ALTER TABLE weatherdatalayout"
  242. - " DEFAULT CHARACTER SET default,"
  243. + " DEFAULT CHARACTER SET utf8,"
  244. " MODIFY location varchar(64) CHARACTER SET utf8 NOT NULL,"
  245. " MODIFY dataitem varchar(64) CHARACTER SET utf8 NOT NULL;",
  246. "ALTER TABLE weatherscreens"
  247. - " DEFAULT CHARACTER SET default,"
  248. + " DEFAULT CHARACTER SET utf8,"
  249. " MODIFY container varchar(64) CHARACTER SET utf8 NOT NULL,"
  250. " MODIFY hostname varchar(64) CHARACTER SET utf8 default NULL;",
  251. "ALTER TABLE weathersourcesettings"
  252. - " DEFAULT CHARACTER SET default,"
  253. + " DEFAULT CHARACTER SET utf8,"
  254. " MODIFY source_name varchar(64) CHARACTER SET utf8 NOT NULL,"
  255. " MODIFY hostname varchar(64) CHARACTER SET utf8 default NULL,"
  256. " MODIFY path varchar(255) CHARACTER SET utf8 default NULL,"
  257. @@ -185,5 +185,19 @@ bool InitializeDatabase()
  258. return false;
  259. }
  260.  
  261. + // Repeat 1002 DBs pre MySQL v8 systems that may have not be set to utf8
  262. +
  263. + if (dbver == "1006")
  264. + {
  265. + DBUpdates updates {
  266. + "ALTER TABLE weatherdatalayout DEFAULT CHARACTER SET utf8;"
  267. + "ALTER TABLE weatherscreens DEFAULT CHARACTER SET utf8;"
  268. + "ALTER TABLE weathersourcesettings DEFAULT CHARACTER SET utf8;"
  269. + };
  270. +
  271. + if (!performActualUpdate("MythWeather", MythWeatherVersionName,
  272. + updates, "1007", dbver))
  273. + return false;
  274. + }
  275. return true;
  276. }
  277.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!