Simplfy code

doctrine · Dec 11, 2011 · 7131f84 · 7131f84
1 parent b80a56d
commit 7131f84
Showing 1 changed file with 9 additions and 13 deletions.
diff --git a/lib/Doctrine/DBAL/Platforms/AbstractPlatform.php b/lib/Doctrine/DBAL/Platforms/AbstractPlatform.php
@@ -1046,29 +1046,25 @@ public function getCreateTableSQL(Table $table, $createFlags=self::CREATE_INDEXE
             }
         }
 
-        $tableSql = array();
-        $defaultPrevented = false;
-
         if (null !== $this->_eventManager && $this->_eventManager->hasListeners(Events::onSchemaCreateTable)) {
             $eventArgs = new SchemaCreateTableEventArgs($table, $columns, $options, $this);
             $this->_eventManager->dispatchEvent(Events::onSchemaCreateTable, $eventArgs);
 
-            $defaultPrevented = $eventArgs->isDefaultPrevented();
-            $tableSql = $eventArgs->getSql();
+            if ($eventArgs->isDefaultPrevented()) {
+                return array_merge($eventArgs->getSql(), $columnSql);
+            }
         }
 
-        if (!$defaultPrevented) {
-            $tableSql = $this->_getCreateTableSQL($tableName, $columns, $options);
-            if ($this->supportsCommentOnStatement()) {
-                foreach ($table->getColumns() AS $column) {
-                    if ($column->getComment()) {
-                        $tableSql[] = $this->getCommentOnColumnSQL($tableName, $column->getName(), $this->getColumnComment($column));
-                    }
+        $sql = $this->_getCreateTableSQL($tableName, $columns, $options);
+        if ($this->supportsCommentOnStatement()) {
+            foreach ($table->getColumns() AS $column) {
+                if ($column->getComment()) {
+                    $sql[] = $this->getCommentOnColumnSQL($tableName, $column->getName(), $this->getColumnComment($column));
                 }
             }
         }
 
-        return array_merge($tableSql, $columnSql);
+        return array_merge($sql, $columnSql);
     }
 
     public function getCommentOnColumnSQL($tableName, $columnName, $comment)