From 616d46cdde3276bc91b837c83863c001874e0c4f Mon Sep 17 00:00:00 2001 From: Dave M Date: Sun, 15 May 2022 02:41:49 +0000 Subject: [PATCH] - Fixed the database interface --- src/Form/Database.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Form/Database.php b/src/Form/Database.php index 0156d5f..36ae4be 100644 --- a/src/Form/Database.php +++ b/src/Form/Database.php @@ -24,6 +24,8 @@ class Database implements FormInterface $context->tableExist = []; foreach($this->migration->entities as $entity => $table) { + $adapter = $entity::resolveEntity()->sqlAdapter()->adapter(); + $tableName = $table->tableName(); $databaseName = $table->databaseName(); @@ -31,14 +33,12 @@ class Database implements FormInterface continue; } - $table = Table::repository()->where(Table::field('name'), $table->tableName()) - ->where(Table::field('schema'), $table->databaseName()) - ->loadOne(); + $tableEntity = $adapter->schemaTable($databaseName, $tableName); - if ( $table ) { + if ( $tableEntity ) { #$fields = $entiy::resolveEntity()->fieldList(); - foreach($table->columns as $col) { + foreach($tableEntity->columns as $col) { //dump( $entity::field($col->name) ); } @@ -53,6 +53,7 @@ class Database implements FormInterface 'msg' => "unexisting", 'query' => $entity::repository()->createSqlQuery()->getSqlQuery(true), ]; + } }