standardebooks/web
1
0
Fork 0
mirror of https://github.com/standardebooks/web.git synced 2025-07-07 23:30:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove primary key EbookLocSubjectId

Browse source 
Add a SortOrder column to keep the LocSubjects in the same order as given in content.opf.
This commit is contained in:
Mike Colagrosso 2024-10-13 20:42:51 -06:00 • committed by Alex Cabal
parent cada95383f
commit b4b6fde778
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
config/sql/se/EbookLocSubjects.sql
View file

@ -1,7 +1,6 @@
CREATE TABLE `EbookLocSubjects` ( CREATE TABLE `EbookLocSubjects` (
`EbookLocSubjectId` int(10) unsigned NOT NULL AUTO_INCREMENT,
`EbookId` int(10) unsigned NOT NULL, `EbookId` int(10) unsigned NOT NULL,
`LocSubjectId` int(10) unsigned NOT NULL, `LocSubjectId` int(10) unsigned NOT NULL,
PRIMARY KEY (`EbookLocSubjectId`), `SortOrder` tinyint(3) unsigned NOT NULL,
UNIQUE KEY `idxUnique` (`EbookId`,`LocSubjectId`) UNIQUE KEY `idxUnique` (`EbookId`,`LocSubjectId`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

9
lib/Ebook.php
View file

@ -161,7 +161,7 @@ class Ebook{
from LocSubjects l from LocSubjects l
inner join EbookLocSubjects el using (LocSubjectId) inner join EbookLocSubjects el using (LocSubjectId)
where EbookId = ? where EbookId = ?
order by el.EbookLocSubjectId order by SortOrder asc
', [$this->EbookId], LocSubject::class); ', [$this->EbookId], LocSubject::class);
} }
@ -1714,13 +1714,14 @@ class Ebook{
} }
private function AddLocSubjects(): void{ private function AddLocSubjects(): void{
foreach($this->LocSubjects as $locSubject){ foreach($this->LocSubjects as $sortOrder => $locSubject){
try{ try{
Db::Query(' Db::Query('
INSERT into EbookLocSubjects (EbookId, LocSubjectId) INSERT into EbookLocSubjects (EbookId, LocSubjectId, SortOrder)
values (?, values (?,
?,
?) ?)
', [$this->EbookId, $locSubject->LocSubjectId]); ', [$this->EbookId, $locSubject->LocSubjectId, $sortOrder]);
} }
catch(Exceptions\DuplicateDatabaseKeyException){ catch(Exceptions\DuplicateDatabaseKeyException){
// The Ebook already has the LocSubject, which is fine. // The Ebook already has the LocSubject, which is fine.