X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=UpdateDatabase%2FMysqlEngineCharset.php;h=374e6d7b277643017ebf640b11c3061a67140c59;hb=f58adf2526ab54fccbbc8ff5c29aba5e223dc909;hp=0d3d872fd2daacd1d03a4f2c2831bfa39353d0bb;hpb=9261a33282b386b29a533ef4fc520b24b66ad76e;p=Pman.Core diff --git a/UpdateDatabase/MysqlEngineCharset.php b/UpdateDatabase/MysqlEngineCharset.php index 0d3d872f..374e6d7b 100644 --- a/UpdateDatabase/MysqlEngineCharset.php +++ b/UpdateDatabase/MysqlEngineCharset.php @@ -139,6 +139,7 @@ class Pman_Core_UpdateDatabase_MysqlEngineCharset { if(strpos($tbl, '__keys') !== false ){ continue; } + if(in_array($tbl , $views)) { continue; } @@ -159,12 +160,14 @@ class Pman_Core_UpdateDatabase_MysqlEngineCharset { if (!$ce->fetch()) { continue; } + //AWS is returning captials? + $engine = isset($ce->engine) ? $ce->engine : $ce->ENGINE; - if($ce->engine == 'InnoDB' ){ + if($engine == 'InnoDB' ){ echo "InnoDB: SKIP $tbl\n"; continue; } - if($ce->engine == 'ndbcluster' ){ + if($engine == 'ndbcluster' ){ echo "ndbcluster: SKIP $tbl\n"; continue; }