reverted public api changes and removed not necessary public methods

doctrine · May 21, 2017 · 7b53b5e · 7b53b5e
1 parent e5c2695
commit 7b53b5e
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 39 deletions.
diff --git a/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php b/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php
@@ -742,7 +742,7 @@ private function getPreAlterTableAlterIndexForeignKeySQL(TableDiff $diff)
         foreach ($diff->changedIndexes as $changedIndex) {
             // Changed primary key
             if ($changedIndex->isPrimary() && $diff->fromTable instanceof Table) {
-                foreach ($diff->fromTable->getPrimaryKeyColumnNames() as $columnName) {
+                foreach ($diff->fromTable->getPrimaryKeyColumns() as $columnName) {
                     $column = $diff->fromTable->getColumn($columnName);
 
                     // Check if an autoincrement column was dropped from the primary key.

diff --git a/lib/Doctrine/DBAL/Schema/Table.php b/lib/Doctrine/DBAL/Schema/Table.php
@@ -621,58 +621,38 @@ public function removeForeignKey($constraintName)
      */
     public function getColumns()
     {
-        return array_merge($this->getPrimaryKeyColumns(), $this->getForeignKeyColumns(), $this->_columns);
-    }
+        $primaryKeyColumns = [];
+        if ($this->hasPrimaryKey()) {
+            $primaryKeyColumns = $this->filterColumns($this->getPrimaryKey()->getColumns());
+        }
 
-    /**
-     * Returns primary key columns
-     * @return Column[]
-     */
-    public function getPrimaryKeyColumns()
-    {
-        $primaryKeyColumnNames = $this->getPrimaryKeyColumnNames();
-        return array_filter($this->_columns, function ($key) use ($primaryKeyColumnNames) {
-            return in_array($key, $primaryKeyColumnNames);
-        }, ARRAY_FILTER_USE_KEY);
+        return array_merge($primaryKeyColumns, $this->getForeignKeyColumns(), $this->_columns);
     }
 
     /**
      * Returns foreign key columns
      * @return Column[]
      */
-    public function getForeignKeyColumns()
+    private function getForeignKeyColumns()
     {
-        $foreignKeyColumnNames = $this->getForeignKeyColumnNames();
-        return array_filter($this->_columns, function ($key) use ($foreignKeyColumnNames) {
-            return in_array($key, $foreignKeyColumnNames);
-        }, ARRAY_FILTER_USE_KEY);
-    }
-
-    /**
-     * Returns primary key column names
-     * @return array
-     */
-    public function getPrimaryKeyColumnNames()
-    {
-        $primaryKeyColumnNames = [];
-        if ($this->hasPrimaryKey()) {
-            $primaryKeyColumnNames = $this->getPrimaryKey()->getColumns();
+        $foreignKeyColumns = [];
+        foreach ($this->getForeignKeys() as $foreignKey) {
+            /* @var $foreignKey ForeignKeyConstraint */
+            $foreignKeyColumns = array_merge($foreignKeyColumns, $foreignKey->getColumns());
         }
-        return $primaryKeyColumnNames;
+        return $this->filterColumns($foreignKeyColumns);
     }
 
     /**
-     * Returns foreign key column names
-     * @return array
+     * Returns only columns that have specified names
+     * @param array $columnNames
+     * @return Column[]
      */
-    public function getForeignKeyColumnNames()
+    private function filterColumns(array $columnNames)
     {
-        $foreignKeyColumnNames = [];
-        foreach ($this->getForeignKeys() as $foreignKey) {
-            /* @var $foreignKey ForeignKeyConstraint */
-            $foreignKeyColumnNames = array_merge($foreignKeyColumnNames, $foreignKey->getColumns());
-        }
-        return $foreignKeyColumnNames;
+        return array_filter($this->_columns, function ($columnName) use ($columnNames) {
+            return in_array($columnName, $columnNames, true);
+        }, ARRAY_FILTER_USE_KEY);
     }
 
     /**
@@ -722,6 +702,21 @@ public function getPrimaryKey()
         return $this->getIndex($this->_primaryKeyName);
     }
 
+    /**
+     * Returns the primary key columns.
+     *
+     * @return array
+     *
+     * @throws DBALException
+     */
+    public function getPrimaryKeyColumns()
+    {
+        if ( ! $this->hasPrimaryKey()) {
+            throw new DBALException("Table " . $this->getName() . " has no primary key.");
+        }
+        return $this->getPrimaryKey()->getColumns();
+    }
+
     /**
      * Returns whether this table has a primary key.
      *