xuthus/pigallery2
1
0
Fork 0
mirror of https://github.com/xuthus83/pigallery2.git synced 2025-01-14 14:43:17 +08:00
Code Actions Projects Activity

Fixing persons metadata sql field charset

Browse Source
This commit is contained in:
Patrik J. Braun 2021-03-14 18:23:30 +01:00
parent a5954f1705
commit d02e3cbd33
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/model/database/sql/enitites/MediaEntity.ts
View File

@ -52,7 +52,9 @@ export class MediaMetadataEntity implements MediaMetadata {
@OneToMany(type => FaceRegionEntry, faceRegion => faceRegion.media) @OneToMany(type => FaceRegionEntry, faceRegion => faceRegion.media)
faces: FaceRegionEntry[]; faces: FaceRegionEntry[];
@Column('simple-array', {select: false, nullable: true}) @Column({type: 'simple-array', select: false, nullable: true,
charset: columnCharsetCS.charset,
collation: columnCharsetCS.collation})
persons: string[]; // Caches the list of persons. Only used for searching persons: string[]; // Caches the list of persons. Only used for searching
@Column('int', {unsigned: true}) @Column('int', {unsigned: true})

1
src/common/entities/SearchQueryDTO.ts
View File

@ -121,7 +121,6 @@ export namespace SearchQueryDTO {
}; };
export const parse = (str: string, implicitOR = true): SearchQueryDTO => { export const parse = (str: string, implicitOR = true): SearchQueryDTO => {
console.log('parsing: ' + str);
str = str.replace(/\s\s+/g, ' ') // remove double spaces str = str.replace(/\s\s+/g, ' ') // remove double spaces
.replace(/:\s+/g, ':').replace(/\)(?=\S)/g, ') ').trim(); .replace(/:\s+/g, ':').replace(/\)(?=\S)/g, ') ').trim();

3
test/backend/unit/model/sql/PersonManager.ts
View File

@ -15,6 +15,7 @@ import {MediaDTO} from '../../../../../src/common/entities/MediaDTO';
// to help WebStorm to handle the test cases // to help WebStorm to handle the test cases
declare let describe: any; declare let describe: any;
declare const after: any; declare const after: any;
declare const before: any;
declare const it: any; declare const it: any;
@ -54,7 +55,7 @@ describe('PersonManager', (sqlHelper: SQLTestHelper) => {
}; };
beforeEach(async () => { before(async () => {
await setUpSqlDB(); await setUpSqlDB();
}); });