From ea5c4ea33d1fd26721d59581b7db5e1fd1434e40 Mon Sep 17 00:00:00 2001 From: Phil Cullen <20287171+philipcullen@users.noreply.github.com> Date: Fri, 25 Oct 2019 23:31:35 +0100 Subject: [PATCH] fix: MSSQL - expand pages.* to prevent duplicate columns (#1126) * Expand pages.* to prevent duplicate columns in MSSQL Replace pages.* in select query with explicit list of columns to avoid multiple identically named columns being returned by MSSQL * Use global replace for analytics header templates Replace multiple instances of the same template variable in analytics templates * Revert "Use global replace for analytics header templates" This reverts commit 290b53b6e33c45d358252a14c838d12916895601. --- server/models/pages.js | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/server/models/pages.js b/server/models/pages.js index f93b37b0..57800bde 100644 --- a/server/models/pages.js +++ b/server/models/pages.js @@ -675,7 +675,26 @@ module.exports = class Page extends Model { try { return WIKI.models.pages.query() .column([ - 'pages.*', + 'pages.id', + 'pages.path', + 'pages.hash', + 'pages.title', + 'pages.description', + 'pages.isPrivate', + 'pages.isPublished', + 'pages.privateNS', + 'pages.publishStartDate', + 'pages.publishEndDate', + 'pages.content', + 'pages.render', + 'pages.toc', + 'pages.contentType', + 'pages.createdAt', + 'pages.updatedAt', + 'pages.editorKey', + 'pages.localeCode', + 'pages.authorId', + 'pages.creatorId', { authorName: 'author.name', authorEmail: 'author.email',