From a24a06002081ad71a78ffeff9072725ba39cf121 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Tue, 17 Feb 2026 20:05:31 +0000
Subject: [PATCH] =minor changes, particularly around the JVB_CHILD_URL pattern

---
 inc/registry/CheckCustomTables.php |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/inc/registry/CheckCustomTables.php b/inc/registry/CheckCustomTables.php
index 9ec862a..bc5955e 100644
--- a/inc/registry/CheckCustomTables.php
+++ b/inc/registry/CheckCustomTables.php
@@ -35,7 +35,7 @@
 		//Fetch the constants manually, in case they're not defined yet?
 		$this->JVB_SITE = apply_filters('jvb_site', []);
 		$this->JVB_MEMBERSHIP = apply_filters('jvb_membership', []);
-		$this->JVB_CONTENT = apply_filters('jvb_content', []);
+		$this->JVB_CONTENT = apply_filters('jvb_content',  []);
 		$this->JVB_TAXONOMY = apply_filters('jvb_taxonomy', []);
 		$this->JVB_USER = apply_filters('jvb_user', []);
 
@@ -457,7 +457,7 @@
 
             `priority` ENUM('high', 'normal', 'low') DEFAULT 'normal',
             `state` enum('pending', 'scheduled', 'processing', 'completed') DEFAULT 'pending',
-            `outcome` enum('pending', 'success', 'partial', 'failed','failed_permanent') DEFAULT 'pending',
+            `outcome` enum('pending', 'success', 'partial', 'merged', 'failed', 'failed_permanent') DEFAULT 'pending',
 
 			`retries` int(11) DEFAULT 0,
             `last_error_hash` CHAR(32) DEFAULT NULL,
@@ -470,6 +470,7 @@
             `metadata` JSON DEFAULT NULL,
             `result` JSON,
             `dependencies` JSON,
+            `merged_into` VARCHAR(64) DEFAULT NULL,
 
             `user_dismissed` tinyint(1) DEFAULT 0,
             `created_at` DATETIME DEFAULT CURRENT_TIMESTAMP,

--
Gitblit v1.10.0