holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed db-creation to allow db-names with dashes

Browse Source
This commit is contained in:
Ralf Becker 2007-05-15 06:37:24 +00:00
parent 5b65f8f21a
commit 47400643f7
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
phpgwapi/inc/class.egw_db.inc.php
View File

@ -980,20 +980,23 @@
$currentPassword = $this->Password; $currentPassword = $this->Password;
$currentDatabase = $this->Database; $currentDatabase = $this->Database;
$extra = array(); $sqls = array();
$set_charset = ''; $set_charset = '';
switch ($this->Type) switch ($this->Type)
{ {
case 'pgsql': case 'pgsql':
$meta_db = 'template1'; $meta_db = 'template1';
$sqls[] = "CREATE DATABASE $currentDatabase";
break; break;
case 'mysql': case 'mysql':
$create = "CREATE DATABASE `$currentDatabase`";
if ($charset && isset($this->Link_ID->charset2mysql[$charset]) && (float) $this->ServerInfo['version'] >= 4.1) if ($charset && isset($this->Link_ID->charset2mysql[$charset]) && (float) $this->ServerInfo['version'] >= 4.1)
{ {
$set_charset = ' DEFAULT CHARACTER SET '.$this->Link_ID->charset2mysql[$charset].';'; $create .= ' DEFAULT CHARACTER SET '.$this->Link_ID->charset2mysql[$charset].';';
} }
$sqls[] = $create;
$sqls[] = "GRANT ALL ON `$currentDatabase`.* TO $currentUser@localhost IDENTIFIED BY ".$this->quote($currentPassword);
$meta_db = 'mysql'; $meta_db = 'mysql';
$extra[] = "GRANT ALL ON $currentDatabase.* TO $currentUser@localhost IDENTIFIED BY '$currentPassword'";
break; break;
default: default:
echo "<p>db::create_database(user='$adminname',\$pw) not yet implemented for DB-type '$this->Type'</p>\n"; echo "<p>db::create_database(user='$adminname',\$pw) not yet implemented for DB-type '$this->Type'</p>\n";
@ -1006,10 +1009,9 @@
$this->Database = $meta_db; $this->Database = $meta_db;
} }
$this->disconnect(); $this->disconnect();
$this->query('CREATE DATABASE '.$currentDatabase.$set_charset); foreach($sqls as $sql)
foreach($extra as $sql)
{ {
$this->query($sql); $this->query($sql,__LINE__,__FILE__);
} }
$this->disconnect(); $this->disconnect();