From 0df60dca0bfc23816e51fcd869ce503b2c957e97 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 5 Sep 2011 13:40:33 +0800 Subject: [PATCH] Generator.php --- Generator.php | 63 +-------------------------------------------------- 1 file changed, 1 insertion(+), 62 deletions(-) diff --git a/Generator.php b/Generator.php index 2a498233..0be89ca4 100644 --- a/Generator.php +++ b/Generator.php @@ -111,8 +111,6 @@ class Pman_Core_Generator extends DB_DataObject_Generator // print_r($this);exit; - $this->importSQL(); - $standard_database = $options['database']; @@ -208,66 +206,7 @@ class Pman_Core_Generator extends DB_DataObject_Generator } - /** - * imports SQL files from all DataObjects directories.... - * - * except any matching /migrate/ - */ - function importSQL() - { - $options = &PEAR::getStaticProperty('DB_DataObject','options'); - - $ff = HTML_Flexyframework::get(); - - $url = parse_url($options['database']); - // hide stuff for web.. - $cli = $options['cli']; - if (!$cli) { - $url['pass'] = '*****'; - $url['user'] = '*****'; - $url['host'] = '*****'; - } - - require_once 'System.php'; - $cat = System::which('cat'); - $mysql = System::which('mysql'); - print_r($options['mods'] ); - foreach($this->modsql as $m => $fl) - { - if ($cli && isset($options['database_'. $m])) { - $url = parse_url($options['database_'.$m]); - } - - $mysql_cmd = $mysql . - ' -h ' . $url['host'] . - ' -u' . escapeshellarg($url['user']) . - (!empty($url['pass']) ? ' -p' . escapeshellarg($url['pass']) : '') . - ' ' . basename($url['path']); - - echo $mysql_cmd . "\n" ; - - if (!empty($options['mods'] ) && !in_array($m, $options['mods'] )) { - continue; - } - - foreach($fl as $f) { - $fn = $ff->page->rootDir. "/Pman/$m/DataObjects/$f"; - if (preg_match('/migrate/i', $f)) { // skip migration scripts at present.. - continue; - } - - $cmd = $cat . ' ' . escapeshellarg($fn) . " | $mysql_cmd -f "; - echo $cmd. ($cli ? "\n" : "
\n"); - if ($cli) { - passthru($cmd); - } - - } - } - - - - } + /** * Scan the folders for DataObjects * - Use the list of php files in DataObjects folders -- 2.39.2