diff options
m--------- | 3rdparty | 0 | ||||
-rw-r--r-- | lib/private/DB/OCSqlitePlatform.php | 22 | ||||
-rw-r--r-- | lib/private/RedisFactory.php | 4 |
3 files changed, 3 insertions, 23 deletions
diff --git a/3rdparty b/3rdparty -Subproject c726f713a3c49bf0c826a3a0800be17e24bea85 +Subproject d183b9cbdc62f2302f34cdf51f92aa45a1bb9f6 diff --git a/lib/private/DB/OCSqlitePlatform.php b/lib/private/DB/OCSqlitePlatform.php index 9fcd8038f4f..0ffe7a3e04c 100644 --- a/lib/private/DB/OCSqlitePlatform.php +++ b/lib/private/DB/OCSqlitePlatform.php @@ -23,27 +23,5 @@ namespace OC\DB; class OCSqlitePlatform extends \Doctrine\DBAL\Platforms\SqlitePlatform { - /** - * {@inheritDoc} - */ - public function getColumnDeclarationSQL($name, array $field) { - $def = parent::getColumnDeclarationSQL($name, $field); - if (!empty($field['autoincrement'])) { - $def .= ' PRIMARY KEY AUTOINCREMENT'; - } - return $def; - } - /** - * {@inheritDoc} - */ - protected function _getCreateTableSQL($name, array $columns, array $options = array()){ - // if auto increment is set the column is already defined as primary key - foreach ($columns as $column) { - if (!empty($column['autoincrement'])) { - $options['primary'] = null; - } - } - return parent::_getCreateTableSQL($name, $columns, $options); - } } diff --git a/lib/private/RedisFactory.php b/lib/private/RedisFactory.php index 754437c06c7..22d02e07c29 100644 --- a/lib/private/RedisFactory.php +++ b/lib/private/RedisFactory.php @@ -72,8 +72,10 @@ class RedisFactory { } if (isset($config['port'])) { $port = $config['port']; - } else { + } else if ($host[0] !== '/') { $port = 6379; + } else { + $port = null; } if (isset($config['timeout'])) { $timeout = $config['timeout']; |