- Multiple bug fixes related to notes 2.x
This commit is contained in:
1 parent
f3be11a590
commit
bd9078230d
9 files changed
+69
-73
No files matched your search
@@ -2,12 +2,10 @@
|
||||
|
||||
namespace Ulmus\Common;
|
||||
|
||||
use Ulmus\Annotation\Annotation;
|
||||
use Ulmus\Attribute;
|
||||
use Ulmus\Attribute\Property\{ Field };
|
||||
use Ulmus\Migration\FieldDefinition;
|
||||
use Ulmus\Ulmus,
|
||||
Ulmus\Adapter\AdapterInterface,
|
||||
Ulmus\Annotation\Property\Field,
|
||||
Ulmus\Query\WhereRawParameter;
|
||||
|
||||
class EntityField implements WhereRawParameter
|
||||
@@ -30,7 +28,7 @@ class EntityField implements WhereRawParameter
|
||||
|
||||
public function name($useAlias = true) : string
|
||||
{
|
||||
$name = $this->entityResolver->searchFieldAnnotation($this->name, [ Attribute\Property\Field::class, Field::class ] )->name ?? $this->name;
|
||||
$name = $this->entityResolver->searchFieldAnnotation($this->name, [ Field::class ] )->name ?? $this->name;
|
||||
|
||||
$name = $this->entityResolver->databaseAdapter()->adapter()->escapeIdentifier($name, AdapterInterface::IDENTIFIER_FIELD);
|
||||
|
||||
|
||||
Reference in new issue
Block a user