From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 17 Mar 2013 12:25:28 +0000 (+0100)
Subject: Merge branch 'master' into doctrine
X-Git-Tag: v6.0.0alpha2~444^2~40
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ed642d1038f34a334cf011cf54dce7dc4976fba7;p=nextcloud-server.git

Merge branch 'master' into doctrine
---

ed642d1038f34a334cf011cf54dce7dc4976fba7
diff --cc lib/db.php
index 4a956674d12,9699b216f6f..518fcc56a09
--- a/lib/db.php
+++ b/lib/db.php
@@@ -151,25 -272,30 +151,26 @@@ class OC_DB 
  					);
  					break;
  				case 'oci':
 -					$dsn = array(
 -							'phptype'  => 'oci8',
 -							'username' => $user,
 +					$connectionParams = array(
 +							'user' => $user,
  							'password' => $pass,
 +							'host' => $host,
 +							'port' => $port,
 +							'dbname' => $name,
  							'charset' => 'AL32UTF8',
 +							'driver' => 'oci8',
  					);
 -					if ($host != '') {
 -						$dsn['hostspec'] = $host;
 -						$dsn['database'] = $name;
 -					} else { // use dbname for hostspec
 -						$dsn['hostspec'] = $name;
 -						$dsn['database'] = $user;
 -					}
  					break;
  				case 'mssql':
 -					$dsn = array(
 -						'phptype' => 'sqlsrv',
 -						'username' => $user,
 -						'password' => $pass,
 -						'hostspec' => $host,
 -						'database' => $name,
 -						'charset' => 'UTF-8'
 +					$connectionParams = array(
 +							'user' => $user,
 +							'password' => $pass,
 +							'host' => $host,
 +							'port' => $port,
 +							'dbname' => $name,
++							'charset' => 'UTF8',
 +							'driver' => 'pdo_sqlsrv',
  					);
 -					$options['portability'] = $options['portability'] - MDB2_PORTABILITY_EMPTY_TO_NULL;
  					break;
  				default:
  					return false;