From f6836c4e7d50ebb9e2eda66e7c278d2f930ce1fb Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Sun, 26 Aug 2018 13:22:33 +0800 Subject: [PATCH] sync --- UpdateDatabase.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/UpdateDatabase.php b/UpdateDatabase.php index d36da498..900c7ecd 100644 --- a/UpdateDatabase.php +++ b/UpdateDatabase.php @@ -152,6 +152,8 @@ class Pman_Core_UpdateDatabase extends Pman $this->checkSystem(); + $this->verifyExtensions(array('curl')); + if (class_exists('PDO_DataObjects_Introspection')) { PDO_DataObject_Introspection::$cache = array(); } @@ -303,9 +305,10 @@ class Pman_Core_UpdateDatabase extends Pman // new -- sql directory.. // new style will not support migrate ... they have to go into mysql-migrate.... directories.. // new style will not support pg.sql etc.. naming - that's what the direcotries are for.. + $dbdir = $dbtype == 'mysqli' ? 'mysql' : $dbdir; $this->{$dirmethod}($dburl, $this->rootDir. "/Pman/$m/sql"); - $this->{$dirmethod}($dburl, $this->rootDir. "/Pman/$m/{$dbtype}"); + $this->{$dirmethod}($dburl, $this->rootDir. "/Pman/$m/{$dbdir}"); -- 2.39.2