Added index flags support in annotation, xml & yaml mapping drivers.

honsa · Apr 13, 2014 · cc2fb1a · cc2fb1a
1 parent da24133
commit cc2fb1a
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 6 deletions.
diff --git a/doctrine-mapping.xsd b/doctrine-mapping.xsd
@@ -341,6 +341,7 @@
     </xs:sequence>
     <xs:attribute name="name" type="xs:NMTOKEN" use="optional"/>
     <xs:attribute name="columns" type="xs:string" use="required"/>
+    <xs:attribute name="flags" type="xs:string" use="optional"/>
     <xs:anyAttribute namespace="##other"/>
   </xs:complexType>
 

diff --git a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
@@ -101,7 +101,10 @@ public function loadMetadataForClass($className, ClassMetadata $metadata)
 
             if ($tableAnnot->indexes !== null) {
                 foreach ($tableAnnot->indexes as $indexAnnot) {
-                    $index = array('columns' => $indexAnnot->columns);
+                    $index = array(
+                        'columns' => $indexAnnot->columns,
+                        'flags' => $indexAnnot->flags
+                    );
 
                     if ( ! empty($indexAnnot->name)) {
                         $primaryTable['indexes'][$indexAnnot->name] = $index;

diff --git a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
@@ -196,14 +196,22 @@ public function loadMetadataForClass($className, ClassMetadata $metadata)
             $metadata->table['indexes'] = array();
             foreach ($xmlRoot->indexes->index as $index) {
                 $columns = explode(',', (string)$index['columns']);
-
+
+                if(!isset($index['flags'])) {
+                    $flags = array();
+                } else {
+                    $flags = explode(',', (string)$index['flags']);
+                }
+
                 if (isset($index['name'])) {
                     $metadata->table['indexes'][(string)$index['name']] = array(
-                        'columns' => $columns
+                        'columns' => $columns,
+                        'flags' => $flags
                     );
                 } else {
                     $metadata->table['indexes'][] = array(
-                        'columns' => $columns
+                        'columns' => $columns,
+                        'flags' => $flags
                     );
                 }
             }

diff --git a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
@@ -213,8 +213,19 @@ public function loadMetadataForClass($className, ClassMetadata $metadata)
                     $columns = $index['columns'];
                 }
 
+                if(!isset($index['flags']))
+                {
+                    $flags = array();
+                } elseif (is_string($index['flags'])) {
+                    $flags = explode(',', $index['flags']);
+                    $flags = array_map('trim', $flags);
+                } else {
+                    $flags = $index['flags'];
+                }
+
                 $metadata->table['indexes'][$index['name']] = array(
-                    'columns' => $columns
+                    'columns' => $columns,
+                    'flags' => $flags
                 );
             }
         }

diff --git a/lib/Doctrine/ORM/Mapping/Index.php b/lib/Doctrine/ORM/Mapping/Index.php
@@ -34,4 +34,9 @@ final class Index implements Annotation
      * @var array<string>
      */
     public $columns;
+
+    /**
+     * @var array<string>
+     */
+    public $flags;
 }
diff --git a/lib/Doctrine/ORM/Tools/SchemaTool.php b/lib/Doctrine/ORM/Tools/SchemaTool.php
@@ -264,7 +264,12 @@ public function getSchemaFromMetadata(array $classes)
 
             if (isset($class->table['indexes'])) {
                 foreach ($class->table['indexes'] as $indexName => $indexData) {
-                    $table->addIndex($indexData['columns'], is_numeric($indexName) ? null : $indexName);
+                    if(!isset($indexData['flags']))
+                    {
+                        $indexData['flags'] = array();
+                    }
+
+                    $table->addIndex($indexData['columns'], is_numeric($indexName) ? null : $indexName, (array) $indexData['flags']);
                 }
             }