feat(csharp): source-v2 codegen + test-fixture cutover to source.rdb / @column

dmealing · claude · dmealing · commit 8da7f2d682ba · 2026-05-24T19:38:51.000-04:00
Migrates Codegen + Cli test fixtures from the v1 (source.dbTable/source.dbView with @name, field @dbColumn) vocabulary to the v2 (source.rdb with @table + @kind, field @column) vocabulary. Two test fixtures with the canonical-spec violation `"@isarray": true` corrected to the reserved bare key form `"isArray": true` — the v2 canonical parser now rejects the @-prefixed form (ERR_RESERVED_ATTR), which exposed the latent bug. Threads relationship referential actions into the full-CREATE FK emitter: MetaRelationship.EffectiveOnDelete / EffectiveOnUpdate resolve the explicit attr or fall back to the per-subtype default (composition→cascade, aggregation→set-null, association→restrict; update default cascade). New ReferentialActions.Resolve(entity, target) picks the relationship by @objectref match and returns the action pair; PostgresSchema.ForeignKeyClause appends ON DELETE / ON UPDATE clauses and fails loudly on set-null over a NOT NULL FK column (mirrors Java SetNullNotNullableError). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
diff --git a/server/csharp/MetaObjects.Cli.Tests/GenCommandTests.cs b/server/csharp/MetaObjects.Cli.Tests/GenCommandTests.cs
@@ -13,7 +13,7 @@ public sealed class GenCommandTests : IDisposable
     private const string Metadata = """
     { "metadata.root": { "package": "acme", "children": [
       { "object.entity": { "name": "Subscriber", "children": [
-        { "source.dbTable": { "@name": "subscribers" } },
+        { "source.rdb": { "@table": "subscribers" } },
         { "field.long":   { "name": "id" } },
         { "field.string": { "name": "email", "@required": true } },
         { "identity.primary": { "@fields": "id" } }
diff --git a/server/csharp/MetaObjects.Cli.Tests/MigrateCommandTests.cs b/server/csharp/MetaObjects.Cli.Tests/MigrateCommandTests.cs
@@ -13,7 +13,7 @@ public sealed class MigrateCommandTests : IDisposable
     private const string Metadata = """
     { "metadata.root": { "package": "acme", "children": [
       { "object.entity": { "name": "Subscriber", "children": [
-        { "source.dbTable": { "@name": "subscribers" } },
+        { "source.rdb": { "@table": "subscribers" } },
         { "field.long":   { "name": "id" } },
         { "field.string": { "name": "email", "@required": true } },
         { "identity.primary": { "@fields": "id" } }
diff --git a/server/csharp/MetaObjects.Codegen.Tests/DbContextCompileTests.cs b/server/csharp/MetaObjects.Codegen.Tests/DbContextCompileTests.cs
@@ -42,7 +42,7 @@ public class DbContextCompileTests
         { "field.string": { "name": "city",   "@maxLength": 80 } }
       ]}},
       { "object.entity": { "name": "Order", "children": [
-        { "source.dbTable": { "@name": "orders" } },
+        { "source.rdb": { "@table": "orders" } },
         { "field.long":   { "name": "id" } },
         { "field.enum":   { "name": "status",   "@values": ["DRAFT", "PUBLISHED", "ARCHIVED"] } },
         { "field.enum":   { "name": "statuses", "isArray": true, "@values": ["DRAFT", "PUBLISHED", "ARCHIVED"] } },
@@ -52,7 +52,7 @@ public class DbContextCompileTests
         { "identity.primary": { "@fields": "id" } }
       ]}},
       { "object.entity": { "name": "ProgramSummary", "children": [
-        { "source.dbView": { "@name": "v_program_summary" } },
+        { "source.rdb": { "@kind": "view", "@table": "v_program_summary" } },
         { "field.long": { "name": "id" } },
         { "field.int":  { "name": "weekCount" } },
         { "identity.primary": { "@fields": "id" } }
diff --git a/server/csharp/MetaObjects.Codegen.Tests/DemoTests.cs b/server/csharp/MetaObjects.Codegen.Tests/DemoTests.cs
@@ -30,7 +30,7 @@ public class DemoTests
           { "object.value": { "name": "AuthorBrief", "children": [
             { "field.string": { "name": "displayName" } },
             { "field.int": { "name": "postCount" } },
-            { "field.object": { "name": "posts", "@isArray": true, "@objectRef": "PostBrief",
+            { "field.object": { "name": "posts", "isArray": true, "@objectRef": "PostBrief",
               "children": [ { "origin.collection": { "@via": "Author.posts" } } ] } }
           ]}},
           { "template.prompt": { "name": "contentStrategyPrompt",
diff --git a/server/csharp/MetaObjects.Codegen.Tests/EntityGeneratorTests.cs b/server/csharp/MetaObjects.Codegen.Tests/EntityGeneratorTests.cs
@@ -13,7 +13,7 @@ public class EntityGeneratorTests
     private const string Model = """
     { "metadata.root": { "package": "acme", "children": [
       { "object.entity": { "name": "Subscriber", "children": [
-        { "source.dbTable": { "@name": "subscribers" } },
+        { "source.rdb": { "@table": "subscribers" } },
         { "field.long":    { "name": "id" } },
         { "field.string":  { "name": "email", "@required": true, "@maxLength": 255 } },
         { "field.boolean": { "name": "subscribed" } },
@@ -113,7 +113,7 @@ public void Routes_generator_emits_crud_endpoints()
     private const string EnumModel = """
     { "metadata.root": { "package": "acme", "children": [
       { "object.entity": { "name": "Order", "children": [
-        { "source.dbTable": { "@name": "orders" } },
+        { "source.rdb": { "@table": "orders" } },
         { "field.long":    { "name": "id" } },
         { "field.enum":    { "name": "status", "@values": ["DRAFT", "PUBLISHED", "ARCHIVED"] } },
         { "identity.primary": { "@fields": "id" } }
@@ -155,7 +155,7 @@ public void Enum_field_property_is_required_when_in_pk()
         const string model = """
         { "metadata.root": { "package": "acme", "children": [
           { "object.entity": { "name": "Order", "children": [
-            { "source.dbTable": { "@name": "orders" } },
+            { "source.rdb": { "@table": "orders" } },
             { "field.enum": { "name": "kind", "@values": ["A", "B"] } },
             { "identity.primary": { "@fields": "kind" } }
           ]}}
@@ -176,7 +176,7 @@ public void Enum_abstract_extends_uses_super_name_as_enum_type_name()
         { "metadata.root": { "package": "acme", "children": [
           { "field.enum": { "name": "Status", "abstract": true, "@values": ["DRAFT", "PUBLISHED"] } },
           { "object.entity": { "name": "Order", "children": [
-            { "source.dbTable": { "@name": "orders" } },
+            { "source.rdb": { "@table": "orders" } },
             { "field.long": { "name": "id" } },
             { "field.enum": { "name": "status", "extends": "Status" } },
             { "identity.primary": { "@fields": "id" } }
@@ -242,7 +242,7 @@ public void Two_fields_extending_same_abstract_enum_emit_declaration_exactly_onc
         { "metadata.root": { "package": "acme", "children": [
           { "field.enum": { "name": "OrderStatus", "abstract": true, "@values": ["DRAFT", "PUBLISHED"] } },
           { "object.entity": { "name": "Order", "children": [
-            { "source.dbTable": { "@name": "orders" } },
+            { "source.rdb": { "@table": "orders" } },
             { "field.long": { "name": "id" } },
             { "field.enum": { "name": "currentStatus",  "extends": "OrderStatus" } },
             { "field.enum": { "name": "previousStatus", "extends": "OrderStatus" } },
diff --git a/server/csharp/MetaObjects.Codegen.Tests/ObjectFieldCodegenTests.cs b/server/csharp/MetaObjects.Codegen.Tests/ObjectFieldCodegenTests.cs
@@ -20,7 +20,7 @@ public class ObjectFieldCodegenTests
         { "field.string": { "name": "city", "@maxLength": 80 } }
       ]}},
       { "object.entity": { "name": "Customer", "children": [
-        { "source.dbTable": { "@name": "customers" } },
+        { "source.rdb": { "@table": "customers" } },
         { "field.long":   { "name": "id" } },
         { "field.string": { "name": "name", "@required": true } },
         { "field.object": { "name": "homeAddress", "@objectRef": "Address", "@storage": "flattened" } },
diff --git a/server/csharp/MetaObjects.Codegen.Tests/PayloadCodegenTests.cs b/server/csharp/MetaObjects.Codegen.Tests/PayloadCodegenTests.cs
@@ -26,7 +26,7 @@ public class PayloadCodegenTests
           { "object.value": { "name": "AuthorBrief", "children": [
             { "field.string": { "name": "displayName" } },
             { "field.int": { "name": "postCount" } },
-            { "field.object": { "name": "posts", "@isArray": true, "@objectRef": "PostBrief",
+            { "field.object": { "name": "posts", "isArray": true, "@objectRef": "PostBrief",
               "children": [ { "origin.collection": { "@via": "Author.posts" } } ] } }
           ]}},
           { "template.prompt": { "name": "contentStrategyPrompt",
diff --git a/server/csharp/MetaObjects.Codegen.Tests/PostgresSchemaTests.cs b/server/csharp/MetaObjects.Codegen.Tests/PostgresSchemaTests.cs
@@ -18,15 +18,15 @@ public class PostgresSchemaTests
     private const string Model = """
     { "metadata.root": { "package": "acme", "children": [
       { "object.entity": { "name": "Week", "children": [
-        { "source.dbTable": { "@name": "weeks" } },
+        { "source.rdb": { "@table": "weeks" } },
         { "field.long": { "name": "id" } },
         { "field.long": { "name": "programId" } },
         { "identity.primary": { "@fields": "id" } },
         { "identity.reference": { "name": "fkProgram", "@fields": "programId", "@references": "Program" } },
         { "relationship.association": { "name": "program", "@objectRef": "Program", "@cardinality": "one" } }
       ]}},
       { "object.entity": { "name": "Tag", "children": [
-        { "source.dbTable": { "@name": "tags" } },
+        { "source.rdb": { "@table": "tags" } },
         { "field.long": { "name": "id" } },
         { "field.long": { "name": "programId" } },
         { "identity.primary": { "@fields": "id" } },
@@ -37,7 +37,7 @@ public class PostgresSchemaTests
         { "field.string": { "name": "city", "@maxLength": 80 } }
       ]}},
       { "object.entity": { "name": "Program", "children": [
-        { "source.dbTable": { "@name": "programs" } },
+        { "source.rdb": { "@table": "programs" } },
         { "field.long":   { "name": "id" } },
         { "field.string": { "name": "title", "@required": true, "@maxLength": 200 } },
         { "field.object": { "name": "homeAddress", "@objectRef": "Address", "@storage": "flattened" } },
@@ -47,25 +47,25 @@ public class PostgresSchemaTests
         { "identity.secondary": { "name": "byTitle", "@fields": "title", "@unique": true } }
       ]}},
       { "object.value": { "name": "ProgramView", "children": [
-        { "source.dbView": { "@name": "v_program" } },
+        { "source.rdb": { "@kind": "view", "@table": "v_program" } },
         { "field.long":   { "name": "id",    "children": [ { "origin.passthrough": { "@from": "Program.id" } } ] } },
         { "field.string": { "name": "title", "children": [ { "origin.passthrough": { "@from": "Program.title" } } ] } }
       ]}},
       { "object.value": { "name": "ProgramStat", "children": [
-        { "source.dbView": { "@name": "v_program_stat" } },
+        { "source.rdb": { "@kind": "view", "@table": "v_program_stat" } },
         { "field.int": { "name": "weekCount", "children": [
           { "origin.aggregate": { "@agg": "count", "@of": "Week.id", "@via": "Program.weeks" } }
         ]}}
       ]}},
       { "object.value": { "name": "WeekDetail", "children": [
-        { "source.dbView": { "@name": "v_week_detail" } },
+        { "source.rdb": { "@kind": "view", "@table": "v_week_detail" } },
         { "field.long":   { "name": "id", "children": [ { "origin.passthrough": { "@from": "Week.id" } } ] } },
         { "field.string": { "name": "programTitle", "children": [
           { "origin.passthrough": { "@from": "Program.title", "@via": "Week.program" } }
         ]}}
       ]}},
       { "object.value": { "name": "ProgramWithWeeks", "children": [
-        { "source.dbView": { "@name": "v_program_weeks" } },
+        { "source.rdb": { "@kind": "view", "@table": "v_program_weeks" } },
         { "field.long":   { "name": "id", "children": [ { "origin.passthrough": { "@from": "Program.id" } } ] } },
         { "field.object": { "name": "weeks", "@objectRef": "Week", "children": [
           { "origin.collection": { "@via": "Program.weeks" } }
@@ -122,7 +122,7 @@ public void Composite_pk_and_unique_index_preserve_declared_field_order()
         const string m = """
         { "metadata.root": { "package": "acme", "children": [
           { "object.entity": { "name": "Link", "children": [
-            { "source.dbTable": { "@name": "links" } },
+            { "source.rdb": { "@table": "links" } },
             { "field.long": { "name": "a" } },
             { "field.long": { "name": "b" } },
             { "identity.primary": { "@fields": ["b", "a"] } },
@@ -219,7 +219,7 @@ public void Comment_on_table_emits_from_entity_description()
           { "object.entity": { "name": "Item",
             "@description": "A catalog item.",
             "children": [
-              { "source.dbTable": { "@name": "items" } },
+              { "source.rdb": { "@table": "items" } },
               { "field.long": { "name": "id" } },
               { "identity.primary": { "@fields": "id" } }
             ]
@@ -238,7 +238,7 @@ public void Comment_on_column_emits_from_field_description()
         const string m = """
         { "metadata.root": { "package": "acme", "children": [
           { "object.entity": { "name": "Item", "children": [
-              { "source.dbTable": { "@name": "items" } },
+              { "source.rdb": { "@table": "items" } },
               { "field.long": { "name": "id" } },
               { "field.string": { "name": "sku", "@description": "Stock keeping unit." } },
               { "identity.primary": { "@fields": "id" } }
@@ -258,7 +258,7 @@ public void Comment_on_column_single_quote_in_description_is_escaped()
         const string m = """
         { "metadata.root": { "package": "acme", "children": [
           { "object.entity": { "name": "Item", "children": [
-              { "source.dbTable": { "@name": "items" } },
+              { "source.rdb": { "@table": "items" } },
               { "field.long": { "name": "id" } },
               { "field.string": { "name": "label", "@description": "It's a label." } },
               { "identity.primary": { "@fields": "id" } }
@@ -278,7 +278,7 @@ public void No_description_produces_no_comment_statements()
         const string m = """
         { "metadata.root": { "package": "acme", "children": [
           { "object.entity": { "name": "Item", "children": [
-              { "source.dbTable": { "@name": "items" } },
+              { "source.rdb": { "@table": "items" } },
               { "field.long": { "name": "id" } },
               { "identity.primary": { "@fields": "id" } }
             ]
@@ -300,7 +300,7 @@ public void Notes_content_NEVER_appears_in_DDL()
             "@description": "Public description.",
             "@notes": "__DDL_INTERNAL__",
             "children": [
-              { "source.dbTable": { "@name": "items" } },
+              { "source.rdb": { "@table": "items" } },
               { "field.long": { "name": "id" } },
               { "identity.primary": { "@fields": "id" } }
             ]
diff --git a/server/csharp/MetaObjects.Codegen.Tests/ProjectionTests.cs b/server/csharp/MetaObjects.Codegen.Tests/ProjectionTests.cs
@@ -18,13 +18,13 @@ public class ProjectionTests
     private const string Model = """
     { "metadata.root": { "package": "acme", "children": [
       { "object.entity": { "name": "ProgramSummary", "children": [
-        { "source.dbView": { "@name": "v_program_summary" } },
+        { "source.rdb": { "@kind": "view", "@table": "v_program_summary" } },
         { "field.long": { "name": "id" } },
         { "field.int":  { "name": "weekCount" } },
         { "identity.primary": { "@fields": "id" } }
       ]}},
       { "object.value": { "name": "TagCount", "children": [
-        { "source.dbView": { "@name": "v_tag_count" } },
+        { "source.rdb": { "@kind": "view", "@table": "v_tag_count" } },
         { "field.string": { "name": "tag" } },
         { "field.int":    { "name": "count" } }
       ]}}
diff --git a/server/csharp/MetaObjects.Codegen.Tests/ScalarArrayCodegenTests.cs b/server/csharp/MetaObjects.Codegen.Tests/ScalarArrayCodegenTests.cs
@@ -31,7 +31,7 @@ public class ScalarArrayCodegenTests
     private const string ScalarArrayModel = """
     { "metadata.root": { "package": "acme", "children": [
       { "object.entity": { "name": "Product", "children": [
-        { "source.dbTable": { "@name": "products" } },
+        { "source.rdb": { "@table": "products" } },
         { "field.long":   { "name": "id" } },
         { "field.string": { "name": "tags", "isArray": true } },
         { "identity.primary": { "@fields": "id" } }
@@ -43,7 +43,7 @@ public class ScalarArrayCodegenTests
     private const string EnumArrayModel = """
     { "metadata.root": { "package": "acme", "children": [
       { "object.entity": { "name": "Order", "children": [
-        { "source.dbTable": { "@name": "orders" } },
+        { "source.rdb": { "@table": "orders" } },
         { "field.long": { "name": "id" } },
         { "field.enum": { "name": "statuses", "isArray": true, "@values": ["DRAFT", "PUBLISHED", "ARCHIVED"] } },
         { "identity.primary": { "@fields": "id" } }
@@ -56,7 +56,7 @@ public class ScalarArrayCodegenTests
     private const string MixedEnumModel = """
     { "metadata.root": { "package": "acme", "children": [
       { "object.entity": { "name": "Order", "children": [
-        { "source.dbTable": { "@name": "orders" } },
+        { "source.rdb": { "@table": "orders" } },
         { "field.long": { "name": "id" } },
         { "field.enum": { "name": "status",   "@values": ["DRAFT", "PUBLISHED", "ARCHIVED"] } },
         { "field.enum": { "name": "statuses", "isArray": true, "@values": ["DRAFT", "PUBLISHED", "ARCHIVED"] } },
diff --git a/server/csharp/MetaObjects.Codegen/Schema/PostgresSchema.cs b/server/csharp/MetaObjects.Codegen/Schema/PostgresSchema.cs
@@ -26,6 +26,7 @@
 // in the csharp-migration-pipeline-status memory.
 
 using System.Text;
+using MetaObjects.Codegen.Migrate;
 using MetaObjects.Core.Documentation;
 using MetaObjects.Meta;
 using static MetaObjects.Core.Field.FieldConstants;
@@ -164,7 +165,9 @@ private static IEnumerable<string> ObjectFieldColumns(MetaObject entity, MetaFie
     // A table-level FOREIGN KEY constraint for an enforced reference identity.
     // FK columns keep the reference's declared @fields order; target columns are
     // the explicit dotted @references fields (multi-col) or the target's primary
-    // identity (single-col / bare form), falling back to "id".
+    // identity (single-col / bare form), falling back to "id". Referential
+    // actions (ON DELETE / ON UPDATE) come from the matching relationship's
+    // effective @onDelete / @onUpdate (source-v2 ADR-0007).
     private static string? ForeignKeyClause(MetaObject entity, MetaReferenceIdentity fk, MetaRoot root)
     {
         if (fk.TargetEntity is not { } targetName || fk.Fields.Count == 0) return null;
@@ -178,8 +181,33 @@ private static IEnumerable<string> ObjectFieldColumns(MetaObject entity, MetaFie
 
         var name = $"{CSharpNaming.Table(entity)}_{fkCols[0]}_fk";
         var refTable = CSharpNaming.Table(target);
-        return $"  CONSTRAINT {name} FOREIGN KEY ({string.Join(", ", fkCols)}) " +
-               $"REFERENCES {refTable} ({string.Join(", ", refCols)})";
+
+        // Resolve referential actions from the matching relationship (if any).
+        var actions = ReferentialActions.Resolve(entity, CSharpNaming.StripPkg(targetName));
+
+        // Set-null on a NOT NULL FK column is a contradiction — fail loudly so the
+        // user can tighten one side or the other. Mirrors Java SetNullNotNullableError.
+        if (actions.OnDelete is FkAction.SetNull)
+        {
+            foreach (var jsField in fk.Fields)
+            {
+                var field = entity.FindField(jsField);
+                if (field is not null && CSharpNaming.IsRequired(entity, field))
+                {
+                    throw new InvalidOperationException(
+                        $"FK {CSharpNaming.Table(entity)}.{ResolveColumn(entity, jsField)} → " +
+                        $"{refTable}: @onDelete \"set-null\" requires the FK column to be nullable, " +
+                        $"but {entity.Name}.{jsField} is NOT NULL. Either make the field nullable " +
+                        $"or change the relationship's @onDelete.");
+                }
+            }
+        }
+
+        var clause = $"  CONSTRAINT {name} FOREIGN KEY ({string.Join(", ", fkCols)}) " +
+                     $"REFERENCES {refTable} ({string.Join(", ", refCols)})";
+        if (actions.OnDelete is { } d) clause += $" ON DELETE {ReferentialActions.FkActionSql(d)}";
+        if (actions.OnUpdate is { } u) clause += $" ON UPDATE {ReferentialActions.FkActionSql(u)}";
+        return clause;
     }
 
     // The single target column a reference resolves to: the lone explicit @references
diff --git a/server/csharp/MetaObjects.Codegen/Schema/ReferentialActions.cs b/server/csharp/MetaObjects.Codegen/Schema/ReferentialActions.cs
diff --git a/server/csharp/MetaObjects/Meta/MetaRelationship.cs b/server/csharp/MetaObjects/Meta/MetaRelationship.cs
