forked from extern/egroupware
using correct defaults eg. "template1" for postgres
This commit is contained in:
parent
d1a959629b
commit
1fa85c88b1
@ -57,10 +57,7 @@ before_script:
|
||||
;;
|
||||
esac
|
||||
- phpenv config-rm xdebug.ini
|
||||
- php -m
|
||||
- php -r 'var_dump(extension_loaded("pgsql"));'
|
||||
- php -r 'var_dump(get_loaded_extensions());'
|
||||
#- composer update --prefer-source $LOWEST_DEPS
|
||||
#- php -m
|
||||
- curl https://svn.stylite.de/fix_mrconfig 2>/dev/null | php
|
||||
- mr --trust-all --stats up
|
||||
- (cd activesync; mr --trust-all --stats up)
|
||||
|
@ -58,7 +58,7 @@ class setup_cmd_database extends setup_cmd
|
||||
{
|
||||
if (!is_array($domain))
|
||||
{
|
||||
$domain = array(
|
||||
$data = array(
|
||||
'domain' => $domain,
|
||||
'db_type' => $db_type,
|
||||
'db_host' => $db_host,
|
||||
@ -73,8 +73,12 @@ class setup_cmd_database extends setup_cmd
|
||||
'make_db_name_unique' => $make_db_name_unique,
|
||||
);
|
||||
}
|
||||
//error_log(__METHOD__.'('.array2string($domain).") make_db_name_unique=".array2string($domain['make_db_name_unique']));
|
||||
admin_cmd::__construct($domain);
|
||||
else
|
||||
{
|
||||
$data = $domain;
|
||||
}
|
||||
// need to incorporate correct defaults for given database type
|
||||
admin_cmd::__construct(array_merge(self::defaults($data['db_type']), array_diff($data, array(null))));
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user