From 8db53552d0559ef1508ca7d9410eec3471a2ffce Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 2 Dec 2019 14:59:39 +0800 Subject: [PATCH] UpdateDatabase/MysqlEngineCharset.php --- UpdateDatabase/MysqlEngineCharset.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/UpdateDatabase/MysqlEngineCharset.php b/UpdateDatabase/MysqlEngineCharset.php index a1791876..358aa14e 100644 --- a/UpdateDatabase/MysqlEngineCharset.php +++ b/UpdateDatabase/MysqlEngineCharset.php @@ -15,14 +15,16 @@ class Pman_Core_UpdateDatabase_MysqlEngineCharset { { // this might get run before we have imported the database // and hence not have any db. + $this->loadIniFiles(); //?? shared??? + try { - $this->loadIniFiles(); //?? shared??? + $dbo = DB_DataObject::factory('core_enum'); } catch(PDO_DataObject_Exception_InvalidConfig $e) { echo "SKipping MysqlEngineCharse - no database yet\n"; return; } - $dbo = DB_DataObject::factory('core_enum'); + if (is_a($dbo, 'PDO_DataObject')) { $this->views = $dbo->generator()->introspection()->getListOf('views'); -- 2.39.2