extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-24 23:08:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

1) fixed bug with setup_demo (start_transaction did not call open before)

Browse Source 
2) moved create_database code to the shared class: adodb can create the db now for mysql & pgsql
3) fixed the connect to be able to use unix-domain sockets for pgsql (hostname empty)
This commit is contained in:
Ralf Becker 2004-02-08 11:19:52 +00:00
parent b09e2ed799
commit 9949311809
1 changed files with 50 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
phpgwapi/inc/class.db.inc.php
View File

@ -163,10 +163,6 @@
{ {
$Port = $this->Port; $Port = $this->Port;
} }
if (isset($Port))
{
$Host = $Host.':'.$Port;
}
if ($User == '') if ($User == '')
{ {
$User = $this->User; $User = $this->User;
@ -181,12 +177,18 @@
$this->type = $GLOBALS['phpgw_info']['server']['db_type']; $this->type = $GLOBALS['phpgw_info']['server']['db_type'];
if (!is_object($GLOBALS['phpgw']->ADOdb)) if (!is_object($GLOBALS['phpgw']->ADOdb))
{ {
$error_str = "$Host, $User, \$Password, $Database";
switch($this->type) // convert to ADO db-type-names switch($this->type) // convert to ADO db-type-names
{ {
case 'pgsql': case 'pgsql':
$type = 'postgres'; $type = 'postgres';
// create our own pgsql connection-string, to allow unix domain soccets if !$Host
$Host = "dbname=$Database".($Host ? " host=$Host".($Port ? " port=$Port" : '') : '').
" user=$User".($Password ? " password='".addslashes($Password)."'" : '');
$User = $Password = $Database = ''; // to indicate $Host is a connection-string
break; break;
default: default:
$Host .= ($Port ? ':'.$Port : '');
$type = $this->type; $type = $this->type;
} }
$GLOBALS['phpgw']->adodb = ADONewConnection($type); $GLOBALS['phpgw']->adodb = ADONewConnection($type);
@ -197,7 +199,8 @@
$connect = $GLOBALS['phpgw_info']['server']['db_persistent'] ? 'PConnect' : 'Connect'; $connect = $GLOBALS['phpgw_info']['server']['db_persistent'] ? 'PConnect' : 'Connect';
if (!$connect = $GLOBALS['phpgw']->adodb->$connect($Host, $User, $Password, $Database)) if (!$connect = $GLOBALS['phpgw']->adodb->$connect($Host, $User, $Password, $Database))
{ {
$this->halt("ADOdb::$connect($Host, $User, \$Password, $Database) failed."); $this->halt("ADOdb::$connect($error_str) failed.");
return 0; // in case error-reporting = 'no'
} }
} }
$this->Link_ID = &$GLOBALS['phpgw']->adodb; $this->Link_ID = &$GLOBALS['phpgw']->adodb;
@ -206,10 +209,13 @@
} }
/** /**
* Close a connection to a database - not needed for ADOdb connection * Close a connection to a database
*/ */
function disconnect() function disconnect()
{ {
unset($GLOBALS['phpgw']->adodb);
unset($this->Link_ID);
$this->Link_ID = 0;
} }
/** /**
@ -397,6 +403,7 @@
*/ */
function transaction_begin() function transaction_begin()
{ {
$this->connect();
//return $this->Link_ID->BeginTrans(); //return $this->Link_ID->BeginTrans();
return $this->Link_ID->StartTrans(); return $this->Link_ID->StartTrans();
} }
@ -484,7 +491,7 @@
*/ */
function num_rows() function num_rows()
{ {
return $this->Query_ID->RecordCount(); return $this->Query_ID ? $this->Query_ID->RecordCount() : False;
} }
/** /**
@ -703,7 +710,42 @@
*/ */
function create_database($adminname = '', $adminpasswd = '') function create_database($adminname = '', $adminpasswd = '')
{ {
echo "<p>db::create_database(user='$adminname',\$pw) not yet implemented</p>\n"; $extra = array();
switch ($this->type)
{
case 'pgsql':
$meta_db = 'template1';
break;
case 'mysql':
$meta_db = 'mysql';
$extra[] = "grant all on $currentDatabase.* to $currentUser@localhost identified by '$currentPassword'";
break;
default:
echo "<p>db::create_database(user='$adminname',\$pw) not yet implemented for DB-type '$this->type'</p>\n";
break;
}
$currentUser = $this->User;
$currentPassword = $this->Password;
$currentDatabase = $this->Database;
if ($adminname != '')
{
$this->User = $adminname;
$this->Password = $adminpasswd;
$this->Database = $meta_db;
}
$this->disconnect();
$this->query("CREATE DATABASE $currentDatabase");
foreach($extra as $sql)
{
$this->query($sql);
}
$this->disconnect();
$this->User = $currentUser;
$this->Password = $currentPassword;
$this->Database = $currentDatabase;
$this->connect();
} }
/** /**