Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 2104) +++ branches/2.8.x/CHANGELOG (revision 2105) @@ -11,6 +11,9 @@ ! = Update/Change =============================================================================== +24 Nov-2014 Build 2105 Manuela v.d.Decken(DarkViper) +- removed importSql() method from class WbDatabase ++ new class SqlImport added 20 Nov-2014 Build 2104 Manuela v.d.Decken(DarkViper) ! complete rebuild of wb/install/ - changed to use import-struct.sql ! change class WbDatabase from mysql to msqli Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 2104) +++ branches/2.8.x/wb/admin/interface/version.php (revision 2105) @@ -51,5 +51,5 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.4'); -if(!defined('REVISION')) define('REVISION', '2104'); +if(!defined('REVISION')) define('REVISION', '2105'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/framework/WbDatabase.php =================================================================== --- branches/2.8.x/wb/framework/WbDatabase.php (revision 2104) +++ branches/2.8.x/wb/framework/WbDatabase.php (revision 2105) @@ -526,144 +526,9 @@ $sEngine = 'MyISAM', $sCollation = 'utf8_unicode_ci') { - return $this->importSql($sSqlDump, $sTablePrefix, $bPreserve, $sEngine, $sCollation); + return $this->importSql($sSqlDump, $sTablePrefix, $sAction, $sEngine, $sCollation); } -/** - * Import an SQl-Dumpfile witch can include unlimited placeholders for values - * @param mixed $mSqlDump can be string with filename or array with additional vars - * @param string $sTablePrefix can be used to override settings from WbDatabase object - * @param string $sAction 'install', 'uninstall', 'upgrade', 'repair - * @param string $sEngine kind of table engine: MyIsam(default) - * @param string $sCollation utf8_unicode_ci(default) - * @return bool false on error - */ - public function importSql( - $mSqlDump, - $sTablePrefix = '', // can override settings from WbDatabase object - $sAction = 'install', // skip 'DROP TABLE' statements - $sEngine = 'MyISAM', // the default table engine - $sCollation = 'utf8_unicode_ci' // the default collation to use - ) - { - $retval = true; - $this->error = ''; - // sanitize arguments - if (! is_string($sAction)) { - $sAction = $sAction ? 'repair' : 'install'; - } - $aAllowedActions = array('install', 'uninstall', 'upgrade', 'repair'); - $sAction = strtolower(preg_replace('/^.*?('.implode('|', $aAllowedActions).')(\.php)?$/iU', '$1', $sAction)); - $sAction = (in_array($sAction, $aAllowedActions) ? $sAction : 'install'); - $sTablePrefix = trim($sTablePrefix); - $aEngineTypes = array( - 'csv' => 'CSV', - 'blackhole' => 'BLACKHOLE', - 'memory' => 'MEMORY', - 'myisam' => 'MyISAM', - 'innodb' => 'InnoDB', - 'archive' => 'ARCHIVE', - 'mrg_myisam' => 'MRG_MYISAM' - ); - if (isset($aEngineTypes[strtolower($sEngine)])) { - $sEngine = $aEngineTypes[strtolower($sEngine)]; - } else { - $sEngine = 'MyISAM'; - } - // test if selected collation is available. Otherwise select 'utf8_unicode_ci' - $sql = 'SELECT COUNT(*) FROM `COLLATIONS` ' - . 'WHERE `COLLATION_NAME`=\''.$sCollation.'\''; - $sCollation = ($this->get_one($sql) ? $sCollation : 'utf8_unicode_ci'); - $aTmp = preg_split('/_/', $sCollation, null, PREG_SPLIT_NO_EMPTY); - $sCharset = $aTmp[0]; - // define array of searches - $aSearch = array( - '/\{TABLE_PREFIX\}/', - '/\{TABLE_COLLATION\}/', // deprecated from 2.8.4 - '/\{FIELD_COLLATION\}/', // deprecated from 2.8.4 - '/\{TABLE_ENGINE\}/', - '/\{TABLE_ENGINE=([a-zA-Z_0-9]*)\}/', - '/\{CHARSET\}/', - '/\{COLLATION\}/' - ); - // define array of replacements - $aReplace = array( - $sTablePrefix, - ' COLLATE {COLLATION}', // deprecated from 2.8.4 - ' COLLATE {COLLATION}', // deprecated from 2.8.4 - ' {ENGINE='.$sEngine.'}', - ' ENGINE=$1 DEFAULT CHARSET={CHARSET} COLLATION={COLLATION}', - $sCharset, - $sCollation - ); - if (is_array($mSqlDump)) { - // try to get dumpfile name - if (!isset($mSqlDump['sSqlDump'])) { - $this->error = 'missing index \'sSqlDump\' in $mSqlDump'; - return false; - } else { - // get dumpfile name from array and then remove entry - $sDumpFile = (string)$mSqlDump['sSqlDump']; - unset($mSqlDump['sSqlDump']); - // import all vars and it's values from array - foreach ($mSqlDump as $sIndex => $sValue) { - // transform varname into placeholder name ('sPageTitle' => 'PAGE_TITLE') - $sIndex = strtoupper(preg_replace('/([a-z0-9])([A-Z])/', '\1_\2', ltrim($sIndex, 'a..z'))); - // fill search/replace arrays - $aSearch[] = '/\{'.$sIndex.'\}/'; - $aReplace[] = $sValue ; - } - } - } elseif (is_string($mSqlDump)) { - $sDumpFile = (string)$mSqlDump; - } else { - $this->error = 'invalid argument $mSqlDump'; - return false; - } - if (!is_readable($sDumpFile)) { - $this->Error = 'unable to open \''.$sDumpFile.'\''; - return false; - } - $sql = ''; - $aSql = file($sDumpFile, FILE_SKIP_EMPTY_LINES); - // remove possible ByteOrderMark - $aSql[0] = preg_replace('/^[\xAA-\xFF]{3}/', '', $aSql[0]); - while (sizeof($aSql) > 0) { - $sSqlLine = trim(array_shift($aSql)); - if (!preg_match('/^[-\/]+.*/', $sSqlLine)) { - $sql = $sql.' '.$sSqlLine; - if ((substr($sql,-1,1) == ';')) { - $sql = trim(preg_replace($aSearch, $aReplace, $sql)); - $sAvailSqlObjects = 'TABLE|VIEW|INDEX|PROCEDURE|FUNCTION|TRIGGER|EVENT'; - switch ($sAction) { - case 'uninstall': // skip CREATE; execute DROP - if (preg_match('/^\s*CREATE ('.$sAvailSqlObjects.') /siU', $sql)) { - $sql = ''; - continue; // read next statement - } - break; - case 'upgrade': // skip DROP; execute CREATE - case 'repair': // skip DROP; execute CREATE - if (preg_match('/^\s*DROP ('.$sAvailSqlObjects.') /siU', $sql)) { - $sql = ''; - continue; // read next statement - } - break; - default: // install: execute DROP; execute CREATE - break; - } - if (!$this->doQuery($sql)) { - $retval = false; - $this->error = $this->getError(); - unset($aSql); - break; - } - $sql = ''; - } - } - } - return $retval; - } // end of function importSql() /** * retuns the type of the engine used for requested table * @param string $table name of the table, including prefix Index: branches/2.8.x/wb/framework/SqlImport.php =================================================================== --- branches/2.8.x/wb/framework/SqlImport.php (nonexistent) +++ branches/2.8.x/wb/framework/SqlImport.php (revision 2105) @@ -0,0 +1,268 @@ +. + */ + +/** + * SqlImport.php + * + * @category Core + * @package Core_Database + * @copyright Manuela v.d.Decken + * @author Manuela v.d.Decken + * @license http://www.gnu.org/licenses/gpl.html GPL License + * @version 0.0.1 + * @revision $Revision: 2070 $ + * @lastmodified $Date: 2014-01-03 02:21:42 +0100 (Fr, 03 Jan 2014) $ + * @since File available since 30.11.2014 + * @description can handle different actions with SQL-Import files + */ +class SqlImport { + +/** WbDatabase object */ + protected $oDb = null; +/** valide structure file to use for import */ + protected $sStructFile = ''; +/** valide TablePrefix to use for import */ + protected $sTablePrefix = ''; +/** default Collation to use for import of chars/text */ + protected $sCollation = 'utf8_unicode_ci'; +/** default engine for tables */ + protected $sEngine = 'MyISAM'; +/** collected error messages */ + protected $aErrMsg = array(); +/** possible actions for doImport() */ + protected $aActions = array( + 'uninstall', + 'install', + 'upgrade' + ); +/** collected additional replacements pairs */ + protected $aReplacements = array('key'=>array(), 'value'=>array()); +/** possible engines to use */ + protected $aEngineTypesAvail = array( + 'memory' => 'MEMORY', + 'myisam' => 'MyISAM', + 'innodb' => 'InnoDB', + 'archive' => 'ARCHIVE' + ); +/** SQL objects witch can be handled */ + protected $aAvailSqlObjects = array( + 'TABLE', + 'VIEW', + 'INDEX', + 'PROCEDURE', + 'FUNCTION', + 'TRIGGER', + 'EVENT' + ); +/** + * Constructor + * @param WbDatabase $oDb + * @param string $sStructFile + */ + public function __construct(WbDatabase $oDb, $sStructFile) + { + $this->oDb = $oDb; + $this->sTablePrefix = $oDb->TablePrefix; + if (file_exists($sStructFile)) { + $this->sStructFile = str_replace('\\', '/', $sStructFile); + } else { + $this->sStructFile = ''; + $this->aErrMsg[] = 'file with structure not available! ['.$sStructFile.']'; + } + } +/** + * Add Key-Value pairs for additional placeholders + * @param string $sKey + * @param mixed $sValue + */ + public function addReplacement($sKey, $sValue = '') + { + $sKey = strtoupper(preg_replace('/([a-z0-9])([A-Z])/', '\1_\2', ltrim($sKey, 'a..z'))); + $this->aReplacements['key'][] = '/\{'.$sKey.'\}/'; + $this->aReplacements['value'][] = $sValue; + } +/** + * define another collation then default utf8_unicode_ci + * @param string $sCollation + * @return boolean + */ + public function setDefaultCollation($sCollation = 'utf8_unicode_ci') + { + $bRetval = false; + // test if selected collation is available on current server. + $sql = 'SHOW COLLATION LIKE \''.$this->oDb->escapeString($sCollation).'\''; + if (($oAvailCollations = $this->oDb->doQuery($sql))) { + if (($oAvailCollations->numRows())) { + //use new collation + $this->sCollation = $sCollation; + $bRetval = true; + } + } + return $bRetval; + } +/** + * define another prefix then 'MyISAM' + * @param string $sEngine + * @return boolean + */ + public function setDefaultEngine($sEngine ='MyISAM') + { + $bRetval = false; + if (isset($this->aEngineTypesAvail[strtolower($sEngine)])) { + // use new engine + $this->sEngine = $this->aEngineTypesAvail[strtolower($sEngine)]; + $bRetval = true; + } + return $bRetval; + } +/** + * define another prefix then default in Wbdatabase + * @param string $sTablePrefix + * @return boolean + */ + public function setTablePrefix($sTablePrefix = '') + { + $bRetval = false; + if ( + // Prefix must be empty or matching allowed table names + $sTablePrefix == '' || + preg_match('/^[a-z][a-z0-9_]*$/i', $sTablePrefix) + ) { + // use new TablePrefix + $this->sTablePrefix = $sTablePrefix; + $bRetval = true; + } + return $bRetval; + } +/** + * Start and execute the import + * @param string $sAction + * @return boolean + */ + public function doImport($sAction) + { + if (! $this->sStructFile) { + // no file found so ignore import method + return true; + } + if (! is_readable($this->sStructFile)) { + // file fond but it's not readable + $this->aErrMsg[] = 'unable to read file ['.$this->sStructFile.']'; + return false; + } + $sAction = strtolower( + preg_replace( + '/^.*?('.implode('|', $this->aActions).')(\.php)?$/i', + '$1', + $sAction + ) + ); + $sAction = ($sAction == '' ? 'install' : $sAction); + if ($this->importSql($sAction)) { + return true; + } else { + $this->aErrMsg[] = $this->oDb->getError(); + return false; + } + } +/** + * return errorstrings, concatet by LF + * @return string + */ + public function getError() + { + return implode(PHP_EOL, $this->aErrMsg); + } +/** + * Import an SQl-Dumpfile witch can include unlimited additional placeholders for values + * @param string $sAction 'install' || 'uninstall' || 'upgrade' + * @return bool false on error + */ + protected function importSql($sAction = 'install') + { + $retval = true; + $this->error = ''; + // sanitize arguments + $aTmp = preg_split('/_/', $this->sCollation, null, PREG_SPLIT_NO_EMPTY); + $sCharset = $aTmp[0]; + // get from addReplacements + $aSearch = $this->aReplacements['key']; + // define basic array of searches + $aSearch[] = '/\{TABLE_PREFIX\}/'; + $aSearch[] = '/\{FIELD_COLLATION\}/'; + $aSearch[] = '/\{TABLE_ENGINE\}/'; + $aSearch[] = '/\{TABLE_ENGINE=([a-zA-Z_0-9]*)\}/'; + $aSearch[] = '/\{CHARSET\}/'; + $aSearch[] = '/\{COLLATION\}/'; + // get from addReplacements + $aReplace = $this->aReplacements['value']; + // define basic array of replacements + $aReplace[] = $this->sTablePrefix; + $aReplace[] = ' COLLATE {COLLATION}'; + $aReplace[] = ' {ENGINE='.$this->sEngine.'}'; + $aReplace[] = ' ENGINE=$1 DEFAULT CHARSET={CHARSET} COLLATE={COLLATION}'; + $aReplace[] = $sCharset; + $aReplace[] = $this->sCollation; + + $sql = ''; // buffer for statements + $aSql = file($this->sStructFile, FILE_SKIP_EMPTY_LINES|FILE_IGNORE_NEW_LINES); + // remove possible ByteOrderMark + $aSql[0] = preg_replace('/^[\xAA-\xFF]{3}/', '', $aSql[0]); + // iterate file line by line + while (sizeof($aSql) > 0) { + // remove trailing and leading whitespaces + $sSqlLine = trim(array_shift($aSql)); + // skip line if it's a comment + if (preg_match('/^--/', $sSqlLine)) { continue; } + // attach line to buffer + $sql = $sql.' '.$sSqlLine; + // detect end of statement + if ((substr($sql,-1,1) == ';')) { + // replace placeholders in statement + $sql = trim(preg_replace($aSearch, $aReplace, $sql)); + $sAvailSqlObjects = implode('|', $this->aAvailSqlObjects); + switch ($sAction) { + case 'uninstall': // execute DROP - skip CREATE + if (preg_match('/^\s*CREATE ('.$sAvailSqlObjects.') /si', $sql)) { + $sql = ''; // clear buffer + continue 2; // read next statement + } + break; + case 'upgrade': // skip DROP; execute CREATE + if (preg_match('/^\s*DROP ('.$sAvailSqlObjects.') /si', $sql)) { + $sql = ''; // clear buffer + continue 2; // read next statement + } + break; + default: // install: execute DROP; execute CREATE + break; + } + if (!$this->oDb->doQuery($sql)) { + $retval = false; + $this->aErrMsg[] = $this->oDb->getError(); + unset($aSql); + break; + } + $sql = ''; // clear buffer + } + } + return $retval; + } // end of function importSql() + +} \ No newline at end of file