Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cc-2280: install script overwrites existing db

Browse source
This commit is contained in:
martin 2011-05-18 15:35:27 -04:00
parent 83c1ca7c88
commit 81ba336b4b
2 changed files with 27 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
install/include/AirtimeInstall.php
View file

@ -142,6 +142,7 @@ class AirtimeInstall
}
}
public static function CreateDatabase()
{
global $CC_CONFIG;
@ -150,8 +151,9 @@ class AirtimeInstall
$database = $CC_CONFIG['dsn']['database'];
$username = $CC_CONFIG['dsn']['username'];
$command = "echo \"CREATE DATABASE $database OWNER $username\" | su postgres -c psql 2>/dev/null";
#$command = "echo \"CREATE DATABASE $database OWNER $username\" | su postgres -c psql 2>/dev/null";
$command = "su postgres -c \"createdb $database --owner $username\"";
@exec($command, $output, $results);
if ($results == 0) {
echo "* Database '{$CC_CONFIG['dsn']['database']}' created.".PHP_EOL;
@ -164,6 +166,10 @@ class AirtimeInstall
echo "* Database '{$CC_CONFIG['dsn']['database']}' already exists.".PHP_EOL;
}
}
$databaseExisted = ($results != 0);
return $databaseExisted;
}
public static function InstallPostgresScriptingLanguage()