From 2ccf544ad7c8bfc54600adb065156f04a8912c9f Mon Sep 17 00:00:00 2001
From: Philipp Schaffrath <github@philipp.schaffrath.email>
Date: Tue, 10 Jan 2017 12:10:36 +0100
Subject: Fixed failing test which was ignoring a required (not null) column
 (#26303)

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

* restored test to original, catching DriverException which also catches ConstraintViolationException

* catch ConstraintViolationException again

* removed unnecessary field from this test

* clobfield should be nullable

* clobfield now is nullable

* removed autoincrement since whenever this strategy is enabled, oracle would not throw constraint violation exceptions (needed for setValues), which mysql still does

* this field does not auto increment anymore

* mark integerfield as primary, since it is not getting marked as such through auto increment anymore,
integerfield default always has been 0 instead of null

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
 tests/lib/DB/ConnectionTest.php       | 3 +--
 tests/lib/DB/MDB2SchemaReaderTest.php | 6 +++---
 tests/lib/DB/testschema.xml           | 3 +--
 3 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'tests')

diff --git a/tests/lib/DB/ConnectionTest.php b/tests/lib/DB/ConnectionTest.php
index b9c55c23339..2a0cd70f83a 100644
--- a/tests/lib/DB/ConnectionTest.php
+++ b/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', [
diff --git a/tests/lib/DB/MDB2SchemaReaderTest.php b/tests/lib/DB/MDB2SchemaReaderTest.php
index 22c0ba28569..c740eb97f4b 100644
--- a/tests/lib/DB/MDB2SchemaReaderTest.php
+++ b/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());
diff --git a/tests/lib/DB/testschema.xml b/tests/lib/DB/testschema.xml
index dfca920a0ef..8e6dc1a1d60 100644
--- a/tests/lib/DB/testschema.xml
+++ b/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>
-- 
cgit v1.2.3