From a34813b3ab81fc96ccea0152a7ec400c4e31e70d Mon Sep 17 00:00:00 2001 From: advplyr Date: Wed, 12 Feb 2025 08:52:20 -0600 Subject: [PATCH 1/2] Fix server crash remove column name ambiguity #3966 --- server/utils/queries/libraryItemsBookFilters.js | 8 ++++---- server/utils/queries/libraryItemsPodcastFilters.js | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/server/utils/queries/libraryItemsBookFilters.js b/server/utils/queries/libraryItemsBookFilters.js index 3adb929e0..65ab1fef0 100644 --- a/server/utils/queries/libraryItemsBookFilters.js +++ b/server/utils/queries/libraryItemsBookFilters.js @@ -580,9 +580,9 @@ module.exports = { // When collapsing series and sorting by title then use the series name instead of the book title // for this set an attribute "display_title" to use in sorting if (global.ServerSettings.sortingIgnorePrefix) { - bookAttributes.include.push([Sequelize.literal(`IFNULL((SELECT s.nameIgnorePrefix FROM bookSeries AS bs, series AS s WHERE bs.seriesId = s.id AND bs.bookId = book.id AND bs.id IN (${bookSeriesToInclude.map((v) => `"${v.id}"`).join(', ')})), titleIgnorePrefix)`), 'display_title']) + bookAttributes.include.push([Sequelize.literal(`IFNULL((SELECT s.nameIgnorePrefix FROM bookSeries AS bs, series AS s WHERE bs.seriesId = s.id AND bs.bookId = book.id AND bs.id IN (${bookSeriesToInclude.map((v) => `"${v.id}"`).join(', ')})), \`libraryItem\`.\`titleIgnorePrefix\`)`), 'display_title']) } else { - bookAttributes.include.push([Sequelize.literal(`IFNULL((SELECT s.name FROM bookSeries AS bs, series AS s WHERE bs.seriesId = s.id AND bs.bookId = book.id AND bs.id IN (${bookSeriesToInclude.map((v) => `"${v.id}"`).join(', ')})), \`book\`.\`title\`)`), 'display_title']) + bookAttributes.include.push([Sequelize.literal(`IFNULL((SELECT s.name FROM bookSeries AS bs, series AS s WHERE bs.seriesId = s.id AND bs.bookId = book.id AND bs.id IN (${bookSeriesToInclude.map((v) => `"${v.id}"`).join(', ')})), \`libraryItem\`.\`title\`)`), 'display_title']) } } @@ -1035,8 +1035,8 @@ module.exports = { const textSearchQuery = await Database.createTextSearchQuery(query) - const matchTitle = textSearchQuery.matchExpression('title') - const matchSubtitle = textSearchQuery.matchExpression('subtitle') + const matchTitle = textSearchQuery.matchExpression('book.title') + const matchSubtitle = textSearchQuery.matchExpression('book.subtitle') // Search title, subtitle, asin, isbn const books = await Database.bookModel.findAll({ diff --git a/server/utils/queries/libraryItemsPodcastFilters.js b/server/utils/queries/libraryItemsPodcastFilters.js index 36241f33f..0cd159bac 100644 --- a/server/utils/queries/libraryItemsPodcastFilters.js +++ b/server/utils/queries/libraryItemsPodcastFilters.js @@ -84,7 +84,7 @@ module.exports = { return [[Sequelize.literal(`\`podcast\`.\`author\` COLLATE NOCASE ${nullDir}`)]] } else if (sortBy === 'media.metadata.title') { if (global.ServerSettings.sortingIgnorePrefix) { - return [[Sequelize.literal('titleIgnorePrefix COLLATE NOCASE'), dir]] + return [[Sequelize.literal('`podcast`.`titleIgnorePrefix` COLLATE NOCASE'), dir]] } else { return [[Sequelize.literal('`podcast`.`title` COLLATE NOCASE'), dir]] } @@ -321,8 +321,8 @@ module.exports = { const textSearchQuery = await Database.createTextSearchQuery(query) - const matchTitle = textSearchQuery.matchExpression('title') - const matchAuthor = textSearchQuery.matchExpression('author') + const matchTitle = textSearchQuery.matchExpression('podcast.title') + const matchAuthor = textSearchQuery.matchExpression('podcast.author') // Search title, author, itunesId, itunesArtistId const podcasts = await Database.podcastModel.findAll({ From ebdf377fc186ee34c1700b8943cfc088b549369e Mon Sep 17 00:00:00 2001 From: advplyr Date: Wed, 12 Feb 2025 10:01:05 -0600 Subject: [PATCH 2/2] Version bump v2.19.2 --- client/package-lock.json | 4 ++-- client/package.json | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 4d45011a9..7189685ca 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1,12 +1,12 @@ { "name": "audiobookshelf-client", - "version": "2.19.1", + "version": "2.19.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "audiobookshelf-client", - "version": "2.19.1", + "version": "2.19.2", "license": "ISC", "dependencies": { "@nuxtjs/axios": "^5.13.6", diff --git a/client/package.json b/client/package.json index 43d0457f7..7b0530a26 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "audiobookshelf-client", - "version": "2.19.1", + "version": "2.19.2", "buildNumber": 1, "description": "Self-hosted audiobook and podcast client", "main": "index.js", diff --git a/package-lock.json b/package-lock.json index 615c8d0ff..637789aa3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "audiobookshelf", - "version": "2.19.1", + "version": "2.19.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "audiobookshelf", - "version": "2.19.1", + "version": "2.19.2", "license": "GPL-3.0", "dependencies": { "axios": "^0.27.2", diff --git a/package.json b/package.json index 8cb0cdd50..a6dd6fb06 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "audiobookshelf", - "version": "2.19.1", + "version": "2.19.2", "buildNumber": 1, "description": "Self-hosted audiobook and podcast server", "main": "index.js",