Merge pull request #3878 from nextcloud/downstream-26303

Fixed failing test which was ignoring a required (not null) column

lib/private/DB/Connection.php

@@ -34,6 +34,7 @@ use Doctrine\DBAL\Configuration;
 use Doctrine\DBAL\Cache\QueryCacheProfile;
 use Doctrine\Common\EventManager;
 use Doctrine\DBAL\Platforms\MySqlPlatform;
+use Doctrine\DBAL\Exception\ConstraintViolationException;
 use OC\DB\QueryBuilder\QueryBuilder;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
@@ -284,7 +285,7 @@ class Connection extends \Doctrine\DBAL\Connection implements IDBConnection {
 					}, array_merge($keys, $values))
 				);
 			return $insertQb->execute();
-		} catch (\Doctrine\DBAL\Exception\ConstraintViolationException $e) {
+		} catch (ConstraintViolationException $e) {
 			// value already exists, try update
 			$updateQb = $this->getQueryBuilder();
 			$updateQb->update($table);

tests/lib/DB/ConnectionTest.php

@@ -124,8 +124,7 @@ class ConnectionTest extends \Test\TestCase {
 		$this->connection->setValues('table', [
 			'integerfield' => 1
 		], [
-			'textfield' => 'foo',
-			'clobfield' => 'not_null'
+			'textfield' => 'foo'
 		]);
 
 		$this->connection->setValues('table', [

tests/lib/DB/MDB2SchemaReaderTest.php

@@ -42,8 +42,8 @@ class MDB2SchemaReaderTest extends \Test\TestCase {
 		$this->assertCount(8, $table->getColumns());
 
 		$this->assertEquals(4, $table->getColumn('integerfield')->getLength());
-		$this->assertTrue($table->getColumn('integerfield')->getAutoincrement());
-		$this->assertNull($table->getColumn('integerfield')->getDefault());
+		$this->assertFalse($table->getColumn('integerfield')->getAutoincrement());
+		$this->assertEquals(0, $table->getColumn('integerfield')->getDefault());
 		$this->assertTrue($table->getColumn('integerfield')->getNotnull());
 		$this->assertInstanceOf('Doctrine\DBAL\Types\IntegerType', $table->getColumn('integerfield')->getType());
 
@@ -58,7 +58,7 @@ class MDB2SchemaReaderTest extends \Test\TestCase {
 		$this->assertNull($table->getColumn('clobfield')->getLength());
 		$this->assertFalse($table->getColumn('clobfield')->getAutoincrement());
 		$this->assertNull($table->getColumn('clobfield')->getDefault());
-		$this->assertTrue($table->getColumn('clobfield')->getNotnull());
+		$this->assertFalse($table->getColumn('clobfield')->getNotnull());
 		$this->assertInstanceOf('Doctrine\DBAL\Types\TextType', $table->getColumn('clobfield')->getType());
 
 		$this->assertNull($table->getColumn('booleanfield')->getLength());

tests/lib/DB/testschema.xml

@@ -17,7 +17,7 @@
 				<type>integer</type>
 				<default>0</default>
 				<notnull>true</notnull>
-				<autoincrement>1</autoincrement>
+				<primary>true</primary>
 				<length>4</length>
 			</field>
 			<field>
@@ -37,7 +37,6 @@
 			<field>
 				<name>clobfield</name>
 				<type>clob</type>
-				<notnull>true</notnull>
 			</field>
 			<field>
 				<name>booleanfield</name>