@restura/core 0.1.0-alpha.12 → 0.1.0-alpha.13

package/dist/index.js

@@ -258,7 +258,7 @@ var import_crypto = require("crypto");
 var express = __toESM(require("express"));
 var import_fs3 = __toESM(require("fs"));
 var import_path3 = __toESM(require("path"));
-var import_pg3 = __toESM(require("pg"));
+var import_pg2 = __toESM(require("pg"));
 var prettier3 = __toESM(require("prettier"));
 
 // src/restura/sql/SqlUtils.ts
@@ -1570,7 +1570,7 @@ var filterPsqlParser_default = filterPsqlParser;
 // src/restura/sql/PsqlEngine.ts
 var import_pg_diff_sync = __toESM(require("@wmfs/pg-diff-sync"));
 var import_pg_info = __toESM(require("@wmfs/pg-info"));
-var import_pg2 = require("pg");
+var { Client } = "pg";
 var systemUser = {
   role: "",
   host: "",
@@ -1688,14 +1688,14 @@ var PsqlEngine = class extends SqlEngine {
   async diffDatabaseToSchema(schema) {
     const scratchPool = await this.getScratchPool();
     await this.createDatabaseFromSchema(schema, scratchPool);
-    const originalClient = new import_pg2.Client({
+    const originalClient = new Client({
       database: this.psqlConnectionPool.poolConfig.database,
       user: this.psqlConnectionPool.poolConfig.user,
       password: this.psqlConnectionPool.poolConfig.password,
       host: this.psqlConnectionPool.poolConfig.host,
       port: this.psqlConnectionPool.poolConfig.port
     });
-    const scratchClient = new import_pg2.Client({
+    const scratchClient = new Client({
       database: this.psqlConnectionPool.poolConfig.database + "_scratch",
       user: this.psqlConnectionPool.poolConfig.user,
       password: this.psqlConnectionPool.poolConfig.password,
@@ -1827,22 +1827,20 @@ var PsqlEngine = class extends SqlEngine {
       );
     } else if (routeData.type === "PAGED") {
       const data = req.data;
-      const pageResults = await this.psqlConnectionPool.runQuery(
-        `${selectStatement}${sqlStatement}${groupByOrderByStatement} LIMIT ? OFFSET ?;SELECT COUNT(${routeData.groupBy ? `DISTINCT ${routeData.groupBy.tableName}.${routeData.groupBy.columnName}` : "*"}) AS total
-${sqlStatement};`,
-        [
-          ...sqlParams,
-          data.perPage || DEFAULT_PAGED_PER_PAGE_NUMBER,
-          (data.page - 1) * data.perPage || DEFAULT_PAGED_PAGE_NUMBER,
-          ...sqlParams
-        ],
+      const pagePromise = this.psqlConnectionPool.runQuery(
+        `${selectStatement}${sqlStatement}${groupByOrderByStatement}` + SQL`LIMIT ${data.perPage || DEFAULT_PAGED_PER_PAGE_NUMBER} OFFSET ${(data.page - 1) * data.perPage || DEFAULT_PAGED_PAGE_NUMBER};`,
+        sqlParams,
         req.requesterDetails
       );
+      const totalQuery = `SELECT COUNT(${routeData.groupBy ? `DISTINCT ${routeData.groupBy.tableName}.${routeData.groupBy.columnName}` : "*"}) AS total
+ ${sqlStatement};`;
+      const totalPromise = await this.psqlConnectionPool.runQuery(totalQuery, sqlParams, req.requesterDetails);
+      const [pageResults, totalResponse] = await Promise.all([pagePromise, totalPromise]);
       let total = 0;
-      if (import_core_utils5.ObjectUtils.isArrayWithData(pageResults)) {
-        total = pageResults[1][0].total;
+      if (import_core_utils5.ObjectUtils.isArrayWithData(totalResponse)) {
+        total = totalResponse[0].total;
       }
-      return { data: pageResults[0], total };
+      return { data: pageResults, total };
     } else {
       throw new RsError("UNKNOWN_ERROR", "Unknown route type.");
     }
@@ -2001,7 +1999,7 @@ var schemaToPsqlType = (column, tableName) => {
 };
 
 // src/restura/restura.ts
-var { types } = import_pg3.default;
+var { types } = import_pg2.default;
 var ResturaEngine = class {
   constructor() {
     this.publicEndpoints = {