From b50a11d8523ff9361442466a3aadeef5063f6bb5 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Fri, 10 May 2019 14:33:06 +0200 Subject: [3rdparty] Doctrine dbal to 2.9.2 Signed-off-by: Roeland Jago Douma --- 3rdparty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty b/3rdparty index c726f713a3c..d183b9cbdc6 160000 --- a/3rdparty +++ b/3rdparty @@ -1 +1 @@ -Subproject commit c726f713a3c49bf0c826a3a0800be17e24bea85b +Subproject commit d183b9cbdc62f2302f34cdf51f92aa45a1bb9f60 -- cgit v1.2.3 From d11caf1a3a9c230f893857f5fd6e2e64f820d823 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Mon, 13 May 2019 21:45:07 +0200 Subject: No need for platform hacks anymore Signed-off-by: Roeland Jago Douma --- lib/private/DB/OCSqlitePlatform.php | 22 ---------------------- 1 file changed, 22 deletions(-) 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); - } } -- cgit v1.2.3