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.
This commit is contained in:
Phil Cullen 2019-10-25 23:31:35 +01:00 committed by Nicolas Giard
parent 8badd8fd55
commit ea5c4ea33d

View File

@ -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',