From f58adf2526ab54fccbbc8ff5c29aba5e223dc909 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Tue, 6 Nov 2018 17:19:01 +0800 Subject: [PATCH] UpdateDatabase/MysqlEngineCharset.php --- UpdateDatabase/MysqlEngineCharset.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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; } -- 2.39.2