mcndave
/
lean-console
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Fixed the unmerged code from previous push

This commit is contained in:
Dave Mc Nicoll 2022-11-11 13:58:50 +00:00
parent 9c5cf3d1b1
commit 94b5aff9e9
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Form/Database.php
View File

@ -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 ) {