patch query

traPtitech · Nov 12, 2023 · d0cdae4 · d0cdae4
1 parent e11b480
commit d0cdae4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,5 +1,5 @@
 FROM node:18-bookworm-slim AS builder
-ENV GHOST_VERSION 5.54.0
+ENV GHOST_VERSION 5.54.4
 ENV NODE_ENV development
 
 RUN apt-get update && apt-get install -y git tar git-filter-repo

diff --git a/docker/DockerfileDockerize b/docker/DockerfileDockerize
@@ -1,5 +1,5 @@
 FROM node:18-bookworm-slim AS builder
-ENV GHOST_VERSION 5.54.0
+ENV GHOST_VERSION 5.54.4
 ENV NODE_ENV development
 
 RUN apt-get update && apt-get install -y git tar git-filter-repo

diff --git a/ghost/core/core/server/models/post.js b/ghost/core/core/server/models/post.js
@@ -1398,15 +1398,15 @@ Post = ghostBookshelf.Model.extend({
                 modelOrCollection.query('columns', 'posts.*', (qb) => {
                     qb.count('members_created_events.id')
                         .from('members_created_events')
-                        .whereRaw('posts.id = members_created_events.attribution_id')
+                        .whereRaw('`posts`.id = members_created_events.attribution_id')
                         .as('count__signups');
                 });
             },
             paid_conversions(modelOrCollection) {
                 modelOrCollection.query('columns', 'posts.*', (qb) => {
                     qb.count('members_subscription_created_events.id')
                         .from('members_subscription_created_events')
-                        .whereRaw('posts.id = members_subscription_created_events.attribution_id')
+                        .whereRaw('`posts`.id = members_subscription_created_events.attribution_id')
                         .as('count__paid_conversions');
                 });
             },
@@ -1418,15 +1418,14 @@ Post = ghostBookshelf.Model.extend({
                     qb.count('*')
                         .from('k')
                         .with('k', (q) => {
-                            q.select('member_id')
+                            q.select('member_id','attribution_id')
                                 .from('members_subscription_created_events')
-                                .whereRaw('posts.id = members_subscription_created_events.attribution_id')
                                 .union(function () {
-                                    this.select('member_id')
-                                        .from('members_created_events')
-                                        .whereRaw('posts.id = members_created_events.attribution_id');
+                                    this.select('member_id','attribution_id')
+                                        .from('members_created_events');
                                 });
                         })
+                        .whereRaw('`k`.attribution_id = `posts`.id')
                         .as('count__conversions');
                 });
             },
@@ -1435,31 +1434,31 @@ Post = ghostBookshelf.Model.extend({
                     qb.countDistinct('members_click_events.member_id')
                         .from('members_click_events')
                         .join('redirects', 'members_click_events.redirect_id', 'redirects.id')
-                        .whereRaw('posts.id = redirects.post_id')
+                        .whereRaw('`posts`.id = redirects.post_id')
                         .as('count__clicks');
                 });
             },
             sentiment(modelOrCollection) {
                 modelOrCollection.query('columns', 'posts.*', (qb) => {
                     qb.select(qb.client.raw('COALESCE(ROUND(AVG(score) * 100), 0)'))
                         .from('members_feedback')
-                        .whereRaw('posts.id = members_feedback.post_id')
+                        .whereRaw('`posts`.id = members_feedback.post_id')
                         .as('count__sentiment');
                 });
             },
             negative_feedback(modelOrCollection) {
                 modelOrCollection.query('columns', 'posts.*', (qb) => {
                     qb.count('*')
                         .from('members_feedback')
-                        .whereRaw('posts.id = members_feedback.post_id AND members_feedback.score = 0')
+                        .whereRaw('`posts`.id = members_feedback.post_id AND members_feedback.score = 0')
                         .as('count__negative_feedback');
                 });
             },
             positive_feedback(modelOrCollection) {
                 modelOrCollection.query('columns', 'posts.*', (qb) => {
                     qb.sum('score')
                         .from('members_feedback')
-                        .whereRaw('posts.id = members_feedback.post_id')
+                        .whereRaw('`posts`.id = members_feedback.post_id')
                         .as('count__positive_feedback');
                 });
             }