u

src/providers/mssql/queries/brand.js

@@ -5,8 +5,6 @@ SELECT
     b.gsprpinfo,
     (
         SELECT
-            bp.id,
-            bp.sort,
             p.hash AS fullHash,
             p.thumbw AS thumbW,
             p.thumbh AS thumbH,
@@ -22,6 +20,35 @@ WHERE b.company_id = @companyId
 ORDER BY b.name
 `;
 
+export const COUNT_BY_COMPANY = `
+SELECT COUNT(*) AS total
+FROM brand b
+WHERE b.company_id = @companyId
+`;
+
+export const LIST_BY_COMPANY_PAGED = `
+SELECT
+    b.id,
+    b.name,
+    b.gsprpinfo,
+    (
+        SELECT
+            p.hash AS fullHash,
+            p.thumbw AS thumbW,
+            p.thumbh AS thumbH,
+            p.thumbhash AS thumbHash
+        FROM brandpic bp
+        INNER JOIN pic p ON p.id = bp.pic_id
+        WHERE bp.brand_id = b.id
+        ORDER BY bp.sort ASC, bp.id ASC
+        FOR JSON PATH
+    ) AS picsJson
+FROM brand b
+WHERE b.company_id = @companyId
+ORDER BY b.name
+OFFSET @offset ROWS FETCH NEXT @limit ROWS ONLY
+`;
+
 export const GET_BY_COMPANY_AND_NAME = `
 SELECT
     b.id,
@@ -29,8 +56,6 @@ SELECT
     b.gsprpinfo,
     (
         SELECT
-            bp.id,
-            bp.sort,
             p.hash AS fullHash,
             p.thumbw AS thumbW,
             p.thumbh AS thumbH,

src/providers/sqlite3/queries/brand.js

@@ -4,6 +4,7 @@ import { translateQueries } from './translate.js';
 const queries = translateQueries(source, 'brand');
 export const {
   CREATE, DELETE_BY_COMPANY_AND_ID, UPDATE_BY_ID, GET_BY_ID_AND_COMPANY,
+  COUNT_BY_COMPANY,
 } = queries;
 
 export const LIST_BY_COMPANY = `
@@ -13,15 +14,13 @@ SELECT
     b.gsprpinfo,
     (
         SELECT COALESCE(json_group_array(json_object(
-            'id', id,
-            'sort', sort,
             'fullHash', hash,
             'thumbW', thumbw,
             'thumbH', thumbh,
             'thumbHash', thumbhash
         )), '[]')
         FROM (
-            SELECT bp.id, bp.sort, p.hash, p.thumbw, p.thumbh, p.thumbhash
+            SELECT p.hash, p.thumbw, p.thumbh, p.thumbhash
             FROM brandpic bp
             INNER JOIN pic p ON p.id = bp.pic_id
             WHERE bp.brand_id = b.id
@@ -33,6 +32,32 @@ WHERE b.company_id = @companyId
 ORDER BY b.name
 `;
 
+export const LIST_BY_COMPANY_PAGED = `
+SELECT
+    b.id,
+    b.name,
+    b.gsprpinfo,
+    (
+        SELECT COALESCE(json_group_array(json_object(
+            'fullHash', hash,
+            'thumbW', thumbw,
+            'thumbH', thumbh,
+            'thumbHash', thumbhash
+        )), '[]')
+        FROM (
+            SELECT p.hash, p.thumbw, p.thumbh, p.thumbhash
+            FROM brandpic bp
+            INNER JOIN pic p ON p.id = bp.pic_id
+            WHERE bp.brand_id = b.id
+            ORDER BY bp.sort, bp.id
+        )
+    ) AS picsJson
+FROM brand b
+WHERE b.company_id = @companyId
+ORDER BY b.name
+LIMIT @limit OFFSET @offset
+`;
+
 export const GET_BY_COMPANY_AND_NAME = `
 SELECT
     b.id,
@@ -40,15 +65,13 @@ SELECT
     b.gsprpinfo,
     (
         SELECT COALESCE(json_group_array(json_object(
-            'id', id,
-            'sort', sort,
             'fullHash', hash,
             'thumbW', thumbw,
             'thumbH', thumbh,
             'thumbHash', thumbhash
         )), '[]')
         FROM (
-            SELECT bp.id, bp.sort, p.hash, p.thumbw, p.thumbh, p.thumbhash
+            SELECT p.hash, p.thumbw, p.thumbh, p.thumbhash
             FROM brandpic bp
             INNER JOIN pic p ON p.id = bp.pic_id
             WHERE bp.brand_id = b.id