From: Alan Knowles <alan@roojs.com>
Date: Mon, 31 Oct 2016 03:38:33 +0000 (+0800)
Subject: UpdateDatabase/MysqlEngineCharset.php
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=154ed181d602dd0f5d8900e17c428ca13c14173f

UpdateDatabase/MysqlEngineCharset.php
---

diff --git a/UpdateDatabase/MysqlEngineCharset.php b/UpdateDatabase/MysqlEngineCharset.php
index 45b965fb..d4d772b1 100644
--- a/UpdateDatabase/MysqlEngineCharset.php
+++ b/UpdateDatabase/MysqlEngineCharset.php
@@ -46,12 +46,20 @@ class Pman_Core_UpdateDatabase_MysqlEngineCharset {
    
     function updateCharacterSet()
     {
+        $db = DB_DataObject::factory('core_enum')->getDatabaseConnection();
+        $views = $db->getListOf(  'views');
+        
+        
         foreach (array_keys($this->schema) as $tbl){
             
             if(strpos($tbl, '__keys') !== false ){
                 continue;
             }
             
+            if(in_array($tbl , $views)) {
+                continue;
+            }
+            
             $ce = DB_DataObject::factory('core_enum');
             
             $ce->query("
@@ -88,11 +96,22 @@ class Pman_Core_UpdateDatabase_MysqlEngineCharset {
     }
     function updateEngine()
     {
+        // get a list of table views...
+        
+        $db = DB_DataObject::factory('core_enum')->getDatabaseConnection();
+        $views = $db->getListOf(  'views');
+        
+        
+        
+        
         foreach (array_keys($this->schema) as $tbl){
             
             if(strpos($tbl, '__keys') !== false ){
                 continue;
             }
+            if(in_array($tbl , $views)) {
+                continue;
+            }
             
             $ce = DB_DataObject::factory('core_enum');