- Fixed the unmerged code from previous push
This commit is contained in:
parent
9c5cf3d1b1
commit
94b5aff9e9
|
@ -34,30 +34,28 @@ class Database implements FormInterface
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
#<<<<<<< HEAD
|
/* $tableEntity = $adapter->schemaTable($databaseName, $tableName);
|
||||||
$tableEntity = $adapter->schemaTable($databaseName, $tableName);
|
|
||||||
|
|
||||||
if ( $tableEntity ) {
|
if ( $tableEntity ) {
|
||||||
#$fields = $entiy::resolveEntity()->fieldList();
|
#$fields = $entiy::resolveEntity()->fieldList();
|
||||||
|
|
||||||
foreach($tableEntity->columns as $col) {
|
foreach($tableEntity->columns as $col) {
|
||||||
//dump( $entity::field($col->name) );
|
//dump( $entity::field($col->name) );*/
|
||||||
#=======
|
|
||||||
# $table = Table::repository()
|
|
||||||
# ->where(Table::field('name'), $table->tableName())
|
|
||||||
# ->where(Table::field('schema'), $table->databaseName())
|
|
||||||
# ->loadOne();
|
|
||||||
|
|
||||||
# if ( $table ) {
|
$table = Table::repository()
|
||||||
# $fields = $entity::resolveEntity()->fieldList(EntityResolver::KEY_COLUMN_NAME, true);
|
->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) {
|
$alter = [];
|
||||||
# if ( $table->columns->filtersCollection(fn($e) => $e->name === $field)->count() === 0 ) {
|
|
||||||
# $alter[$field] = $definition;
|
foreach($fields as $field => $definition) {
|
||||||
# }
|
if ( $table->columns->filtersCollection(fn($e) => $e->name === $field)->count() === 0 ) {
|
||||||
#>>>>>>> 7194a33bec884d745e838c8ac2693b353e95a3ce
|
$alter[$field] = $definition;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( $alter ) {
|
if ( $alter ) {
|
||||||
|
|
Loading…
Reference in New Issue