mcndave/ulmus
1
0 Fork 0
Code Issues 15 Pull Requests Projects 1 Releases Wiki Activity

- Fixed conflicts

Browse Source
This commit is contained in:
Dave Mc Nicoll committed 2022-04-13 03:38:57 +00:00
2 parents 16d76470da c14644cdda
commit 325704260b
31 files changed
+632 -127
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Repository.php
+3 -12
View File
@@ -28,7 +28,7 @@ class Repository
$this->alias = $alias;
$this->entityResolver = Ulmus::resolveEntity($entity);
$this->adapter = $adapter ?? $this->entityResolver->databaseAdapter();
$this->queryBuilder = new QueryBuilder();
$this->queryBuilder = Ulmus::queryBuilder($entity);
}
public function __clone()
@@ -248,8 +248,6 @@ class Repository
return $update ? (bool) $update->rowCount() : false;
}
}
}
public function replace(/*object|array*/ $entity, ? array $fieldsAndValue = null) : bool
@@ -882,13 +880,7 @@ class Repository
public function createSqlQuery() : self
{
if ( null === $this->queryBuilder->getFragment(Query\Create::class) ) {
$this->queryBuilder->create($this->escapeFieldList($this->entityResolver->fieldList(EntityResolver::KEY_ENTITY_NAME, true)), $this->escapeTable($this->entityResolver->tableName()), $this->entityResolver->schemaName());
}
if ( null === $this->queryBuilder->getFragment(Query\Engine::class) ) {
if ( $engine = $this->entityResolver->tableAnnotation()->engine ?? $this->entityResolver->databaseAdapter()->adapter()->defaultEngine() ) {
$this->queryBuilder->engine($engine);
}
$this->queryBuilder->create($this->adapter->adapter(), $this->escapeFieldList($this->entityResolver->fieldList(EntityResolver::KEY_ENTITY_NAME, true)), $this->escapeTable($this->entityResolver->tableName()), $this->entityResolver->schemaName());
}
return $this;
@@ -897,7 +889,7 @@ class Repository
public function alterSqlQuery(array $fields) : self
{
if ( null === $this->queryBuilder->getFragment(Query\Alter::class) ) {
$this->queryBuilder->create($this->escapeFieldList($this->entityResolver->fieldList(EntityResolver::KEY_ENTITY_NAME, true)), $this->escapeTable($this->entityResolver->tableName()), $this->entityResolver->schemaName());
$this->queryBuilder->create($this->adapter->adapter(), $this->escapeFieldList($this->entityResolver->fieldList(EntityResolver::KEY_ENTITY_NAME, true)), $this->escapeTable($this->entityResolver->tableName()), $this->entityResolver->schemaName());
}
@@ -933,7 +925,6 @@ class Repository
return new $this->entityClass();
}
public function hasFilters() : bool
{
return isset($this->queryBuilder->where);