extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

debugging db creation in Travis for postgres

Browse Source
This commit is contained in:
Ralf Becker 2016-08-06 10:54:33 +02:00
parent 1fa85c88b1
commit b26e102ded
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -73,6 +73,7 @@ script:
postgres) postgres)
php doc/rpm-build/post_install.php --db_type pgsql --db_port 5432 --db_user postgres --db_pass '' --db_root postgres --db_root_pw '' php doc/rpm-build/post_install.php --db_type pgsql --db_port 5432 --db_user postgres --db_pass '' --db_root postgres --db_root_pw ''
--source_dir `pwd` --start_db '' --autostart_db '' --start_webserver '' --webserver_user '' --source_dir `pwd` --start_db '' --autostart_db '' --start_webserver '' --webserver_user ''
; psql -U postgres -c '\l'
;; ;;
*) *)
php doc/rpm-build/post_install.php php doc/rpm-build/post_install.php

5
api/src/Db.php
View File

@ -1063,14 +1063,15 @@ class Db
$sqls[] = "GRANT ALL ON `$currentDatabase`.* TO $currentUser@'$grant_host' IDENTIFIED BY ".$this->quote($currentPassword); $sqls[] = "GRANT ALL ON `$currentDatabase`.* TO $currentUser@'$grant_host' IDENTIFIED BY ".$this->quote($currentPassword);
break; break;
default: default:
echo "<p>db::create_database(user='$adminname',\$pw) not yet implemented for DB-type '$this->Type'</p>\n"; throw new Exception\WrongParameter(__METHOD__."(user=$adminname, \$pw) not yet implemented for DB-type '$this->Type'");
break;
} }
error_log(__METHOD__."() this->Type=$this->Type: sqls=".array2string($sqls));
foreach($sqls as $sql) foreach($sqls as $sql)
{ {
$this->query($sql,__LINE__,__FILE__); $this->query($sql,__LINE__,__FILE__);
} }
$this->disconnect(); $this->disconnect();
error_log(__METHOD__."() this->Type=$this->Type: sqls run, disconnecting now as admin");
$this->User = $currentUser; $this->User = $currentUser;
$this->Password = $currentPassword; $this->Password = $currentPassword;