open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #13480 from owncloud/mysql-autocommit

Browse Source 
set MySQL autocommit on connection setup
remotes/origin/create-share-target-reuse
Lukas Reschke 12 years ago
parent 6c1e13a6ed baefefbbc8
commit cbffaff7a0
1 changed files with 9 additions and 4 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 13
      lib/private/db/connectionfactory.php

13
lib/private/db/connectionfactory.php
Unescape View File

@ -7,6 +7,9 @@
*/ */
namespace OC\DB; namespace OC\DB;
use Doctrine\DBAL\Event\Listeners\OracleSessionInit;
use Doctrine\DBAL\Event\Listeners\SQLSessionInit;
use Doctrine\DBAL\Event\Listeners\MysqlSessionInit;
/** /**
* Takes care of creating and configuring Doctrine connections. * Takes care of creating and configuring Doctrine connections.
@ -84,10 +87,12 @@ class ConnectionFactory {
case 'mysql': case 'mysql':
// Send "SET NAMES utf8". Only required on PHP 5.3 below 5.3.6. // Send "SET NAMES utf8". Only required on PHP 5.3 below 5.3.6.
// See http://stackoverflow.com/questions/4361459/php-pdo-charset-set-names#4361485 // See http://stackoverflow.com/questions/4361459/php-pdo-charset-set-names#4361485
$eventManager->addEventSubscriber(new \Doctrine\DBAL\Event\Listeners\MysqlSessionInit); $eventManager->addEventSubscriber(new MysqlSessionInit);
$eventManager->addEventSubscriber(
new SQLSessionInit("SET SESSION AUTOCOMMIT=1"));
break; break;
case 'oci': case 'oci':
$eventManager->addEventSubscriber(new \Doctrine\DBAL\Event\Listeners\OracleSessionInit); $eventManager->addEventSubscriber(new OracleSessionInit);
break; break;
case 'sqlite3': case 'sqlite3':
$journalMode = $additionalConnectionParams['sqlite.journal_mode']; $journalMode = $additionalConnectionParams['sqlite.journal_mode'];
@ -136,8 +141,8 @@ class ConnectionFactory {
$name = $config->getValue('dbname', 'owncloud'); $name = $config->getValue('dbname', 'owncloud');
if ($this->normalizeType($type) === 'sqlite3') { if ($this->normalizeType($type) === 'sqlite3') {
$datadir = $config->getValue("datadirectory", \OC::$SERVERROOT . '/data'); $dataDir = $config->getValue("datadirectory", \OC::$SERVERROOT . '/data');
$connectionParams['path'] = $datadir . '/' . $name . '.db'; $connectionParams['path'] = $dataDir . '/' . $name . '.db';
} else { } else {
$host = $config->getValue('dbhost', ''); $host = $config->getValue('dbhost', '');
if (strpos($host, ':')) { if (strpos($host, ':')) {

Write Preview
Loading…
Cancel
Save