Fixes

WebFiori · Nov 14, 2023 · 26b63c1 · 26b63c1
1 parent 4bbafdd
commit 26b63c1
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 11 deletions.
diff --git a/webfiori/database/FK.php b/webfiori/database/FK.php
@@ -19,7 +19,7 @@
  * 
  * @author Ibrahim
  */
-class FK extends webfiori\database\ForeignKey {
+class FK extends ForeignKey {
     /**
      * An action that can be performed on update or delete.
      * 
@@ -50,6 +50,24 @@ class FK extends webfiori\database\ForeignKey {
      * @var string
      */
     const RESTRICT = 'restrict';
+    /**
+     * Creates new foreign key.
+     *
+     * @param string $name The name of the key. It must be a string, and it's not empty.
+     * Also, it must not contain any spaces or any characters other than A-Z, a-z and
+     * underscore. The default value is 'key_name'.
+     *
+     * @param Table $ownerTable The table that will contain the key.
+     *
+     * @param Table $sourceTable The name of the table that contains the
+     * original values.
+     *
+     * @param array $cols An associative array that contains the names of key
+     * columns. The indices must be columns in the owner table and the values are
+     * columns in the source table.
+     *
+     * @throws DatabaseException If one of the tables of the foreign key is not set.
+     */
     public function __construct(string $name = 'key_name', Table $ownerTable = null, Table $sourceTable = null, array $cols = []) {
         parent::__construct($name, $ownerTable, $sourceTable, $cols);
     }

diff --git a/webfiori/database/Table.php b/webfiori/database/Table.php
@@ -172,10 +172,10 @@ public function addReferenceFromArray(string $colName, array $keyProps) : Table
             return $this;
         }
         $table = $this->getRefTable($keyProps['table']);
-        $keyName = isset($keyProps['name']) ?? '';
-        $col = isset($keyProps['col']);
-        $onUpdate = isset($keyProps['on-update']) ?? FK::SET_NULL;
-        $onDelete = isset($keyProps['on-delete']) ?? FK::SET_NULL;
+        $keyName = $keyProps['name'] ?? '';
+        $col = $keyProps['col'] ?? '';
+        $onUpdate = $keyProps['on-update'] ?? FK::SET_NULL;
+        $onDelete = $keyProps['on-delete'] ?? FK::SET_NULL;
 
         return $this->addReference($table, [$colName => $col], $keyName, $onUpdate, $onDelete);
     }
@@ -249,6 +249,7 @@ private function getRefTable($refTable) {
                 }
             }
         }
+        return $refTable;
     }
     /**
      * Returns a column given its index.

diff --git a/webfiori/database/mssql/MSSQLTable.php b/webfiori/database/mssql/MSSQLTable.php
@@ -96,7 +96,8 @@ public function addColumn(string $key, Column $colObj) : bool {
      */
     public function addColumns(array $colsArr) : Table {
         $arrToAdd = [];
-
+        $fksArr = [];
+
         foreach ($colsArr as $key => $arrOrObj) {
             if ($arrOrObj instanceof MSSQLColumn) {
                 $arrToAdd[$key] = $arrOrObj;
@@ -111,14 +112,21 @@ public function addColumns(array $colsArr) : Table {
                         $arrToAdd[$key] = $colObj;
 
                         if (isset($arrOrObj['fk'])) {
-                            $this->addReferenceFromArray($key, $arrOrObj['fk']);
+                            $fksArr[$key] = $arrOrObj['fk'];
+
                         }
                     }
                 }
             }
         }
 
-        return parent::addColumns($arrToAdd);
+        parent::addColumns($arrToAdd);
+
+        foreach ($fksArr as $col => $fkArr) {
+            $this->addReferenceFromArray($col, $fkArr);
+        }
+
+        return $this;
     }
     /**
      * Returns a string which can be used to add table comment as extended 

diff --git a/webfiori/database/mysql/MySQLTable.php b/webfiori/database/mysql/MySQLTable.php
@@ -108,7 +108,8 @@ public function addColumn(string $key, Column $colObj) : bool {
      */
     public function addColumns(array $colsArr) : Table {
         $arrToAdd = [];
-
+        $fksArr = [];
+
         foreach ($colsArr as $key => $arrOrObj) {
             if ($arrOrObj instanceof MySQLColumn) {
                 $arrToAdd[$key] = $arrOrObj;
@@ -122,14 +123,20 @@ public function addColumns(array $colsArr) : Table {
                     if ($colObj instanceof MySQLColumn) {
                         $arrToAdd[$key] = $colObj;
                         if (isset($colsArr['fk'])) {
-                            $this->addReferenceFromArray($key, $arrOrObj['fk']);
+                            $fksArr[$key] =  $arrOrObj['fk'];
                         }
                     }
                 }
             }
         }
 
-        return parent::addColumns($arrToAdd);
+        parent::addColumns($arrToAdd);
+
+        foreach ($fksArr as $col => $fkArr) {
+            $this->addReferenceFromArray($col, $fkArr);
+        }
+
+        return $this;
     }
     /**
      * Returns the character set that is used by the table.