chore(embedded/document): count with limit in subquery

Signed-off-by: Jeronimo Irazabal <[email protected]>
codenotary · Oct 13, 2023 · b5c6917 · b5c6917
1 parent 420d631
commit b5c6917
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/embedded/document/engine.go b/embedded/document/engine.go
@@ -880,7 +880,7 @@ func (e *Engine) ReplaceDocuments(ctx context.Context, username string, query *p
 
 	queryStmt := sql.NewSelectStmt(
 		[]sql.Selector{sql.NewColSelector(query.CollectionName, documentIdFieldName)},
-		query.CollectionName,
+		sql.NewTableRef(query.CollectionName, ""),
 		queryCondition,
 		generateSQLOrderByClauses(table, query.OrderBy),
 		sql.NewInteger(int64(query.Limit)),
@@ -983,7 +983,7 @@ func (e *Engine) GetDocuments(ctx context.Context, query *protomodel.Query, offs
 
 	op := sql.NewSelectStmt(
 		[]sql.Selector{sql.NewColSelector(query.CollectionName, DocumentBLOBField)},
-		query.CollectionName,
+		sql.NewTableRef(query.CollectionName, ""),
 		queryCondition,
 		generateSQLOrderByClauses(table, query.OrderBy),
 		sql.NewInteger(int64(query.Limit)),
@@ -1022,15 +1022,24 @@ func (e *Engine) CountDocuments(ctx context.Context, query *protomodel.Query, of
 		return 0, err
 	}
 
-	op := sql.NewSelectStmt(
-		[]sql.Selector{sql.NewAggColSelector(sql.COUNT, query.CollectionName, "*")},
-		query.CollectionName,
+	ds := sql.NewSelectStmt(
+		[]sql.Selector{sql.NewColSelector(query.CollectionName, table.Cols()[0].Name())},
+		sql.NewTableRef(query.CollectionName, ""),
 		queryCondition,
 		generateSQLOrderByClauses(table, query.OrderBy),
 		sql.NewInteger(int64(query.Limit)),
 		sql.NewInteger(offset),
 	)
 
+	op := sql.NewSelectStmt(
+		[]sql.Selector{sql.NewAggColSelector(sql.COUNT, query.CollectionName, "*")},
+		ds,
+		nil,
+		nil,
+		nil,
+		nil,
+	)
+
 	r, err := e.sqlEngine.QueryPreparedStmt(ctx, sqlTx, op, nil)
 	if err != nil {
 		return 0, err