src/Form/Database.php

@@ -25,8 +25,6 @@ class Database implements FormInterface
         $context->tableExist = [];
 
         foreach($this->migration->entities as $entity => $table) {
-            $adapter = $entity::resolveEntity()->sqlAdapter()->adapter();
-
             $tableName = $table->tableName();
             $databaseName = $table->databaseName();
 
@@ -34,30 +32,20 @@ class Database implements FormInterface
                 continue;
             }
 
-#<<<<<<< HEAD
-            $tableEntity = $adapter->schemaTable($databaseName, $tableName);
+            $table = Table::repository()
+                ->where(Table::field('name'), $table->tableName())
+                ->where(Table::field('schema'), $table->databaseName())
+                ->loadOne();
 
-            if ( $tableEntity ) {
-                #$fields = $entiy::resolveEntity()->fieldList();
+            if ( $table ) {
+                $fields = $entity::resolveEntity()->fieldList(EntityResolver::KEY_COLUMN_NAME, true);
 
-                foreach($tableEntity->columns as $col) {
-                   //dump( $entity::field($col->name) );
-#=======
-#            $table = Table::repository()
-#                ->where(Table::field('name'), $table->tableName())
-#                ->where(Table::field('schema'), $table->databaseName())
-#                ->loadOne();
+                $alter = [];
 
-#            if ( $table ) {
-#                $fields = $entity::resolveEntity()->fieldList(EntityResolver::KEY_COLUMN_NAME, true);
-
-#                $alter = [];
-
-#                foreach($fields as $field => $definition) {
-#                    if ( $table->columns->filtersCollection(fn($e) => $e->name === $field)->count() === 0 ) {
-#                        $alter[$field] = $definition;
-#                    }
-#>>>>>>> 7194a33bec884d745e838c8ac2693b353e95a3ce
+                foreach($fields as $field => $definition) {
+                    if ( $table->columns->filtersCollection(fn($e) => $e->name === $field)->count() === 0 ) {
+                        $alter[$field] = $definition;
+                    }
                 }
 
                 if ( $alter ) {
@@ -79,7 +67,6 @@ class Database implements FormInterface
                     'msg' => "unexisting",
                     'query' => $entity::repository()->createSqlQuery()->getSqlQuery(true),
                 ];
-
             }
         }
 
@@ -119,4 +106,4 @@ class Database implements FormInterface
             public array $actions = [];
         };
     }
-}
+}