GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[ENTITY] Change foreign key definition to new format for cover and profile_color tables

Browse Source
This commit is contained in:
Hugo Sales 2021-05-01 12:48:08 +00:00
parent cfe842b487
commit 38cf8f8efe
Signed by: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
2 changed files with 33 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/Entity/Cover.php
View File

@ -40,7 +40,7 @@ class Cover extends Entity
{ {
// {{{ Autocode // {{{ Autocode
private int $gsactor_id; private int $gsactor_id;
private int $file_id; private int $attachment_id;
private \DateTimeInterface $created; private \DateTimeInterface $created;
private \DateTimeInterface $modified; private \DateTimeInterface $modified;
@ -55,15 +55,15 @@ class Cover extends Entity
return $this->gsactor_id; return $this->gsactor_id;
} }
public function setFileId(int $file_id): self public function setAttachmentId(int $attachment_id): self
{ {
$this->file_id = $file_id; $this->attachment_id = $attachment_id;
return $this; return $this;
} }
public function getFileId(): int public function getAttachmentId(): int
{ {
return $this->file_id; return $this->attachment_id;
} }
public function setCreated(DateTimeInterface $created): self public function setCreated(DateTimeInterface $created): self
@ -90,51 +90,51 @@ class Cover extends Entity
// }}} Autocode // }}} Autocode
private ?File $file = null; private ?Attachment $attachment = null;
/** /**
* get cover file * get cover attachment
* *
* @return File * @return Attachment
*/ */
public function getFile(): File public function getAttachment(): Attachment
{ {
$this->file = $this->file ?: DB::find('file', ['id' => $this->file_id]); $this->attachment = $this->attachment ?: DB::find('attachment', ['id' => $this->attachment_id]);
return $this->file; return $this->attachment;
} }
/** /**
* get cover file path * get cover attachment path
* *
* @return string * @return string
*/ */
public function getFilePath(): string public function getAttachmentPath(): string
{ {
return Common::config('cover', 'dir') . $this->getFile()->getFileName(); return Common::config('cover', 'dir') . $this->getAttachment()->getAttachmentName();
} }
/** /**
* Delete this cover and the corresponding file and thumbnails, which this owns * Delete this cover and the corresponding attachment and thumbnails, which this owns
* *
* @param bool $flush * @param bool $flush
* @param bool $delete_files_now * @param bool $delete_attachments_now
* @param bool $cascading * @param bool $cascading
* *
* @return array files deleted (if delete_files_now is true) * @return array attachments deleted (if delete_attachments_now is true)
*/ */
public function delete(bool $flush = false, bool $delete_files_now = false, bool $cascading = false): array public function delete(bool $flush = false, bool $delete_attachments_now = false, bool $cascading = false): array
{ {
// Don't go into a loop if we're deleting from File // Don't go into a loop if we're deleting from Attachment
if (!$cascading) { if (!$cascading) {
$files = $this->getFile()->delete($cascade = true, $file_flush = false, $delete_files_now); $attachments = $this->getAttachment()->delete($cascade = true, $attachment_flush = false, $delete_attachments_now);
} else { } else {
DB::remove(DB::getReference('cover', ['gsactor_id' => $this->gsactor_id])); DB::remove(DB::getReference('cover', ['gsactor_id' => $this->gsactor_id]));
$file_path = $this->getFilePath(); $attachment_path = $this->getAttachmentPath();
$files[] = $file_path; $attachments[] = $attachment_path;
if ($flush) { if ($flush) {
DB::flush(); DB::flush();
} }
return $delete_files_now ? [] : $files; return $delete_attachments_now ? [] : $attachments;
} }
return []; return [];
} }
@ -144,18 +144,14 @@ class Cover extends Entity
return [ return [
'name' => 'cover', 'name' => 'cover',
'fields' => [ 'fields' => [
'gsactor_id' => ['type' => 'int', 'not null' => true, 'description' => 'foreign key to gsactor table'], 'gsactor_id' => ['type' => 'int', 'foreign key' => true, 'target' => 'GSActor.id', 'multiplicity' => 'onne to one', 'not null' => true, 'description' => 'foreign key to gsactor table'],
'file_id' => ['type' => 'int', 'not null' => true, 'description' => 'foreign key to file table'], 'attachment_id' => ['type' => 'int', 'foreign key' => true, 'target' => 'Attachment.id', 'multiplicity' => 'one to one', 'not null' => true, 'description' => 'foreign key to attachment table'],
'created' => ['type' => 'datetime', 'not null' => true, 'description' => 'date this record was created', 'default' => 'CURRENT_TIMESTAMP'], 'created' => ['type' => 'datetime', 'not null' => true, 'description' => 'date this record was created', 'default' => 'CURRENT_TIMESTAMP'],
'modified' => ['type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified', 'default' => 'CURRENT_TIMESTAMP'], 'modified' => ['type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified', 'default' => 'CURRENT_TIMESTAMP'],
], ],
'primary key' => ['gsactor_id'], 'primary key' => ['gsactor_id'],
'foreign keys' => [ 'indexes' => [
'cover_gsactor_id_fkey' => ['gsactor', ['gsactor_id' => 'id']], 'cover_attachment_id_idx' => ['attachment_id'],
'cover_file_id_fkey' => ['file', ['file_id' => 'id']],
],
'indexes' => [
'cover_file_id_idx' => ['file_id'],
], ],
]; ];
} }

9
src/Entity/ProfileColor.php
View File

@ -92,15 +92,12 @@ class ProfileColor extends Entity
return [ return [
'name' => 'profile_color', 'name' => 'profile_color',
'fields' => [ 'fields' => [
'gsactor_id' => ['type' => 'int', 'not null' => true, 'description' => 'foreign key to gsactor table'], 'gsactor_id' => ['type' => 'int', 'foreign key' => true, 'target' => 'GSActor.id', 'multiplicity' => 'one to one', 'not null' => true, 'description' => 'foreign key to gsactor table'],
'color' => ['type' => 'text', 'not null' => true, 'description' => 'color hex code'], 'color' => ['type' => 'text', 'not null' => true, 'description' => 'color hex code'],
'created' => ['type' => 'datetime', 'not null' => true, 'description' => 'date this record was created', 'default' => 'CURRENT_TIMESTAMP'], 'created' => ['type' => 'datetime', 'not null' => true, 'description' => 'date this record was created', 'default' => 'CURRENT_TIMESTAMP'],
'modified' => ['type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified', 'default' => 'CURRENT_TIMESTAMP'], 'modified' => ['type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified', 'default' => 'CURRENT_TIMESTAMP'],
], ],
'primary key' => ['gsactor_id'], 'primary key' => ['gsactor_id'],
'foreign keys' => [
'cover_gsactor_id_fkey' => ['gsactor', ['gsactor_id' => 'id']],
],
]; ];
} }
} }