From c3deb268a1502c51d50a7654fc94beba9549c166 Mon Sep 17 00:00:00 2001
From: Bennett Garcia <bennettgarcia@users.noreply.github.com>
Date: Tue, 4 Aug 2026 15:52:35 -0400
Subject: [PATCH] Fix production cutover changelog for Liquibase Community

---
 db/changelogs/cla-production-cutover.xml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/db/changelogs/cla-production-cutover.xml b/db/changelogs/cla-production-cutover.xml
index ea90e8a..ba95cc3 100644
--- a/db/changelogs/cla-production-cutover.xml
+++ b/db/changelogs/cla-production-cutover.xml
@@ -5,9 +5,17 @@
     xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
     http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.10.xsd">
 
-    <!-- Normal additive product schema first, then the explicitly selected
-         one-time production survey-data consolidation. Local, CI, and staging
-         continue to use master-changelog.xml and cannot run the cutover. -->
-    <include file="master-changelog.xml" relativeToChangelogFile="true" />
+    <!-- Keep this explicit list in the same order as master-changelog.xml.
+         Liquibase Community 4.29 rejects a nested changelog include followed by
+         formatted SQL, so the production-only root cannot include master here.
+         Local, CI, and staging continue to use master-changelog.xml and cannot
+         run the cutover. -->
+    <include file="v1_0_create_initial_tables.sql" relativeToChangelogFile="true" />
+    <include file="v1_1_add_sent_email_count.sql" relativeToChangelogFile="true" />
+    <include file="v1_2_product_iam_foundation.sql" relativeToChangelogFile="true" />
+    <include file="v1_3_survey_archive.sql" relativeToChangelogFile="true" />
+    <include file="v1_4_product_iam_remaining.sql" relativeToChangelogFile="true" />
+    <include file="v1_5_question_requiredness.sql" relativeToChangelogFile="true" />
+    <include file="v1_6_survey_invitation_subject.sql" relativeToChangelogFile="true" />
     <include file="v1_7_cla_organization_backfill.sql" relativeToChangelogFile="true" />
 </databaseChangeLog>