Skip to content

chore: do not re-declare the id column #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kyteinsky wants to merge 2 commits into
base: main
Choose a base branch
from
Open

chore: do not re-declare the id column #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03acf81
chore: do not re-declare the id column
kyteinsky Jan 9, 2026
b0d4861
fix: allow string IDs of oc_jobs from the snowflake change
kyteinsky Jan 9, 2026
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
1 change: 0 additions & 1 deletion lib/Db/FsEvent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
* @method setNodeId(int $nodeId)
*/
class FsEvent extends Entity {
public $id;
protected $type;
protected $userId;
protected $nodeId;
Expand Down
2 changes: 0 additions & 2 deletions lib/Db/QueueAction.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
* @method setPayload(string $payload)
*/
class QueueAction extends Entity {
public $id;
protected $type;
protected $payload;

Expand All @@ -32,7 +31,6 @@ class QueueAction extends Entity {

public function __construct() {
// add types in constructor
$this->addType('id', 'integer');
$this->addType('type', 'string');
$this->addType('payload', 'string');
}
Expand Down
2 changes: 0 additions & 2 deletions lib/Db/QueueContentItem.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
* @method string getUsers()
*/
class QueueContentItem extends Entity {
public $id;
protected $itemId;
protected $appId;
protected $providerId;
Expand Down Expand Up @@ -69,7 +68,6 @@ class QueueContentItem extends Entity {

public function __construct() {
// add types in constructor
$this->addType('id', Types::INTEGER);
$this->addType('itemId', Types::STRING);
$this->addType('appId', Types::STRING);
$this->addType('providerId', Types::STRING);
Expand Down
2 changes: 0 additions & 2 deletions lib/Db/QueueFile.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
* @method bool getUpdate()
*/
class QueueFile extends Entity {
public $id;
protected $fileId;
protected $storageId;
protected $rootId;
Expand All @@ -39,7 +38,6 @@ class QueueFile extends Entity {

public function __construct() {
// add types in constructor
$this->addType('id', 'integer');
$this->addType('fileId', 'integer');
$this->addType('storageId', 'integer');
$this->addType('rootId', 'integer');
Expand Down
16 changes: 8 additions & 8 deletions lib/Service/DiagnosticService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,37 +21,37 @@ public function __construct(

/**
* @param string $class
* @param int $id
* @param int|string $id
* @return void
*/
public function sendJobTrigger(string $class, int $id): void {
public function sendJobTrigger(string $class, int|string $id): void {
$this->logger->info('Background jobs: ' . $class . ' ' . $id . ' triggered');
}

/**
* @param string $class
* @param int $id
* @param int|string $id
* @return void
*/
public function sendJobStart(string $class, int $id): void {
public function sendJobStart(string $class, int|string $id): void {
$this->logger->info('Background jobs: ' . $class . ' ' . $id . ' started');
}

/**
* @param string $class
* @param int $id
* @param int|string $id
* @return void
*/
public function sendJobEnd(string $class, int $id): void {
public function sendJobEnd(string $class, int|string $id): void {
$this->logger->info('Background jobs: ' . $class . ' ' . $id . ' ended');
}

/**
* @param string $class
* @param int $id
* @param int|string $id
* @return void
*/
public function sendHeartbeat(string $class, int $id): void {
public function sendHeartbeat(string $class, int|string $id): void {
}

/**
Expand Down
Loading