0.71.x

src/Database/Adapter/MySQL.php

@@ -81,10 +81,9 @@ public function getSizeOfCollectionOnDisk(string $collection): int
  public function getSupportForIndexArray(): bool
  {
  /**
- * Disabling index creation due to Mysql bug
  * @link https://bugs.mysql.com/bug.php?id=111037
  */
- return false;
+ return true;
  }
 
  public function getSupportForCastIndexArray(): bool

src/Database/Database.php

@@ -344,6 +344,11 @@ class Database
 
  protected bool $filter = true;
 
+ /**
+ * @var array<string, bool>|null
+ */
+ protected ?array $disabledFilters = [];
+
  protected bool $validate = true;
 
  protected bool $preserveDates = false;
@@ -809,17 +814,35 @@ public function disableFilters(): static
  *
  * @template T
  * @param callable(): T $callback
+ * @param array<string>|null $filters
  * @return T
  */
- public function skipFilters(callable $callback): mixed
+ public function skipFilters(callable $callback, ?array $filters = null): mixed
  {
- $initial = $this->filter;
- $this->disableFilters();
+ if (empty($filters)) {
+ $initial = $this->filter;
+ $this->disableFilters();
+
+ try {
+ return $callback();
+ } finally {
+ $this->filter = $initial;
+ }
+ }
+
+ $previous = $this->filter;
+ $previousDisabled = $this->disabledFilters;
+ $disabled = [];
+ foreach ($filters as $name) {
+ $disabled[$name] = true;
+ }
+ $this->disabledFilters = $disabled;
 
  try {
  return $callback();
  } finally {
- $this->filter = $initial;
+ $this->filter = $previous;
+ $this->disabledFilters = $previousDisabled;
  }
  }
 
@@ -5134,7 +5157,7 @@ public function increaseDocumentAttribute(
  int|float|null $max = null
  ): Document {
  if ($value <= 0) { // Can be a float
- throw new DatabaseException('Value must be numeric and greater than 0');
+ throw new \InvalidArgumentException('Value must be numeric and greater than 0');
  }
 
  $collection = $this->silent(fn () => $this->getCollection($collection));
@@ -5178,7 +5201,7 @@ public function increaseDocumentAttribute(
  }
  }
 
- if ($max && ($document->getAttribute($attribute) + $value > $max)) {
+ if (!\is_null($max) && ($document->getAttribute($attribute) + $value > $max)) {
  throw new LimitException('Attribute value exceeds maximum limit: ' . $max);
  }
 
@@ -5231,7 +5254,7 @@ public function decreaseDocumentAttribute(
  int|float|null $min = null
  ): Document {
  if ($value <= 0) { // Can be a float
- throw new DatabaseException('Value must be numeric and greater than 0');
+ throw new \InvalidArgumentException('Value must be numeric and greater than 0');
  }
 
  $collection = $this->silent(fn () => $this->getCollection($collection));
@@ -5277,7 +5300,7 @@ public function decreaseDocumentAttribute(
  }
  }
 
- if ($min && ($document->getAttribute($attribute) - $value < $min)) {
+ if (!\is_null($min) && ($document->getAttribute($attribute) - $value < $min)) {
  throw new LimitException('Attribute value exceeds minimum limit: ' . $min);
  }
 
@@ -6568,6 +6591,10 @@ protected function decodeAttribute(string $filter, mixed $value, Document $docum
  return $value;
  }
 
+ if (!\is_null($this->disabledFilters) && isset($this->disabledFilters[$filter])) {
+ return $value;
+ }
+
  if (!array_key_exists($filter, self::$filters) && !array_key_exists($filter, $this->instanceFilters)) {
  throw new NotFoundException("Filter \"{$filter}\" not found for attribute \"{$attribute}\"");
  }

tests/e2e/Adapter/Scopes/DocumentTests.php

@@ -11,6 +11,7 @@
 use Utopia\Database\Exception\Authorization as AuthorizationException;
 use Utopia\Database\Exception\Conflict as ConflictException;
 use Utopia\Database\Exception\Duplicate as DuplicateException;
+use Utopia\Database\Exception\Limit as LimitException;
 use Utopia\Database\Exception\Structure as StructureException;
 use Utopia\Database\Exception\Type as TypeException;
 use Utopia\Database\Helpers\ID;
@@ -1041,8 +1042,31 @@ public function testDecreaseLimitMin(Document $document): void
  /** @var Database $database */
  $database = static::getDatabase();
 
- $this->expectException(Exception::class);
- $this->assertEquals(false, $database->decreaseDocumentAttribute('increase_decrease', $document->getId(), 'decrease', 10, 99));
+ try {
+ $database->decreaseDocumentAttribute(
+ 'increase_decrease',
+ $document->getId(),
+ 'decrease',
+ 10,
+ 99
+ );
+ $this->fail('Failed to throw exception');
+ } catch (Exception $e) {
+ $this->assertInstanceOf(LimitException::class, $e);
+ }
+
+ try {
+ $database->decreaseDocumentAttribute(
+ 'increase_decrease',
+ $document->getId(),
+ 'decrease',
+ 1000,
+ 0
+ );
+ $this->fail('Failed to throw exception');
+ } catch (Exception $e) {
+ $this->assertInstanceOf(LimitException::class, $e);
+ }
  }
 
  /**