From 56c49fedd28489b5d6509c7b5e3565948dfdba26 Mon Sep 17 00:00:00 2001 From: armetiz Date: Mon, 16 Jan 2012 10:30:15 +0100 Subject: [PATCH 1/2] Unique key name isn't correctly set - DDC-1603 --- lib/Doctrine/ORM/Tools/SchemaTool.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Tools/SchemaTool.php b/lib/Doctrine/ORM/Tools/SchemaTool.php index 2e9feb1f5a8..60760e66c9c 100644 --- a/lib/Doctrine/ORM/Tools/SchemaTool.php +++ b/lib/Doctrine/ORM/Tools/SchemaTool.php @@ -223,7 +223,7 @@ public function getSchemaFromMetadata(array $classes) if (isset($class->table['indexes'])) { foreach ($class->table['indexes'] AS $indexName => $indexData) { - $table->addIndex($indexData['columns'], $indexName); + $table->addIndex($indexData['columns'], is_numeric($indexName) ? null : $indexName); } } From 21c9be74c93394711366afe436e000816f39ff81 Mon Sep 17 00:00:00 2001 From: armetiz Date: Mon, 16 Jan 2012 13:54:04 +0100 Subject: [PATCH 2/2] Update lib/Doctrine/ORM/Tools/SchemaTool.php --- lib/Doctrine/ORM/Tools/SchemaTool.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Tools/SchemaTool.php b/lib/Doctrine/ORM/Tools/SchemaTool.php index 60760e66c9c..b0d14eb26f6 100644 --- a/lib/Doctrine/ORM/Tools/SchemaTool.php +++ b/lib/Doctrine/ORM/Tools/SchemaTool.php @@ -229,7 +229,7 @@ public function getSchemaFromMetadata(array $classes) if (isset($class->table['uniqueConstraints'])) { foreach ($class->table['uniqueConstraints'] AS $indexName => $indexData) { - $table->addUniqueIndex($indexData['columns'], $indexName); + $table->addUniqueIndex($indexData['columns'], is_numeric($indexName) ? null : $indexName); } }