u

src/providers/mssql/queries/category.js

@@ -19,7 +19,13 @@ SELECT
     p.hash AS fullHash,
     p.thumbw AS thumbW,
     p.thumbh AS thumbH,
-    p.thumbhash AS thumbHash
+    p.thumbhash AS thumbHash,
+    (
+        SELECT COUNT(*)
+        FROM categoryarticle ca
+        INNER JOIN article a ON a.id = ca.article_id
+        WHERE ca.category_id = t.id AND a.parentarticle_id IS NULL
+    ) AS articleCount
 FROM tree t
 LEFT JOIN categorytext ct
     ON ct.category_id = t.id AND ct.language_id = @languageId
@@ -33,6 +39,19 @@ LEFT JOIN pic p ON p.id = first_pic.pic_id
 ORDER BY t.sort, t.id
 `;
 
+export const COUNT_ARTICLES_IN_TREE = `
+WITH tree AS (
+    SELECT id FROM category WHERE id = @rootId
+    UNION ALL
+    SELECT c.id FROM category c INNER JOIN tree t ON c.parent_id = t.id
+)
+SELECT COUNT(DISTINCT ca.article_id) AS total
+FROM categoryarticle ca
+INNER JOIN article a ON a.id = ca.article_id
+WHERE ca.category_id IN (SELECT id FROM tree)
+  AND a.parentarticle_id IS NULL
+`;
+
 import {
   ARTICLE_LIST_COLUMNS,
   ARTICLE_LIST_JOINS,

src/providers/mssql/queries/company.js

@@ -52,11 +52,13 @@ SELECT
     c.name,
     c.root_category_id AS rootCategoryId,
     c.default_language_id AS languageId,
+    l.iso639,
     tr.rate AS taxrate,
     rtr.rate AS reducedtaxrate,
     tfr.rate AS taxfreerate
 FROM company c
 INNER JOIN companyuser cu ON cu.company_id = c.id
+LEFT JOIN language l ON l.id = c.default_language_id
 LEFT JOIN tax tr ON tr.id = c.taxrate
 LEFT JOIN tax rtr ON rtr.id = c.reducedtaxrate
 LEFT JOIN tax tfr ON tfr.id = c.taxfreerate