extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-27 18:33:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

try creating egroupware database for postgres with psql, as creating it through SQL seem not to work in Travis

Browse Source
This commit is contained in:
Ralf Becker 2016-08-06 11:10:28 +02:00
parent a2a674fa3a
commit 81554c511e
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -71,9 +71,9 @@ script:
# install egroupware (PostgreSQL need some specific handling as it is not the default and we can not create users via sql) # install egroupware (PostgreSQL need some specific handling as it is not the default and we can not create users via sql)
- case $DB in - case $DB in
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 '' psql -U postgres -c 'create database egroupware';
php doc/rpm-build/post_install.php --db_type pgsql --db_port 5432 --db_user postgres --db_pass ''
--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

3
api/src/Db.php
View File

@ -1065,13 +1065,12 @@ class Db
default: default:
throw new Exception\WrongParameter(__METHOD__."(user=$adminname, \$pw) not yet implemented for DB-type '$this->Type'"); throw new Exception\WrongParameter(__METHOD__."(user=$adminname, \$pw) not yet implemented for DB-type '$this->Type'");
} }
error_log(__METHOD__."() this->Type=$this->Type: sqls=".array2string($sqls)); //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;