Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Database/Adapter.php
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,7 @@ abstract public function deleteDocument(string $collection, string $id): bool;
* Delete Documents
*
* @param string $collection
* @param array<string> $sequences
* @param array<int> $sequences
* @param array<string> $permissionIds
*
* @return int
Expand Down
4 changes: 2 additions & 2 deletions src/Database/Adapter/MariaDB.php
Original file line number Diff line number Diff line change
Expand Up @@ -905,7 +905,7 @@ public function createDocument(string $collection, Document $document): Document

$stmt->execute();

$document['$sequence'] = $this->pdo->lastInsertId();
$document['$sequence'] = (int) $this->pdo->lastInsertId();

if (empty($document['$sequence'])) {
throw new DatabaseException('Error creating document empty "$sequence"');
Expand Down Expand Up @@ -1656,7 +1656,7 @@ public function find(string $collection, array $queries = [], ?int $limit = 25,
unset($results[$index]['_uid']);
}
if (\array_key_exists('_id', $document)) {
$results[$index]['$sequence'] = $document['_id'];
$results[$index]['$sequence'] = (int) $document['_id'];
unset($results[$index]['_id']);
}
if (\array_key_exists('_tenant', $document)) {
Expand Down
4 changes: 2 additions & 2 deletions src/Database/Adapter/Postgres.php
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,7 @@ public function createDocument(string $collection, Document $document): Document

try {
$this->execute($stmt);
$lastInsertedId = $this->getPDO()->lastInsertId();
$lastInsertedId = (int) $this->getPDO()->lastInsertId();
// Sequence can be manually set as well
$document['$sequence'] ??= $lastInsertedId;

Expand Down Expand Up @@ -1541,7 +1541,7 @@ public function find(string $collection, array $queries = [], ?int $limit = 25,
unset($results[$index]['_uid']);
}
if (\array_key_exists('_id', $document)) {
$results[$index]['$sequence'] = $document['_id'];
$results[$index]['$sequence'] = (int) $document['_id'];
unset($results[$index]['_id']);
}
if (\array_key_exists('_tenant', $document)) {
Expand Down
8 changes: 4 additions & 4 deletions src/Database/Adapter/SQL.php
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ public function getDocument(string $collection, string $id, array $queries = [],
$document = $document[0];

if (\array_key_exists('_id', $document)) {
$document['$sequence'] = $document['_id'];
$document['$sequence'] = (int) $document['_id'];
unset($document['_id']);
}
if (\array_key_exists('_uid', $document)) {
Expand Down Expand Up @@ -460,7 +460,7 @@ public function updateDocuments(string $collection, Document $updates, array $do
}

foreach ($sequences as $id => $value) {
$stmt->bindValue(":_id_{$id}", $value);
$stmt->bindValue(":_id_{$id}", $value, \PDO::PARAM_INT);
}

$attributeIndex = 0;
Expand Down Expand Up @@ -642,7 +642,7 @@ public function updateDocuments(string $collection, Document $updates, array $do
* Delete Documents
*
* @param string $collection
* @param array<string> $sequences
* @param array<int> $sequences
* @param array<string> $permissionIds
*
* @return int
Expand Down Expand Up @@ -1892,7 +1892,7 @@ public function createDocuments(string $collection, array $documents): array

foreach ($documents as $document) {
if (isset($sequences[$document->getId()])) {
$document['$sequence'] = $sequences[$document->getId()];
$document['$sequence'] = (int) $sequences[$document->getId()];
}
}
} catch (PDOException $e) {
Expand Down
2 changes: 1 addition & 1 deletion src/Database/Adapter/SQLite.php
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ public function createDocument(string $collection, Document $document): Document
$statment->execute();
$last = $statment->fetch();

$document['$sequence'] = $last['id'];
$document['$sequence'] = (int) $last['id'];

if (isset($stmtPermissions)) {
$stmtPermissions->execute();
Expand Down
4 changes: 2 additions & 2 deletions src/Database/Database.php
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ class Database
],
[
'$id' => '$sequence',
'type' => self::VAR_STRING,
'size' => Database::LENGTH_KEY,
'type' => self::VAR_INTEGER,
'size' => 8,
'required' => true,
'signed' => true,
'array' => false,
Expand Down
6 changes: 3 additions & 3 deletions src/Database/Document.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ public function getId(): string
}

/**
* @return string
* @return int
*/
public function getSequence(): string
public function getSequence(): int
{
return $this->getAttribute('$sequence', '');
return $this->getAttribute('$sequence', 0);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/Database/Validator/Queries/Documents.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function __construct(
$attributes[] = new Document([
'$id' => '$sequence',
'key' => '$sequence',
'type' => Database::VAR_STRING,
'type' => Database::VAR_INTEGER,
'array' => false,
]);
$attributes[] = new Document([
Expand Down
4 changes: 2 additions & 2 deletions src/Database/Validator/Structure.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ class Structure extends Validator
],
[
'$id' => '$sequence',
'type' => Database::VAR_STRING,
'size' => 255,
'type' => Database::VAR_INTEGER,
'size' => 8,
'required' => false,
'signed' => true,
'array' => false,
Expand Down
12 changes: 6 additions & 6 deletions tests/e2e/Adapter/Scopes/DocumentTests.php
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public function testCreateDocument(): Document
// Test create document with manual internal id
$manualIdDocument = $database->createDocument('documents', new Document([
'$id' => '56000',
'$sequence' => '56000',
'$sequence' => 56000,
'$permissions' => [
Permission::read(Role::any()),
Permission::read(Role::user(ID::custom('1'))),
Expand Down Expand Up @@ -292,7 +292,7 @@ public function testCreateDocumentsWithAutoIncrement(): void

for ($i = $sequence; $i <= ($sequence + $count); $i++) {
$documents[] = new Document([
'$sequence' => (string)$i,
'$sequence' => $i,
'$permissions' => [
Permission::read(Role::any()),
Permission::create(Role::any()),
Expand Down Expand Up @@ -363,7 +363,7 @@ public function testCreateDocumentsWithDifferentAttributes(): void
$documents = [
new Document([
'$id' => 'third',
'$sequence' => 'third',
'$sequence' => 3,
'string' => 'text📝',
]),
new Document([
Expand Down Expand Up @@ -1765,9 +1765,9 @@ public function testFindByID(): void
* @depends testFind
* @param array<string, mixed> $data
* @return void
* @throws \Utopia\Database\Exception
* @throws DatabaseException
*/
public function testFindByInternalID(array $data): void
public function testFindBySequence(array $data): void
{
/** @var Database $database */
$database = static::getDatabase();
Expand Down Expand Up @@ -4228,7 +4228,7 @@ public function testExceptionCaseInsensitiveDuplicate(Document $document): Docum
$database = static::getDatabase();

$document->setAttribute('$id', 'caseSensitive');
$document->setAttribute('$sequence', '200');
$document->setAttribute('$sequence', 200);
$database->createDocument($document->getCollection(), $document);

$document->setAttribute('$id', 'CaseSensitive');
Expand Down