diff --git a/src/Controller/Installer.php b/src/Controller/Installer.php index 5ac3ebc..72be02b 100644 --- a/src/Controller/Installer.php +++ b/src/Controller/Installer.php @@ -78,7 +78,7 @@ class Installer if (file_exists($setup) && ($this->isChanged($name) || $force)) { $registry = $this->_registry; - + $settings = new Settings($setup); $settings->read(); diff --git a/src/Database/JsonInstall.php b/src/Database/JsonInstall.php index 9fc0c2f..eef8f8b 100644 --- a/src/Database/JsonInstall.php +++ b/src/Database/JsonInstall.php @@ -63,8 +63,10 @@ class JsonInstall { $table_name = $action["table_name"]; if (isset($refs[$table_name])) { foreach ($refs[$table_name] as $value) { - $action['fields'][$value['column']]['references'] = - $value['refTable']."(".$value['refColumn'].")"; + $action['fields'][$value['column']]['references'] = [ + "refTable" => $value['refTable'], + 'refColumn' => $value['refColumn'] + ]; } } diff --git a/src/Database/Manager.php b/src/Database/Manager.php index 669b570..9e8c044 100644 --- a/src/Database/Manager.php +++ b/src/Database/Manager.php @@ -145,7 +145,7 @@ class Manager $constraint = isset($data['constraint']) ? " ".$data['constraint'] : ""; $references = ""; if (isset($data['references'])) { - $references = " REFERENCES ".$data['references']; + $references = " REFERENCES " . $data['references']['refTable'] . '(' .$data['references']['refColumn'] . ')'; } if (isset($data["not_null"]) && $data["not_null"]) { $constraint .=" NOT NULL";