From ad6efaf36d0db634af6d2555e0f0f5b339e25f2e Mon Sep 17 00:00:00 2001 From: "origami11@yandex.ru" Date: Thu, 16 Nov 2023 12:58:28 +0300 Subject: [PATCH] =?UTF-8?q?fix:=20=D0=A3=D1=81=D1=82=D0=B0=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=BA=D0=B0=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=20?= =?UTF-8?q?=D0=B8=D0=B7=20json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Controller/Installer.php | 2 +- src/Database/JsonInstall.php | 6 ++++-- src/Database/Manager.php | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) 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";