Use raw SQL for most of video queries

[github/Chocobozzz/PeerTube.git] / server / models / video / sql / videos-model-list-query-builder.ts

diff --git a/server/models/video/sql/videos-model-list-query-builder.ts b/server/models/video/sql/videos-model-list-query-builder.ts
index acb76d80a9ef60081e02d640d87303d2dad7f3f0..43040fc5e6da1be861c5acad4a7dd275f3575983 100644 (file)
--- a/server/models/video/sql/videos-model-list-query-builder.ts
+++ b/server/models/video/sql/videos-model-list-query-builder.ts
@@ -11,7 +11,6 @@ import { BuildVideosListQueryOptions, VideosIdListQueryBuilder } from './videos-
 
 export class VideosModelListQueryBuilder extends AbstractVideosModelQueryBuilder {
   protected attributes: { [key: string]: string }
-  protected joins: string[] = []
 
   private innerQuery: string
   private innerSort: string
@@ -21,14 +20,15 @@ export class VideosModelListQueryBuilder extends AbstractVideosModelQueryBuilder
   constructor (protected readonly sequelize: Sequelize) {
     super('list')
 
-    this.videoModelBuilder = new VideoModelBuilder(this.mode, this.videoAttributes)
+    this.videoModelBuilder = new VideoModelBuilder(this.mode, this.tables)
   }
 
   queryVideos (options: BuildVideosListQueryOptions) {
     this.buildInnerQuery(options)
     this.buildListQueryFromIdsQuery(options)
 
-    return this.runQuery(undefined, true).then(rows => this.videoModelBuilder.buildVideosFromRows(rows))
+    return this.runQuery()
+      .then(rows => this.videoModelBuilder.buildVideosFromRows(rows))
   }
 
   private buildInnerQuery (options: BuildVideosListQueryOptions) {
@@ -45,7 +45,7 @@ export class VideosModelListQueryBuilder extends AbstractVideosModelQueryBuilder
       '"video".*': ''
     }
 
-    this.joins = [ 'INNER JOIN "video" ON "tmp"."id" = "video"."id"' ]
+    this.addJoin('INNER JOIN "video" ON "tmp"."id" = "video"."id"')
 
     this.includeChannels()
     this.includeAccounts()
@@ -66,6 +66,6 @@ export class VideosModelListQueryBuilder extends AbstractVideosModelQueryBuilder
 
     const select = this.buildSelect()
 
-    this.query = `${select} FROM (${this.innerQuery}) AS "tmp" ${this.joins.join(' ')} ${this.innerSort}`
+    this.query = `${select} FROM (${this.innerQuery}) AS "tmp" ${this.joins} ${this.innerSort}`
   }
 }