@restura/core 0.1.0-alpha.17 → 0.1.0-alpha.19

package/dist/index.js

@@ -69,6 +69,7 @@ var src_exports = {};
 __export(src_exports, {
   HtmlStatusCodes: () => HtmlStatusCodes,
   PsqlConnection: () => PsqlConnection,
+  PsqlEngine: () => PsqlEngine,
   PsqlPool: () => PsqlPool,
   PsqlTransaction: () => PsqlTransaction,
   RsError: () => RsError,
@@ -1738,7 +1739,7 @@ var PsqlEngine = class extends SqlEngine {
     await Promise.all(promises);
     this.triggerClient.on("notification", async (msg) => {
       if (msg.channel === "insert" || msg.channel === "update" || msg.channel === "delete") {
-        const payload = JSON.parse(msg.payload);
+        const payload = import_core_utils5.ObjectUtils.safeParse(msg.payload);
         await this.handleTrigger(payload, msg.channel.toUpperCase());
       }
     });
@@ -1938,16 +1939,19 @@ var PsqlEngine = class extends SqlEngine {
       parameterObj[assignment.name] = this.replaceParamKeywords(assignment.value, routeData, req, sqlParams);
     });
     const query = insertObjectQuery(routeData.table, __spreadValues(__spreadValues({}, req.data), parameterObj));
-    const createdItem = await this.psqlConnectionPool.queryOne(query, sqlParams, req.requesterDetails);
-    const insertId = createdItem == null ? void 0 : createdItem.id;
-    const whereData = [
-      {
-        tableName: routeData.table,
-        value: insertId,
-        columnName: "id",
-        operator: "="
-      }
-    ];
+    const createdItem = await this.psqlConnectionPool.queryOne(
+      query,
+      sqlParams,
+      req.requesterDetails
+    );
+    const insertId = createdItem.id;
+    const whereId = {
+      tableName: routeData.table,
+      value: insertId,
+      columnName: "id",
+      operator: "="
+    };
+    const whereData = [whereId];
     req.data = { id: insertId };
     return this.executeGetRequest(req, __spreadProps(__spreadValues({}, routeData), { where: whereData }), schema);
   }
@@ -1966,7 +1970,9 @@ var PsqlEngine = class extends SqlEngine {
     let selectStatement = "SELECT \n";
     selectStatement += `	${selectColumns.map((item) => {
       if (item.subquery) {
-        return `${this.createNestedSelect(req, schema, item, routeData, userRole, sqlParams)} AS ${item.name}`;
+        return `${this.createNestedSelect(req, schema, item, routeData, userRole, sqlParams)} AS ${escapeColumnName(
+          item.name
+        )}`;
       }
       return `${escapeColumnName(item.selector)} AS ${escapeColumnName(item.name)}`;
     }).join(",\n	")}
@@ -2006,7 +2012,11 @@ var PsqlEngine = class extends SqlEngine {
       );
       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 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(totalResponse)) {
@@ -2119,17 +2129,16 @@ DELETE FROM "${routeData.table}" ${joinStatement} ${whereClause}`;
         );
       let operator = item.operator;
       if (operator === "LIKE") {
-        item.value = `%${item.value}%`;
+        item.value = `'%${item.value}%'`;
       } else if (operator === "STARTS WITH") {
         operator = "LIKE";
-        item.value = `${item.value}%`;
+        item.value = `'${item.value}%'`;
       } else if (operator === "ENDS WITH") {
         operator = "LIKE";
-        item.value = `%${item.value}`;
+        item.value = `'%${item.value}'`;
       }
       const replacedValue = this.replaceParamKeywords(item.value, routeData, req, sqlParams);
-      const escapedValue = SQL`${replacedValue}`;
-      whereClause += `	${item.conjunction || ""} "${item.tableName}"."${item.columnName}" ${operator.replace("LIKE", "ILIKE")} ${["IN", "NOT IN"].includes(operator) ? `(${escapedValue})` : escapedValue}
+      whereClause += `	${item.conjunction || ""} "${item.tableName}"."${item.columnName}" ${operator.replace("LIKE", "ILIKE")} ${["IN", "NOT IN"].includes(operator) ? `(${replacedValue})` : replacedValue}
 `;
     });
     const data = req.data;
@@ -2343,7 +2352,7 @@ var ResturaEngine = class {
   async init(app, authenticationHandler, psqlConnectionPool) {
     this.resturaConfig = import_internal2.config.validate("restura", resturaConfigSchema);
     this.psqlConnectionPool = psqlConnectionPool;
-    this.psqlEngine = new PsqlEngine(this.psqlConnectionPool);
+    this.psqlEngine = new PsqlEngine(this.psqlConnectionPool, true);
     setupPgReturnTypes();
     await customApiFactory_default.loadApiFiles(this.resturaConfig.customApiFolderPath);
     this.authenticationHandler = authenticationHandler;
@@ -2707,10 +2716,17 @@ var PsqlTransaction = class extends PsqlConnection {
     super();
     this.clientConfig = clientConfig;
     this.client = new Client2(clientConfig);
+    this.connectPromise = this.client.connect();
     this.beginTransactionPromise = this.beginTransaction();
   }
+  async close() {
+    if (this.client) {
+      await this.client.end();
+    }
+  }
   async beginTransaction() {
-    return this.query("BEGIN");
+    await this.connectPromise;
+    return this.client.query("BEGIN");
   }
   async rollback() {
     return this.query("ROLLBACK");
@@ -2722,7 +2738,7 @@ var PsqlTransaction = class extends PsqlConnection {
     return this.client.end();
   }
   async query(query, values) {
-    await this.client.connect();
+    await this.connectPromise;
     await this.beginTransactionPromise;
     return this.client.query(query, values);
   }
@@ -2731,6 +2747,7 @@ var PsqlTransaction = class extends PsqlConnection {
 0 && (module.exports = {
   HtmlStatusCodes,
   PsqlConnection,
+  PsqlEngine,
   PsqlPool,
   PsqlTransaction,
   RsError,