@cadenza.io/service 2.17.0 → 2.17.2

package/dist/index.js

@@ -5731,6 +5731,41 @@ function defaultOperationIntentDescription(operation, tableName) {
 function isExplicitSqlLiteral(value) {
   return /^'.*'::[a-z_][a-z0-9_]*(\[\])?$/i.test(value.trim());
 }
+function isExplicitSqlExpression(value) {
+  const trimmed = value.trim();
+  if (!trimmed) {
+    return false;
+  }
+  if (isExplicitSqlLiteral(trimmed)) {
+    return true;
+  }
+  if (/^'.*'$/.test(trimmed)) {
+    return true;
+  }
+  if (/^[a-z_][a-z0-9_]*\([^)]*\)$/i.test(trimmed)) {
+    return true;
+  }
+  return /^(current_timestamp|current_date|current_time)$/i.test(trimmed);
+}
+function serializeFieldDefaultForSql(value, field) {
+  if (value === void 0 || value === null) {
+    return "NULL";
+  }
+  if (typeof value === "number") {
+    return String(value);
+  }
+  if (typeof value === "boolean") {
+    return value ? "TRUE" : "FALSE";
+  }
+  const stringValue = String(value);
+  if (isExplicitSqlExpression(stringValue)) {
+    return stringValue;
+  }
+  if (field?.type === "jsonb") {
+    return `'${JSON.stringify(value).replace(/'/g, "''")}'::jsonb`;
+  }
+  return `'${stringValue.replace(/'/g, "''")}'`;
+}
 function serializeInitialDataValueForSql(value, field) {
   if (value === void 0 || value === null) {
     return "NULL";
@@ -5749,7 +5784,7 @@ function serializeInitialDataValueForSql(value, field) {
     return `'${jsonString.replace(/'/g, "''")}'::jsonb`;
   }
   const stringValue = String(value);
-  if (isExplicitSqlLiteral(stringValue)) {
+  if (isExplicitSqlExpression(stringValue)) {
     return stringValue;
   }
   return `'${stringValue.replace(/'/g, "''")}'`;
@@ -6790,7 +6825,7 @@ var DatabaseController = class _DatabaseController {
     if (field.primary) definition += " PRIMARY KEY";
     if (field.unique) definition += " UNIQUE";
     if (field.default !== void 0) {
-      definition += ` DEFAULT ${field.default === "" ? "''" : String(field.default)}`;
+      definition += ` DEFAULT ${serializeFieldDefaultForSql(field.default, field)}`;
     }
     if (field.required && !field.nullable) definition += " NOT NULL";
     if (field.nullable) definition += " NULL";
@@ -7047,12 +7082,9 @@ var DatabaseController = class _DatabaseController {
       schema
     );
     for (const intent of intents) {
-      if (registration.intentNames.has(intent.name)) {
-        throw new Error(
-          `Duplicate auto/custom intent '${intent.name}' detected while generating ${op} task for table '${tableName}' in actor '${registration.actorName}'`
-        );
+      if (!registration.intentNames.has(intent.name)) {
+        registration.intentNames.add(intent.name);
       }
-      registration.intentNames.add(intent.name);
       CadenzaService.defineIntent({
         name: intent.name,
         description: intent.description,