Skip to content

Commit fe93105

Browse files
committed
merge main
2 parents 4493f30 + 75a7c9c commit fe93105

31 files changed

+307
-271
lines changed

.github/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"format:fix": "prettier --write ."
55
},
66
"devDependencies": {
7-
"prettier": "^3.5.3"
7+
"prettier": "^3.7.4"
88
}
99
}

cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"eslint-plugin-unicorn": "^62.0.0",
3232
"globals": "^16.0.0",
3333
"mock-fs": "^5.2.0",
34-
"prettier": "^3.2.5",
34+
"prettier": "^3.7.4",
3535
"prettier-plugin-organize-imports": "^4.0.0",
3636
"typescript": "^5.3.3",
3737
"typescript-eslint": "^8.28.0",

docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"@docusaurus/module-type-aliases": "~3.9.0",
3939
"@docusaurus/tsconfig": "^3.7.0",
4040
"@docusaurus/types": "^3.7.0",
41-
"prettier": "^3.2.4",
41+
"prettier": "^3.7.4",
4242
"typescript": "^5.1.6"
4343
},
4444
"browserslist": {

e2e/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"oidc-provider": "^9.0.0",
4444
"pg": "^8.11.3",
4545
"pngjs": "^7.0.0",
46-
"prettier": "^3.2.5",
46+
"prettier": "^3.7.4",
4747
"prettier-plugin-organize-imports": "^4.0.0",
4848
"sharp": "^0.34.5",
4949
"socket.io-client": "^4.7.4",

i18n/en.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@
8484
"exclusion_pattern_description": "Exclusion patterns lets you ignore files and folders when scanning your library. This is useful if you have folders that contain files you don't want to import, such as RAW files.",
8585
"export_config_as_json_description": "Download the current system config as a JSON file",
8686
"external_libraries_page_description": "Admin external library page",
87-
"external_library_management": "External Library Management",
8887
"face_detection": "Face detection",
8988
"face_detection_description": "Detect the faces in assets using machine learning. For videos, only the thumbnail is considered. \"Refresh\" (re-)processes all assets. \"Reset\" additionally clears all current face data. \"Missing\" queues assets that haven't been processed yet. Detected faces will be queued for Facial Recognition after Face Detection is complete, grouping them into existing or new people.",
9089
"facial_recognition_job_description": "Group detected faces into people. This step runs after Face Detection is complete. \"Reset\" (re-)clusters all faces. \"Missing\" queues faces that don't have a person assigned.",

pnpm-lock.yaml

Lines changed: 39 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
"mock-fs": "^5.2.0",
154154
"node-gyp": "^12.0.0",
155155
"pngjs": "^7.0.0",
156-
"prettier": "^3.0.2",
156+
"prettier": "^3.7.4",
157157
"prettier-plugin-organize-imports": "^4.0.0",
158158
"sql-formatter": "^15.0.0",
159159
"supertest": "^7.1.0",

server/src/sql-tools/decorators/column.decorator.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { asOptions } from 'src/sql-tools/helpers';
22
import { register } from 'src/sql-tools/register';
33
import { ColumnStorage, ColumnType, DatabaseEnum } from 'src/sql-tools/types';
44

5-
export type ColumnValue = null | boolean | string | number | object | Date | (() => string);
5+
export type ColumnValue = null | boolean | string | number | Array<unknown> | object | Date | (() => string);
66

77
export type ColumnBaseOptions = {
88
name?: string;

server/src/sql-tools/helpers.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ export const fromColumnValue = (columnValue?: ColumnValue) => {
3939
return `'${value.toISOString()}'`;
4040
}
4141

42+
if (Array.isArray(value)) {
43+
return "'{}'";
44+
}
45+
4246
return `'${String(value)}'`;
4347
};
4448

server/src/sql-tools/schema-diff.spec.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,20 @@ describe(schemaDiff.name, () => {
394394

395395
expect(diff.items).toEqual([]);
396396
});
397+
398+
it('should support arrays, ignoring types', () => {
399+
const diff = schemaDiff(
400+
fromColumn({ name: 'column1', type: 'character varying', isArray: true, default: "'{}'" }),
401+
fromColumn({
402+
name: 'column1',
403+
type: 'character varying',
404+
isArray: true,
405+
default: "'{}'::character varying[]",
406+
}),
407+
);
408+
409+
expect(diff.items).toEqual([]);
410+
});
397411
});
398412
});
399413

0 commit comments

Comments
 (0)