@restura/core 2.1.0 → 2.1.1

package/dist/index.js

@@ -259,7 +259,7 @@ var SqlUtils = class _SqlUtils {
     if (type.startsWith("decimal") || type.startsWith("numeric")) return "string";
     if (type.indexOf("int") > -1 || type.startsWith("double") || type.startsWith("float") || type.indexOf("serial") > -1 || type.startsWith("real") || type.startsWith("double precision"))
       return "number";
-    if (type === "json") {
+    if (type === "json" || type === "jsonb") {
       if (!value) return "object";
       return value.split(",").map((val) => {
         return val.replace(/['"]/g, "");
@@ -2359,23 +2359,31 @@ CREATE INDEX IF NOT EXISTS "${OUTBOX_TABLE_NAME}_processedOn_index" ON "${OUTBOX
 }
 function resolveNotifyColumns(tableName, notify, tableColumns) {
   if (!notify) return [];
+  let columns;
   if (notify === "ALL") {
     if (!tableColumns) {
       throw new Error(
         `notify: "ALL" on table "${tableName}" requires tableColumns so the sensitive-column denylist can be applied. Pass options.tableColumns or list columns explicitly.`
       );
     }
-    return tableColumns.filter((column) => !isSensitiveColumnName(column));
+    columns = tableColumns.filter((column) => !isSensitiveColumnName(column));
+  } else {
+    columns = notify.map((entry) => {
+      if (entry.startsWith("!")) return entry.slice(1);
+      if (isSensitiveColumnName(entry)) {
+        throw new Error(
+          `Refusing to include sensitive column "${tableName}"."${entry}" in notify trigger payloads. Remove it from the notify list or prefix it with '!' to force-include it.`
+        );
+      }
+      return entry;
+    });
   }
-  return notify.map((entry) => {
-    if (entry.startsWith("!")) return entry.slice(1);
-    if (isSensitiveColumnName(entry)) {
-      throw new Error(
-        `Refusing to include sensitive column "${tableName}"."${entry}" in notify trigger payloads. Remove it from the notify list or prefix it with '!' to force-include it.`
-      );
-    }
-    return entry;
-  });
+  if (!columns.length) {
+    throw new Error(
+      `notify config on table "${tableName}" resolves to no columns \u2014 remove the notify key or list at least one column.`
+    );
+  }
+  return columns;
 }
 function sqlStringLiteral(value) {
   return value.replace(/'/g, "''");
@@ -2425,7 +2433,13 @@ function buildTriggerFunctionSql(tableName, operation, notify, options) {
   const outboxDeclare = delivery === "outbox" ? "\n	outbox_id BIGINT;" : "";
   const legacyDrop = operation === "update" && tableName !== tableName.toLowerCase() ? `DROP TRIGGER IF EXISTS ${tableName}_update ON "${tableName}";
 ` : "";
-  const updateGuard = operation === "update" ? "\n	WHEN (OLD.* IS DISTINCT FROM NEW.*)" : "";
+  let updateScope = "";
+  let updateGuard = "";
+  if (operation === "update") {
+    updateScope = ` OF ${columns.map((column) => `"${column}"`).join(", ")}`;
+    updateGuard = `
+	WHEN (${columns.map((column) => `OLD."${column}" IS DISTINCT FROM NEW."${column}"`).join(" OR ")})`;
+  }
   return `
 CREATE OR REPLACE FUNCTION ${functionName}()
 	RETURNS TRIGGER AS $$
@@ -2440,7 +2454,7 @@ END;
 $$ LANGUAGE plpgsql;
 
 ${legacyDrop}CREATE OR REPLACE TRIGGER "${tableName}_${operation}"
-	AFTER ${operation.toUpperCase()} ON "${tableName}"
+	AFTER ${operation.toUpperCase()}${updateScope} ON "${tableName}"
 	FOR EACH ROW${updateGuard}
 EXECUTE FUNCTION ${functionName}();
 `;