tonyair/silverstripe-mssql
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-mssql synced 2024-10-01 05:39:27 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Renamed variables and keys to conincide with r98795

Browse Source
This commit is contained in:
Sean Harvey 2010-02-11 09:59:52 +00:00
parent 68757c72a6
commit 50f8ee7d6a
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
code/MSSQLDatabaseConfigurationHelper.php
View File

@ -23,10 +23,10 @@ class MSSQLDatabaseConfigurationHelper implements DatabaseConfigurationHelper {
/** /**
* Ensure that the database server exists. * Ensure that the database server exists.
* @param array $databaseConfig Associative array of db configuration, e.g. "server", "username" etc * @param array $databaseConfig Associative array of db configuration, e.g. "server", "username" etc
* @return array Result - e.g. array('okay' => true, 'error' => 'details of error') * @return array Result - e.g. array('success' => true, 'error' => 'details of error')
*/ */
public function requireDatabaseServer($databaseConfig) { public function requireDatabaseServer($databaseConfig) {
$okay = false; $success = false;
$error = ''; $error = '';
if(function_exists('mssql_connect')) { if(function_exists('mssql_connect')) {
@ -39,14 +39,14 @@ class MSSQLDatabaseConfigurationHelper implements DatabaseConfigurationHelper {
} }
if($conn) { if($conn) {
$okay = true; $success = true;
} else { } else {
$okay = false; $success = false;
$error = 'SQL Server requires a valid username and password to determine if the server exists.'; $error = 'SQL Server requires a valid username and password to determine if the server exists.';
} }
return array( return array(
'okay' => $okay, 'success' => $success,
'error' => $error 'error' => $error
); );
} }
@ -56,10 +56,10 @@ class MSSQLDatabaseConfigurationHelper implements DatabaseConfigurationHelper {
* The established connection resource is returned with the results as well. * The established connection resource is returned with the results as well.
* *
* @param array $databaseConfig Associative array of db configuration, e.g. "server", "username" etc * @param array $databaseConfig Associative array of db configuration, e.g. "server", "username" etc
* @return array Result - e.g. array('okay' => true, 'connection' => mssql link, 'error' => 'details of error') * @return array Result - e.g. array('success' => true, 'connection' => mssql link, 'error' => 'details of error')
*/ */
public function requireDatabaseConnection($databaseConfig) { public function requireDatabaseConnection($databaseConfig) {
$okay = false; $success = false;
$error = ''; $error = '';
if(function_exists('mssql_connect')) { if(function_exists('mssql_connect')) {
@ -72,14 +72,14 @@ class MSSQLDatabaseConfigurationHelper implements DatabaseConfigurationHelper {
} }
if($conn) { if($conn) {
$okay = true; $success = true;
} else { } else {
$okay = false; $success = false;
$error = ''; $error = '';
} }
return array( return array(
'okay' => $okay, 'success' => $success,
'connection' => $conn, 'connection' => $conn,
'error' => $error 'error' => $error
); );
@ -90,11 +90,11 @@ class MSSQLDatabaseConfigurationHelper implements DatabaseConfigurationHelper {
* or be able to create one if it doesn't exist. * or be able to create one if it doesn't exist.
* *
* @param array $databaseConfig Associative array of db configuration, e.g. "server", "username" etc * @param array $databaseConfig Associative array of db configuration, e.g. "server", "username" etc
* @return array Result - e.g. array('okay' => true, 'existsAlready' => 'true') * @return array Result - e.g. array('success' => true, 'alreadyExists' => 'true')
*/ */
public function requireDatabaseOrCreatePermissions($databaseConfig) { public function requireDatabaseOrCreatePermissions($databaseConfig) {
$okay = false; $success = false;
$existsAlready = false; $alreadyExists = false;
$check = $this->requireDatabaseConnection($databaseConfig); $check = $this->requireDatabaseConnection($databaseConfig);
$conn = $check['connection']; $conn = $check['connection'];
@ -103,24 +103,24 @@ class MSSQLDatabaseConfigurationHelper implements DatabaseConfigurationHelper {
|| ||
(function_exists('sqlsrv_select_db') && @sqlsrv_select_db($conn, $databaseConfig['database'])) (function_exists('sqlsrv_select_db') && @sqlsrv_select_db($conn, $databaseConfig['database']))
) { ) {
$okay = true; $success = true;
$existsAlready = true; $alreadyExists = true;
} else { } else {
if(function_exists('mssql_query') && mssql_query("CREATE DATABASE testing123", $conn)) { if(function_exists('mssql_query') && mssql_query("CREATE DATABASE testing123", $conn)) {
mssql_query("DROP DATABASE testing123", $conn); mssql_query("DROP DATABASE testing123", $conn);
$okay = true; $success = true;
$existsAlready = false; $alreadyExists = false;
} elseif(function_exists('sqlsrv_query') && @sqlsrv_query($conn, "CREATE DATABASE testing123")) { } elseif(function_exists('sqlsrv_query') && @sqlsrv_query($conn, "CREATE DATABASE testing123")) {
sqlsrv_query($conn, "DROP DATABASE testing123"); sqlsrv_query($conn, "DROP DATABASE testing123");
$okay = true; $success = true;
$existsAlready = false; $alreadyExists = false;
} }
} }
return array( return array(
'okay' => $okay, 'success' => $success,
'existsAlready' => $existsAlready 'alreadyExists' => $alreadyExists
); );
} }
} }