Merge remote-tracking branch 'origin/claude/issue-24583-7b0-tenant-not-null-ddl' into claude/issue-24583-7b12-index-plain-form

Author: claude

packages/plugins/plugin-approvals/src/later-step-original-submitter.integration.test.ts

@@ -51,6 +51,7 @@ import type { EngineQueryOptions } from '@objectstack/spec/data';
 import { ApprovalService } from './approval-service.js';
 import { ApprovalsServicePlugin } from './approvals-plugin.js';
 import { registerApprovalNode } from './approval-node.js';
+import { installDefaultOrganization } from './default-organization.testkit.js';
 
 const SYSTEM = { isSystem: true, positions: [], permissions: [] } as any;
 const asUser = (userId: string) => ({ userId, positions: [], permissions: [] }) as any;
@@ -250,6 +251,9 @@ describe('every step of an approval run names the run\'s original submitter (#24
       engine.registry.registerObject(def as any, 'approvals-test', 'approvals-test');
     }
     await engine.syncSchemas();
+    // A real `single` install's Default Organization: the system writes below
+    // derive it (ADR-0131 D9), as a fresh NOT NULL tenant column requires (D1).
+    await installDefaultOrganization(engine);
     for (const u of USERS) await engine.insert('sys_user', u, { context: SYSTEM } as any);
 
     automation = new AutomationEngine(silent);

packages/plugins/plugin-approvals/src/remind-notified-per-person.integration.test.ts

@@ -46,6 +46,7 @@ import type { EngineQueryOptions } from '@objectstack/spec/data';
 import { ApprovalService } from './approval-service.js';
 import { ApprovalsServicePlugin } from './approvals-plugin.js';
 import { registerApprovalNode } from './approval-node.js';
+import { installDefaultOrganization } from './default-organization.testkit.js';
 
 const SYSTEM = { isSystem: true, positions: [], permissions: [] } as any;
 const asUser = (userId: string) => ({ userId, positions: [], permissions: [] }) as any;
@@ -180,6 +181,9 @@ describe('a reminder counts the reminders it hands over, one per distinct approv
       engine.registry.registerObject(def as any, 'approvals-test', 'approvals-test');
     }
     await engine.syncSchemas();
+    // A real `single` install's Default Organization: the system writes below
+    // derive it (ADR-0131 D9), as a fresh NOT NULL tenant column requires (D1).
+    await installDefaultOrganization(engine);
     for (const u of USERS) await engine.insert('sys_user', u, { context: SYSTEM } as any);
 
     automation = new AutomationEngine(silent);

packages/qa/dogfood/test/sharing-rule-criteria-required.dogfood.test.ts

@@ -25,7 +25,6 @@
 import { describe, it, expect, beforeAll, afterAll } from 'vitest';
 import { type VerifyStack } from '@objectstack/verify';
 import { bootShowcase } from './showcase-boot.js';
-import { relaxTenantColumns } from './pre-18-tenant-column.testkit.js';
 
 // Sharing-rule routes are anchored on the API base, not under `/data/:object`
 // (they administer rules tenant-wide) — `/api/v1/sharing/rules`.
@@ -153,11 +152,13 @@ describe('#3896 — a sharing rule POSTed without criteria is rejected, never ma
     const id = 'srule_3896_legacy';
     const driver = (ql as any).getDriverForObject('sys_sharing_rule');
     expect(driver, 'sys_sharing_rule driver must be resolvable').toBeTruthy();
-    // That residue lives only on a store built before 18.x, whose tenant column is
-    // nullable (ADR-0131 D1 makes a fresh one NOT NULL): the table is that store's.
-    await relaxTenantColumns(ql as any, ['sys_sharing_rule']);
+    // The legacy row belongs to the install's organization, as every row does
+    // since the ownership ceremony (ADR-0131 D1): its missing criteria is the
+    // subject here, not its owner.
+    const [organization] = (await ql.find('sys_organization', { context: SYS })) as Array<{ id: string }>;
     await driver.create('sys_sharing_rule', {
       id,
+      organization_id: organization.id,
       name: 'legacy_match_all_3896',
       label: 'Legacy match-all',
       object_name: OBJECT,