From 94b5aff9e937f532dd41b35e7458b48fe4fcd50a Mon Sep 17 00:00:00 2001
From: Dave Mc Nicoll <dave.mcnicoll@cslsj.qc.ca>
Date: Fri, 11 Nov 2022 13:58:50 +0000
Subject: [PATCH] - Fixed the unmerged code from previous push

---
 src/Form/Database.php | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/Form/Database.php b/src/Form/Database.php
index ff1ef14..62f6ff1 100644
--- a/src/Form/Database.php
+++ b/src/Form/Database.php
@@ -34,30 +34,28 @@ class Database implements FormInterface
                 continue;
             }
 
-#<<<<<<< HEAD
-            $tableEntity = $adapter->schemaTable($databaseName, $tableName);
+           /* $tableEntity = $adapter->schemaTable($databaseName, $tableName);
 
             if ( $tableEntity ) {
                 #$fields = $entiy::resolveEntity()->fieldList();
 
                 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();
+                   //dump( $entity::field($col->name) );*/
 
-#            if ( $table ) {
-#                $fields = $entity::resolveEntity()->fieldList(EntityResolver::KEY_COLUMN_NAME, true);
+            $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);
 
-#                foreach($fields as $field => $definition) {
-#                    if ( $table->columns->filtersCollection(fn($e) => $e->name === $field)->count() === 0 ) {
-#                        $alter[$field] = $definition;
-#                    }
-#>>>>>>> 7194a33bec884d745e838c8ac2693b353e95a3ce
+                $alter = [];
+
+                foreach($fields as $field => $definition) {
+                    if ( $table->columns->filtersCollection(fn($e) => $e->name === $field)->count() === 0 ) {
+                        $alter[$field] = $definition;
+                    }
                 }
 
                 if ( $alter ) {