Implemented comparison of default values as strings regardless of the…

…ir PHP types

Fixes doctrine#3336.

lib/Doctrine/DBAL/Schema/Comparator.php

@@ -11,6 +11,7 @@
 use function array_shift;
 use function array_unique;
 use function count;
+use function strcmp;
 use function strtolower;
 
 /**
@@ -432,12 +433,12 @@ public function diffColumn(Column $column1, Column $column2)
  $changedProperties[] = 'comment';
  }
 
- if ($properties1['default'] !== $properties2['default'] ||
-  // Null values need to be checked additionally as they tell whether to create or drop a default value.
- // null != 0, null != false, null != '' etc. This affects platform's table alteration SQL generation.
-  ($properties1['default'] === null && $properties2['default'] !== null) ||
-  ($properties2['default'] === null && $properties1['default'] !== null)
- ) {
+ $default1IsNull = $properties1['default'] === null;
+ $default2IsNull = $properties2['default'] === null;
+
+ // Null values need to be checked additionally as they tell whether to create or drop a default value.
+ // null != 0, null != false, null != '' etc. This affects platform's table alteration SQL generation.
+ if ($default1IsNull !== $default2IsNull || strcmp($properties1['default'], $properties2['default']) !== 0) {
  $changedProperties[] = 'default';
  }
 

tests/Doctrine/Tests/DBAL/Functional/Schema/ComparatorTest.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\DBAL\Functional\Schema;
+
+use Doctrine\DBAL\Schema\AbstractSchemaManager;
+use Doctrine\DBAL\Schema\Comparator;
+use Doctrine\DBAL\Schema\Table;
+use Doctrine\Tests\DbalFunctionalTestCase;
+
+class ComparatorTest extends DbalFunctionalTestCase
+{
+ /** @var AbstractSchemaManager */
+ private $schemaManager;
+
+ /** @var Comparator */
+ private $comparator;
+
+ protected function setUp()
+ {
+ parent::setUp();
+
+ $this->schemaManager = $this->connection->getSchemaManager();
+ $this->comparator = new Comparator();
+ }
+
+ public function testDefaultValueComparison()
+ {
+ $table = new Table('default_value');
+ $table->addColumn('id', 'integer', ['default' => 1]);
+
+ $this->schemaManager->createTable($table);
+
+ $onlineTable = $this->schemaManager->listTableDetails('default_value');
+
+ self::assertFalse($this->comparator->diffTable($table, $onlineTable));
+ }
+}

tests/Doctrine/Tests/DBAL/Functional/Schema/MySqlSchemaManagerTest.php

@@ -23,6 +23,8 @@ protected function setUp()
  return;
  }
 
+ $this->resetSharedConn();
+
  Type::addType('point', MySqlPointType::class);
  }