Merge pull request #15497 from nextcloud/3rdparty/doctrine/dbal-292

[3rdparty] Doctrine dbal to 2.9.2
nextcloud · May 15, 2019 · 1cfc59c · 1cfc59c
2 parents 9fe4d8e + d11caf1
commit 1cfc59c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 23 deletions.
diff --git a/3rdparty b/3rdparty
diff --git 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);
-	}
 }