Joins3

phpunit.xml

@@ -1,4 +1,4 @@
-<phpunit
+<phpunit
  backupGlobals="false"
  backupStaticAttributes="false"
  bootstrap="vendor/autoload.php"
@@ -7,7 +7,7 @@
  convertNoticesToExceptions="true"
  convertWarningsToExceptions="true"
  processIsolation="false"
- stopOnFailure="false"
+ stopOnFailure="true"
 >
  <testsuites>
  <testsuite name="unit">

src/Database/Adapter.php

@@ -788,18 +788,33 @@ abstract public function deleteDocuments(string $collection, array $sequences, a
  *
  * Find data sets using chosen queries
  *
- * @param Document $collection
+ * @param QueryContext $context
  * @param array<Query> $queries
  * @param int|null $limit
  * @param int|null $offset
- * @param array<string> $orderAttributes
- * @param array<string> $orderTypes
  * @param array<string, mixed> $cursor
  * @param string $cursorDirection
  * @param string $forPermission
+ * @param array<Query> $selects
+ * @param array<Query> $filters
+ * @param array<Query> $joins
+ * @param array<Query> $orderQueries
+ *
  * @return array<Document>
  */
- abstract public function find(Document $collection, array $queries = [], ?int $limit = 25, ?int $offset = null, array $orderAttributes = [], array $orderTypes = [], array $cursor = [], string $cursorDirection = Database::CURSOR_AFTER, string $forPermission = Database::PERMISSION_READ): array;
+ abstract public function find(
+ QueryContext $context,
+ array $queries = [],
+ ?int $limit = 25,
+ ?int $offset = null,
+ array $cursor = [],
+ string $cursorDirection = Database::CURSOR_AFTER,
+ string $forPermission = Database::PERMISSION_READ,
+ array $selects = [],
+ array $filters = [],
+ array $joins = [],
+ array $orderQueries = []
+ ): array;
 
  /**
  * Sum an attribute
@@ -1134,36 +1149,10 @@ abstract public function getAttributeWidth(Document $collection): int;
  abstract public function getKeywords(): array;
 
  /**
- * Get an attribute projection given a list of selected attributes
- *
- * @param array<string> $selections
- * @param string $prefix
- * @return mixed
- */
- abstract protected function getAttributeProjection(array $selections, string $prefix): mixed;
-
- /**
- * Get all selected attributes from queries
- *
- * @param Query[] $queries
- * @return string[]
+ * @param array<Query> $selects
+ * @return string
  */
- protected function getAttributeSelections(array $queries): array
- {
- $selections = [];
-
- foreach ($queries as $query) {
- switch ($query->getMethod()) {
- case Query::TYPE_SELECT:
- foreach ($query->getValues() as $value) {
- $selections[] = $value;
- }
- break;
- }
- }
-
- return $selections;
- }
+ abstract protected function getAttributeProjection(array $selects): string;
 
  /**
  * Filter Keys

src/Database/Adapter/MariaDB.php

@@ -13,6 +13,8 @@
 use Utopia\Database\Exception\Truncate as TruncateException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Query;
+use Utopia\Database\QueryContext;
+use Utopia\Database\Validator\Authorization;
 
 class MariaDB extends SQL
 {
@@ -56,7 +58,7 @@ public function delete(string $name): bool
  $sql = "DROP DATABASE `{$name}`;";
 
  $sql = $this->trigger(Database::EVENT_DATABASE_DELETE, $sql);
-
+ var_dump($sql);
  return $this->getPDO()
  ->prepare($sql)
  ->execute();
@@ -1454,11 +1456,14 @@ protected function handleSpatialQueries(Query $query, array &$binds, string $att
  protected function getSQLCondition(Query $query, array &$binds, array $attributes = []): string
  {
  $query->setAttribute($this->getInternalKeyForAttribute($query->getAttribute()));
+ $query->setAttributeRight($this->getInternalKeyForAttribute($query->getAttributeRight()));
 
  $attribute = $query->getAttribute();
  $attribute = $this->filter($attribute);
  $attribute = $this->quote($attribute);
- $alias = $this->quote(Query::DEFAULT_ALIAS);
+ $alias = $query->getAlias();
+ $alias = $this->filter($alias);
+ $alias = $this->quote($alias);
  $placeholder = ID::unique();
 
  $attributeType = $this->getAttributeType($query->getAttribute(), $attributes);
@@ -1502,6 +1507,12 @@ protected function getSQLCondition(Query $query, array &$binds, array $attribute
 
  return "{$alias}.{$attribute} NOT BETWEEN :{$placeholder}_0 AND :{$placeholder}_1";
 
+ case Query::TYPE_RELATION_EQUAL:
+ $attributeRight = $this->quote($this->filter($query->getAttributeRight()));
+ $aliasRight = $this->quote($query->getRightAlias());
+
+ return "{$alias}.{$attribute}={$aliasRight}.{$attributeRight}";
+
  case Query::TYPE_IS_NULL:
  case Query::TYPE_IS_NOT_NULL:
 

src/Database/Adapter/Pool.php

@@ -6,6 +6,7 @@
 use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Exception as DatabaseException;
+use Utopia\Database\QueryContext;
 use Utopia\Pools\Pool as UtopiaPool;
 
 class Pool extends Adapter
@@ -260,7 +261,19 @@ public function deleteDocuments(string $collection, array $sequences, array $per
  return $this->delegate(__FUNCTION__, \func_get_args());
  }
 
- public function find(Document $collection, array $queries = [], ?int $limit = 25, ?int $offset = null, array $orderAttributes = [], array $orderTypes = [], array $cursor = [], string $cursorDirection = Database::CURSOR_AFTER, string $forPermission = Database::PERMISSION_READ): array
+ public function find(
+ QueryContext $context,
+ array $queries = [],
+ ?int $limit = 25,
+ ?int $offset = null,
+ array $cursor = [],
+ string $cursorDirection = Database::CURSOR_AFTER,
+ string $forPermission = Database::PERMISSION_READ,
+ array $selects = [],
+ array $filters = [],
+ array $joins = [],
+ array $orderQueries = []
+ ): array
  {
  return $this->delegate(__FUNCTION__, \func_get_args());
  }
@@ -470,13 +483,7 @@ public function getKeywords(): array
  return $this->delegate(__FUNCTION__, \func_get_args());
  }
 
- /**
- * @param array<string,mixed> $selections
- * @param string $prefix
- * @param array<string,mixed> $spatialAttributes
- * @return mixed
- */
- protected function getAttributeProjection(array $selections, string $prefix, array $spatialAttributes = []): mixed
+ protected function getAttributeProjection(array $selects): string
  {
  return $this->delegate(__FUNCTION__, \func_get_args());
  }

src/Database/Adapter/Postgres.php

@@ -15,6 +15,8 @@
 use Utopia\Database\Exception\Truncate as TruncateException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Query;
+use Utopia\Database\QueryContext;
+use Utopia\Database\Validator\Authorization;
 
 class Postgres extends SQL
 {
@@ -1556,10 +1558,13 @@ protected function handleSpatialQueries(Query $query, array &$binds, string $att
  protected function getSQLCondition(Query $query, array &$binds, array $attributes = []): string
  {
  $query->setAttribute($this->getInternalKeyForAttribute($query->getAttribute()));
+ $query->setAttributeRight($this->getInternalKeyForAttribute($query->getAttributeRight()));
 
  $attribute = $this->filter($query->getAttribute());
  $attribute = $this->quote($attribute);
- $alias = $this->quote(Query::DEFAULT_ALIAS);
+ $alias = $query->getAlias();
+ $alias = $this->filter($alias);
+ $alias = $this->quote($alias);
  $placeholder = ID::unique();
 
  $attributeType = $this->getAttributeType($query->getAttribute(), $attributes);
@@ -1599,6 +1604,12 @@ protected function getSQLCondition(Query $query, array &$binds, array $attribute
  $binds[":{$placeholder}_1"] = $query->getValues()[1];
  return "{$alias}.{$attribute} NOT BETWEEN :{$placeholder}_0 AND :{$placeholder}_1";
 
+ case Query::TYPE_RELATION_EQUAL:
+ $attributeRight = $this->quote($this->filter($query->getAttributeRight()));
+ $aliasRight = $this->quote($query->getRightAlias());
+
+ return "{$alias}.{$attribute}={$aliasRight}.{$attributeRight}";
+
  case Query::TYPE_IS_NULL:
  case Query::TYPE_IS_NOT_NULL:
  return "{$alias}.{$attribute} {$this->getSQLOperator($query->getMethod())}";
@@ -1629,6 +1640,7 @@ protected function getSQLCondition(Query $query, array &$binds, array $attribute
  Query::TYPE_NOT_ENDS_WITH => '%' . $this->escapeWildcards($value),
  Query::TYPE_CONTAINS => ($query->onArray()) ? \json_encode($value) : '%' . $this->escapeWildcards($value) . '%',
  Query::TYPE_NOT_CONTAINS => ($query->onArray()) ? \json_encode($value) : '%' . $this->escapeWildcards($value) . '%',
+ //Query::TYPE_SEARCH => $this->getFulltextValue($value),
  default => $value
  };