jfmcarreira/immich-power-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: DB schema update to support latest immich release

Browse Source
This commit is contained in:
sai80082
2026-02-05 15:49:02 +05:30
parent 1145b2c995
commit df452d849d
19 changed files with 33 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/api/albums/[id]/assets.ts
+2 -3
View File
@@ -36,7 +36,6 @@ export default async function handler(
duration: assets.duration,
encodedVideoPath: assets.encodedVideoPath,
originalFileName: assets.originalFileName,
sidecarPath: assets.sidecarPath,
deletedAt: assets.deletedAt,
localDateTime: assets.localDateTime,
exifImageWidth: exif.exifImageWidth,
@@ -46,12 +45,12 @@ export default async function handler(
orientation: exif.orientation,
})
.from(albumsAssetsAssets)
.leftJoin(assets, eq(albumsAssetsAssets.assetsId, assets.id))
.leftJoin(assets, eq(albumsAssetsAssets.assetId, assets.id))
.leftJoin(exif, eq(assets.id, exif.assetId))
.leftJoin(assetFaces, eq(assets.id, assetFaces.assetId))
.leftJoin(person, eq(assetFaces.personId, person.id))
.where(and(
eq(albumsAssetsAssets.albumsId, id),
eq(albumsAssetsAssets.albumId, id),
eq(assets.visibility, "timeline"),
eq(assets.status, "active"),
faceId ? eq(assetFaces.personId, faceId) : undefined,
src/pages/api/albums/[id]/info.ts
+2 -2
View File
@@ -31,8 +31,8 @@ export default async function handler(
faceCount: count(sql<string>`DISTINCT ${person.id}`), // Ensure unique personId
})
.from(albums)
.leftJoin(albumsAssetsAssets, eq(albums.id, albumsAssetsAssets.albumsId))
.leftJoin(assets, eq(albumsAssetsAssets.assetsId, assets.id))
.leftJoin(albumsAssetsAssets, eq(albums.id, albumsAssetsAssets.albumId))
.leftJoin(assets, eq(albumsAssetsAssets.assetId, assets.id))
.leftJoin(exif, and(eq(assets.id, exif.assetId), eq(assets.visibility, "timeline")))
.leftJoin(assetFaces, eq(assets.id, assetFaces.assetId))
.leftJoin(person, and(eq(assetFaces.personId, person.id), eq(person.isHidden, false)))
src/pages/api/albums/[id]/people.ts
+2 -2
View File
@@ -26,8 +26,8 @@ export default async function handler(
numberOfPhotos: count(assets.id),
})
.from(albums)
.leftJoin(albumsAssetsAssets, eq(albums.id, albumsAssetsAssets.albumsId))
.leftJoin(assets, eq(albumsAssetsAssets.assetsId, assets.id))
.leftJoin(albumsAssetsAssets, eq(albums.id, albumsAssetsAssets.albumId))
.leftJoin(assets, eq(albumsAssetsAssets.assetId, assets.id))
.leftJoin(assetFaces, eq(assets.id, assetFaces.assetId))
.leftJoin(person, and(eq(assetFaces.personId, person.id), eq(person.isHidden, false)))
.where(and(eq(albums.ownerId, currentUser.id), eq(albums.id, id), isNotNull(person.id)))
src/pages/api/albums/[id]/public-info.ts
+2 -2
View File
@@ -27,8 +27,8 @@ export default async function handler(
faceCount: count(sql<string>`DISTINCT ${person.id}`), // Ensure unique personId
})
.from(albums)
.leftJoin(albumsAssetsAssets, eq(albums.id, albumsAssetsAssets.albumsId))
.leftJoin(assets, eq(albumsAssetsAssets.assetsId, assets.id))
.leftJoin(albumsAssetsAssets, eq(albums.id, albumsAssetsAssets.albumId))
.leftJoin(assets, eq(albumsAssetsAssets.assetId, assets.id))
.leftJoin(exif, and(eq(assets.id, exif.assetId), eq(assets.visibility, "timeline")))
.leftJoin(assetFaces, eq(assets.id, assetFaces.assetId))
.leftJoin(person, and(eq(assetFaces.personId, person.id), eq(person.isHidden, false)))
src/pages/api/albums/list.ts
+2 -2
View File
@@ -69,9 +69,9 @@ export default async function handler(
faceCount: count(sql<string>`DISTINCT ${assetFaces.personId}`), // Ensure unique personId
})
.from(albums)
.leftJoin(albumsAssetsAssets, eq(albums.id, albumsAssetsAssets.albumsId))
.leftJoin(albumsAssetsAssets, eq(albums.id, albumsAssetsAssets.albumId))
.leftJoin(assets, and(
eq(albumsAssetsAssets.assetsId, assets.id),
eq(albumsAssetsAssets.assetId, assets.id),
eq(assets.visibility, "timeline"),
eq(assets.status, "active"),
))
src/pages/api/albums/merge.ts
+2 -2
View File
@@ -61,13 +61,13 @@ export default async function handler(
const secondaryAlbumAssets = await db
.select()
.from(albumsAssetsAssets)
.where(inArray(albumsAssetsAssets.albumsId, secondaryAlbumIds));
.where(inArray(albumsAssetsAssets.albumId, secondaryAlbumIds));
if (secondaryAlbumAssets.length === 0) {
return res.status(404).json({ error: "Secondary album assets not found" });
}
const secondaryAlbumAssetsIds = secondaryAlbumAssets.map((albumAsset) => albumAsset.assetsId);
const secondaryAlbumAssetsIds = secondaryAlbumAssets.map((albumAsset) => albumAsset.assetId);
const addAssetsToPrimaryAlbumURL = `${ENV.IMMICH_URL}/api/albums/${primaryAlbumId}/assets`;
const addAssetsToPrimaryAlbum = await fetch(addAssetsToPrimaryAlbumURL, {
src/pages/api/albums/potential-albums-assets.ts
-1
View File
@@ -16,7 +16,6 @@ const SELECT_ORPHAN_PHOTOS = (date: string, ownerId: string) =>
a."duration",
a."encodedVideoPath",
a."originalFileName",
a."sidecarPath",
a."thumbhash",
a."deletedAt",
e."exifImageWidth",
src/pages/api/albums/potential-albums-dates.ts
+2 -2
View File
@@ -21,12 +21,12 @@ export default async function handler(
date: sql`DATE(${exif.dateTimeOriginal})`,
asset_count: desc(count(assets.id)),
}).from(assets)
.leftJoin(albumsAssetsAssets, eq(assets.id, albumsAssetsAssets.assetsId))
.leftJoin(albumsAssetsAssets, eq(assets.id, albumsAssetsAssets.assetId))
.leftJoin(exif, eq(assets.id, exif.assetId))
.where(and (
eq(assets.ownerId, currentUser.id),
eq(assets.visibility, "timeline"),
isNull(albumsAssetsAssets.albumsId),
isNull(albumsAssetsAssets.albumId),
isNotNull(exif.dateTimeOriginal),
))
src/pages/api/assets/empty-videos.ts
-1
View File
@@ -58,7 +58,6 @@ const dbAssets = await db
duration: assets.duration,
encodedVideoPath: assets.encodedVideoPath,
originalFileName: assets.originalFileName,
sidecarPath: assets.sidecarPath,
deletedAt: assets.deletedAt,
localDateTime: assets.localDateTime,
exifImageWidth: exif.exifImageWidth,
src/pages/api/assets/geo-heatmap.ts
+3 -3
View File
@@ -21,15 +21,15 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
longitude: exif.longitude,
}).from(assets)
.innerJoin(exif, eq(assets.id, exif.assetId))
.innerJoin(albumsAssetsAssets, eq(assets.id, albumsAssetsAssets.assetsId))
.innerJoin(assetFaces, eq(albumsAssetsAssets.assetsId, assetFaces.assetId))
.innerJoin(albumsAssetsAssets, eq(assets.id, albumsAssetsAssets.assetId))
.innerJoin(assetFaces, eq(albumsAssetsAssets.assetId, assetFaces.assetId))
.innerJoin(person, eq(assetFaces.personId, person.id))
.where(
and(
eq(assets.ownerId, currentUser.id),
isNotNull(exif.latitude),
isNotNull(exif.longitude),
albumIds?.length > 0 ? inArray(albumsAssetsAssets.albumsId, [albumIds]) : undefined,
albumIds?.length > 0 ? inArray(albumsAssetsAssets.albumId, [albumIds]) : undefined,
peopleIds?.length > 0 ? inArray(person.id, [peopleIds]) : undefined
)
);
src/pages/api/assets/missing-location-albums.ts
+2 -2
View File
@@ -27,8 +27,8 @@ export default async function handler(
})
.from(assets)
.leftJoin(exif, eq(exif.assetId, assets.id))
.leftJoin(albumsAssetsAssets, eq(albumsAssetsAssets.assetsId, assets.id))
.leftJoin(albums, eq(albums.id, albumsAssetsAssets.albumsId))
.leftJoin(albumsAssetsAssets, eq(albumsAssetsAssets.assetId, assets.id))
.leftJoin(albums, eq(albums.id, albumsAssetsAssets.albumId))
.where(
and(
isNull(exif.latitude),
src/pages/api/assets/missing-location-assets.ts
+2 -4
View File
@@ -22,7 +22,6 @@ const getRowsByDates = async (startDateDate: Date, endDateDate: Date, currentUse
duration: assets.duration,
encodedVideoPath: assets.encodedVideoPath,
originalFileName: assets.originalFileName,
sidecarPath: assets.sidecarPath,
deletedAt: assets.deletedAt,
localDateTime: assets.localDateTime,
exifImageWidth: exif.exifImageWidth,
@@ -55,7 +54,6 @@ const getRowsByAlbums = async (currentUser: IUser, albumId: string) => {
duration: assets.duration,
encodedVideoPath: assets.encodedVideoPath,
originalFileName: assets.originalFileName,
sidecarPath: assets.sidecarPath,
deletedAt: assets.deletedAt,
localDateTime: assets.localDateTime,
exifImageWidth: exif.exifImageWidth,
@@ -66,8 +64,8 @@ const getRowsByAlbums = async (currentUser: IUser, albumId: string) => {
})
.from(assets)
.leftJoin(exif, eq(exif.assetId, assets.id))
.leftJoin(albumsAssetsAssets, eq(albumsAssetsAssets.assetsId, assets.id))
.leftJoin(albums, eq(albums.id, albumsAssetsAssets.albumsId))
.leftJoin(albumsAssetsAssets, eq(albumsAssetsAssets.assetId, assets.id))
.leftJoin(albums, eq(albums.id, albumsAssetsAssets.albumId))
.where(and(
isNull(exif.latitude),
isNotNull(assets.createdAt),
src/pages/api/people/[id]/info.ts
+2 -2
View File
@@ -36,8 +36,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
.leftJoin(assetFaces, eq(assetFaces.personId, personRecord.id))
.leftJoin(assets, eq(assets.id, assetFaces.assetId))
.leftJoin(exif, eq(exif.assetId, assets.id))
.leftJoin(albumsAssetsAssets, eq(albumsAssetsAssets.assetsId, assets.id))
.where(eq(albumsAssetsAssets.albumsId, albums.id))
.leftJoin(albumsAssetsAssets, eq(albumsAssetsAssets.assetId, assets.id))
.where(eq(albumsAssetsAssets.albumId, albums.id))
.groupBy(albums.id);
src/pages/api/rewind/stats.ts
+2 -2
View File
@@ -66,8 +66,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
cover: albums.albumThumbnailAssetId
})
.from(albumsAssetsAssets)
.leftJoin(albums, eq(albums.id, albumsAssetsAssets.albumsId))
.leftJoin(assets, eq(assets.id, albumsAssetsAssets.assetsId))
.leftJoin(albums, eq(albums.id, albumsAssetsAssets.albumId))
.leftJoin(assets, eq(assets.id, albumsAssetsAssets.assetId))
.leftJoin(exif, eq(exif.assetId, assets.id))
.where(and(
eq(sql`EXTRACT(YEAR FROM ${exif.dateTimeOriginal})`, year),
src/pages/api/share-link/[token]/assets.ts
+2 -3
View File
@@ -63,7 +63,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
duration: assets.duration,
encodedVideoPath: assets.encodedVideoPath,
originalFileName: assets.originalFileName,
sidecarPath: assets.sidecarPath,
deletedAt: assets.deletedAt,
localDateTime: assets.localDateTime,
exifImageWidth: exif.exifImageWidth,
@@ -76,8 +75,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
orientation: exif.orientation,
}).from(assets)
.innerJoin(assetFaces, eq(assets.id, assetFaces.assetId))
.leftJoin(albumsAssetsAssets, eq(assets.id, albumsAssetsAssets.assetsId))
.leftJoin(albums, eq(albumsAssetsAssets.albumsId, albums.id))
.leftJoin(albumsAssetsAssets, eq(assets.id, albumsAssetsAssets.assetId))
.leftJoin(albums, eq(albumsAssetsAssets.albumId, albums.id))
.innerJoin(exif, eq(exif.assetId, assets.id))
.where(and(
filteredPersonIds?.length > 0 ? inArray(assetFaces.personId, filteredPersonIds) : undefined,
src/pages/api/share-link/[token]/people.ts
+2 -2
View File
@@ -44,9 +44,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
assetCount: count(assets.id),
}).from(assets)
.innerJoin(assetFaces, eq(assets.id, assetFaces.assetId))
.innerJoin(albumsAssetsAssets, eq(assets.id, albumsAssetsAssets.assetsId))
.innerJoin(albumsAssetsAssets, eq(assets.id, albumsAssetsAssets.assetId))
.innerJoin(person, eq(assetFaces.personId, person.id))
.innerJoin(albums, eq(albumsAssetsAssets.albumsId, albums.id))
.innerJoin(albums, eq(albumsAssetsAssets.albumId, albums.id))
.innerJoin(exif, eq(exif.assetId, assets.id))
.where(and(
personIds?.length > 0 ? inArray(assetFaces.personId, personIds) : undefined,
src/schema/albumAssetsAssets.schema.ts
+2 -2
View File
@@ -1,7 +1,7 @@
import { pgTable, uuid, timestamp } from 'drizzle-orm/pg-core';
export const albumsAssetsAssets = pgTable('album_asset', {
albumsId: uuid('albumId').notNull(),
assetsId: uuid('assetId').notNull(),
albumId: uuid('albumId').notNull(),
assetId: uuid('assetId').notNull(),
createdAt: timestamp('createdAt', { withTimezone: true }).defaultNow().notNull(),
});
src/schema/assets.schema.ts
-1
View File
@@ -19,7 +19,6 @@ export const assets = pgTable('asset', {
createdAt: timestamp('createdAt', { withTimezone: true }).defaultNow().notNull(),
status: varchar('status').default('active').notNull(),
originalFileName: varchar('originalFileName').notNull(),
sidecarPath: varchar('sidecarPath'),
// thumbhash: bytea('thumbhash'),
isOffline: boolean('isOffline').default(false).notNull(),
// libraryId: uuid('libraryId').references(() => libraries.id, { onDelete: 'cascade', onUpdate: 'cascade' }),
src/schema/relationships.ts
+2 -2
View File
@@ -44,11 +44,11 @@ export const faceSearchRelations = relations(faceSearch, ({ one }) => ({
// Assuming there are relations to be defined with `albums` and `assets`
export const albumsAssetsAssetsRelations = relations(albumsAssetsAssets, ({ one }) => ({
album: one(albums, {
fields: [albumsAssetsAssets.albumsId],
fields: [albumsAssetsAssets.albumId],
references: [albums.id],
}),
asset: one(assets, {
fields: [albumsAssetsAssets.assetsId],
fields: [albumsAssetsAssets.assetId],
references: [assets.id],
}),
}));