Merge branch 'master' into doctrine

diff --cc lib/db.php
index 4a956674d121c9e49ce00a90a91ddb52d27745fc,9699b216f6f712d71bdebac6baa627045806aa6f..518fcc56a09eef219db987426b3a1d6ebca63545
--- 1/lib/db.php
--- 2/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;