diff options
author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-05-15 08:57:13 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-15 08:57:13 +0200 |
commit | 1cfc59c3ad4be637dcfc5e80cc96491d25d2e84d (patch) | |
tree | 9b430de3d635ae3ce31b857619a1cd6b420831f9 | |
parent | 9fe4d8e7a1f41aad052f7a6752a153b22046093f (diff) | |
parent | d11caf1a3a9c230f893857f5fd6e2e64f820d823 (diff) | |
download | nextcloud-server-1cfc59c3ad4be637dcfc5e80cc96491d25d2e84d.tar.gz nextcloud-server-1cfc59c3ad4be637dcfc5e80cc96491d25d2e84d.zip |
Merge pull request #15497 from nextcloud/3rdparty/doctrine/dbal-292
[3rdparty] Doctrine dbal to 2.9.2
m--------- | 3rdparty | 0 | ||||
-rw-r--r-- | lib/private/DB/OCSqlitePlatform.php | 22 |
2 files changed, 0 insertions, 22 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); - } } |