projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
10cf2f6
)
UpdateDatabase/MysqlLinks.php
author
Alan Knowles
<alan@roojs.com>
Thu, 17 Dec 2015 06:09:16 +0000
(14:09 +0800)
committer
Alan Knowles
<alan@roojs.com>
Thu, 17 Dec 2015 06:09:16 +0000
(14:09 +0800)
UpdateDatabase/MysqlLinks.php
patch
|
blob
|
history
diff --git
a/UpdateDatabase/MysqlLinks.php
b/UpdateDatabase/MysqlLinks.php
index
9bdaa57
..
5141bf9
100644
(file)
--- a/
UpdateDatabase/MysqlLinks.php
+++ b/
UpdateDatabase/MysqlLinks.php
@@
-467,20
+467,20
@@
class Pman_Core_UpdateDatabase_MysqlLinks {
WHERE
CCSA.collation_name = T.table_collation
AND
WHERE
CCSA.collation_name = T.table_collation
AND
- T.table_schema = '{$ce->database()}' -- COLLATE utf8_
unicode
_ci
+ T.table_schema = '{$ce->database()}' -- COLLATE utf8_
general
_ci
AND
AND
- T.table_name = '{$tbl}' -- COLLATE utf8_
unicode
_ci
+ T.table_name = '{$tbl}' -- COLLATE utf8_
general
_ci
");
$ce->fetch();
");
$ce->fetch();
- if($ce->csname == 'utf8' && $ce->collatename == 'utf8_
unicode
_ci'){
+ if($ce->csname == 'utf8' && $ce->collatename == 'utf8_
general
_ci'){
echo "$tbl is Already utf8 \n";
continue;
}
$ce = DB_DataObject::factory('core_enum');
echo "$tbl is Already utf8 \n";
continue;
}
$ce = DB_DataObject::factory('core_enum');
- $ce->query("ALTER TABLE {$tbl} CONVERT TO CHARACTER SET utf8 COLLATE utf8_
unicode
_ci");
+ $ce->query("ALTER TABLE {$tbl} CONVERT TO CHARACTER SET utf8 COLLATE utf8_
general
_ci");
echo "FIXED utf8 on {$tbl}\n";
}
echo "FIXED utf8 on {$tbl}\n";
}