maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #429 from mkhon/database-charset-skip-views

Browse Source 
Skip views when altering table charsets
This commit is contained in:
Michael Kaufmann
2017-04-15 11:28:27 +02:00
committed by GitHub
parent 9285a169dd 95b7b57fc6
commit f880e1c9f1
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/classes/integrity/class.IntegrityCheck.php
View File

@@ -85,11 +85,10 @@ class IntegrityCheck {
// fix database // fix database
Database::query('ALTER DATABASE `' . Database::getDbName() . '` CHARACTER SET utf8 COLLATE utf8_general_ci'); Database::query('ALTER DATABASE `' . Database::getDbName() . '` CHARACTER SET utf8 COLLATE utf8_general_ci');
// fix all tables // fix all tables
$handle = Database::query('SHOW TABLES'); $handle = Database::query('SHOW FULL TABLES WHERE Table_type != "VIEW"');
while ($row = $handle->fetch(PDO::FETCH_ASSOC)) { while ($row = $handle->fetch(PDO::FETCH_BOTH)) {
foreach ($row as $table) { $table = $row[0];
Database::query('ALTER TABLE `' . $table . '` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;'); Database::query('ALTER TABLE `' . $table . '` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;');
}
} }
$this->_log->logAction(ADM_ACTION, LOG_WARNING, "database charset was different from UTF-8, integrity-check fixed that"); $this->_log->logAction(ADM_ACTION, LOG_WARNING, "database charset was different from UTF-8, integrity-check fixed that");
} else { } else {