refactor: remove STORE syntax, use ALTER ENTITY ADD/DROP ATTRIBUTE for system attributes

System attributes now use the same ADD ATTRIBUTE / DROP ATTRIBUTE syntax
as regular attributes with pseudo-types:

  ALTER ENTITY Module.Entity ADD ATTRIBUTE Owner: AutoOwner;
  ALTER ENTITY Module.Entity DROP ATTRIBUTE Owner;

Removed SET/DROP STORE grammar rules, AST operations, visitor handlers,
and executor handlers. The STORE keyword is no longer used for entities.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: ako

.claude/skills/mendix/generate-domain-model.md

@@ -222,12 +222,12 @@ CREATE PERSISTENT ENTITY Sales.Order (
 );
 ```
 
-To enable/disable on existing entities, use ALTER ENTITY:
+To enable/disable on existing entities, use ALTER ENTITY ADD/DROP ATTRIBUTE:
 
 ```sql
-ALTER ENTITY Sales.Order SET STORE OWNER;
-ALTER ENTITY Sales.Order SET STORE CHANGED DATE;
-ALTER ENTITY Sales.Order DROP STORE CHANGED BY;
+ALTER ENTITY Sales.Order ADD ATTRIBUTE Owner: AutoOwner;
+ALTER ENTITY Sales.Order ADD ATTRIBUTE ChangedDate: AutoChangedDate;
+ALTER ENTITY Sales.Order DROP ATTRIBUTE ChangedBy;
 ```
 
 **When to use auditing:**

cmd/mxcli/help_topics/entity.txt

@@ -56,11 +56,9 @@ System Attributes (auditing):
     ChangedDate: AutoChangedDate
   );
 
-  Use ALTER ENTITY to toggle on existing entities:
-    ALTER ENTITY MyModule.Entity SET STORE OWNER;
-    ALTER ENTITY MyModule.Entity DROP STORE CHANGED DATE;
-
-  To toggle on existing entities, use ALTER ENTITY SET/DROP STORE.
+  Add/drop on existing entities with ALTER ENTITY:
+    ALTER ENTITY MyModule.Entity ADD ATTRIBUTE Owner: AutoOwner;
+    ALTER ENTITY MyModule.Entity DROP ATTRIBUTE ChangedDate;
 
 Complete Example:
   CREATE PERSISTENT ENTITY MyModule.Customer (

docs-site/src/language/alter-entity.md

@@ -89,26 +89,20 @@ ALTER ENTITY Sales.Customer
   SET DOCUMENTATION 'Customer master data for the Sales module';
 ```
 
-## SET/DROP STORE (System Attributes)
+## ADD/DROP System Attributes
 
-Enable or disable auditing system attributes:
+System attributes use the same ADD/DROP syntax as regular attributes:
 
 ```sql
--- Enable owner tracking (adds System.owner association)
-ALTER ENTITY Sales.Order SET STORE OWNER;
-
--- Enable changed-by tracking (adds System.changedBy association)
-ALTER ENTITY Sales.Order SET STORE CHANGED BY;
-
--- Enable created-date tracking (adds CreatedDate: DateTime)
-ALTER ENTITY Sales.Order SET STORE CREATED DATE;
-
--- Enable changed-date tracking (adds ChangedDate: DateTime)
-ALTER ENTITY Sales.Order SET STORE CHANGED DATE;
-
--- Disable any of the above
-ALTER ENTITY Sales.Order DROP STORE OWNER;
-ALTER ENTITY Sales.Order DROP STORE CHANGED DATE;
+-- Add system attributes
+ALTER ENTITY Sales.Order ADD ATTRIBUTE Owner: AutoOwner;
+ALTER ENTITY Sales.Order ADD ATTRIBUTE ChangedBy: AutoChangedBy;
+ALTER ENTITY Sales.Order ADD ATTRIBUTE CreatedDate: AutoCreatedDate;
+ALTER ENTITY Sales.Order ADD ATTRIBUTE ChangedDate: AutoChangedDate;
+
+-- Drop system attributes (by name)
+ALTER ENTITY Sales.Order DROP ATTRIBUTE Owner;
+ALTER ENTITY Sales.Order DROP ATTRIBUTE ChangedDate;
 ```
 
 ## ADD/DROP EVENT HANDLER
@@ -169,11 +163,6 @@ ALTER ENTITY <Module>.<Entity>
 ALTER ENTITY <Module>.<Entity>
   SET POSITION (<x>, <y>)
 
-ALTER ENTITY <Module>.<Entity>
-  SET STORE OWNER|CHANGED BY|CREATED DATE|CHANGED DATE
-
-ALTER ENTITY <Module>.<Entity>
-  DROP STORE OWNER|CHANGED BY|CREATED DATE|CHANGED DATE
 ```
 
 ## See Also

docs-site/src/language/entities.md

@@ -120,8 +120,8 @@ CREATE PERSISTENT ENTITY Sales.Order (
 Toggle on existing entities with ALTER ENTITY:
 
 ```sql
-ALTER ENTITY Sales.Order SET STORE OWNER;
-ALTER ENTITY Sales.Order DROP STORE CHANGED DATE;
+ALTER ENTITY Sales.Order ADD ATTRIBUTE Owner: AutoOwner;
+ALTER ENTITY Sales.Order DROP ATTRIBUTE ChangedDate;
 ```
 
 ## Annotations

docs/01-project/MDL_QUICK_REFERENCE.md

@@ -68,11 +68,8 @@ Modifies an existing entity without full replacement.
 | Drop event handler | `ALTER ENTITY Module.Name DROP EVENT HANDLER ON BEFORE COMMIT;` | |
 | Set documentation | `ALTER ENTITY Module.Name SET DOCUMENTATION 'text';` | |
 | Set position | `ALTER ENTITY Module.Name SET POSITION (100, 200);` | Canvas position |
-| Enable owner tracking | `ALTER ENTITY Module.Name SET STORE OWNER;` | Adds System.owner association |
-| Enable changed-by tracking | `ALTER ENTITY Module.Name SET STORE CHANGED BY;` | Adds System.changedBy association |
-| Enable created-date tracking | `ALTER ENTITY Module.Name SET STORE CREATED DATE;` | Adds CreatedDate attribute |
-| Enable changed-date tracking | `ALTER ENTITY Module.Name SET STORE CHANGED DATE;` | Adds ChangedDate attribute |
-| Disable any of the above | `ALTER ENTITY Module.Name DROP STORE OWNER\|CHANGED BY\|CREATED DATE\|CHANGED DATE;` | |
+| Add system attribute | `ALTER ENTITY Module.Name ADD ATTRIBUTE Owner: AutoOwner;` | Same syntax as regular attributes |
+| Drop system attribute | `ALTER ENTITY Module.Name DROP ATTRIBUTE Owner;` | Drop by system attribute name |
 
 **Example:**
 ```sql

mdl-examples/doctype-tests/16-xpath-examples.mdl

@@ -38,7 +38,7 @@ CREATE PERSISTENT ENTITY XpathTest.Order (
 );
 
 -- Enable System.owner so XPath can reference it
-ALTER ENTITY XpathTest.Order SET STORE OWNER;
+ALTER ENTITY XpathTest.Order ADD ATTRIBUTE Owner: AutoOwner;
 
 CREATE PERSISTENT ENTITY XpathTest.OrderLine (
   Quantity: Integer,

mdl-examples/doctype-tests/26-system-attribute-examples.mdl

@@ -11,7 +11,7 @@
 --   AutoChangedDate    -> ChangedDate: DateTime (auto-set on commit)
 --
 -- This file demonstrates enabling these both during CREATE ENTITY
--- (as pseudo-typed attributes) and via ALTER ENTITY (SET / DROP STORE).
+-- (as pseudo-typed attributes) and via ALTER ENTITY ADD/DROP ATTRIBUTE.
 --
 -- ============================================================================
 
@@ -52,10 +52,10 @@ CREATE OR MODIFY PERSISTENT ENTITY SysAttrTest.Customer (
   Email: String(200)
 );
 
-ALTER ENTITY SysAttrTest.Customer SET STORE OWNER;
-ALTER ENTITY SysAttrTest.Customer SET STORE CHANGED BY;
-ALTER ENTITY SysAttrTest.Customer SET STORE CREATED DATE;
-ALTER ENTITY SysAttrTest.Customer SET STORE CHANGED DATE;
+ALTER ENTITY SysAttrTest.Customer ADD ATTRIBUTE Owner: AutoOwner;
+ALTER ENTITY SysAttrTest.Customer ADD ATTRIBUTE ChangedBy: AutoChangedBy;
+ALTER ENTITY SysAttrTest.Customer ADD ATTRIBUTE CreatedDate: AutoCreatedDate;
+ALTER ENTITY SysAttrTest.Customer ADD ATTRIBUTE ChangedDate: AutoChangedDate;
 
 -- ============================================================================
 -- Example 4: ALTER ENTITY to disable previously enabled flags
@@ -67,9 +67,9 @@ CREATE OR MODIFY PERSISTENT ENTITY SysAttrTest.TempRecord (
   CreatedDate: AutoCreatedDate
 );
 
--- Disable both flags
-ALTER ENTITY SysAttrTest.TempRecord DROP STORE OWNER;
-ALTER ENTITY SysAttrTest.TempRecord DROP STORE CREATED DATE;
+-- Disable both flags (drop by system attribute name)
+ALTER ENTITY SysAttrTest.TempRecord DROP ATTRIBUTE Owner;
+ALTER ENTITY SysAttrTest.TempRecord DROP ATTRIBUTE CreatedDate;
 
 -- ============================================================================
 -- Example 5: Entity with event handlers

mdl/ast/ast_entity.go

@@ -66,15 +66,7 @@ const (
 	AlterEntitySetComment                             // SET COMMENT
 	AlterEntityAddIndex                               // ADD INDEX
 	AlterEntityDropIndex                              // DROP INDEX
-	AlterEntitySetStoreOwner                          // SET STORE OWNER
-	AlterEntitySetStoreChangedBy                      // SET STORE CHANGED BY
-	AlterEntitySetStoreCreatedDate                    // SET STORE CREATED DATE
-	AlterEntitySetStoreChangedDate                    // SET STORE CHANGED DATE
-	AlterEntityDropStoreOwner                         // DROP STORE OWNER
-	AlterEntityDropStoreChangedBy                     // DROP STORE CHANGED BY
-	AlterEntityDropStoreCreatedDate                   // DROP STORE CREATED DATE
-	AlterEntityDropStoreChangedDate                   // DROP STORE CHANGED DATE
-	AlterEntitySetPosition                            // SET POSITION (x, y)
+	AlterEntitySetPosition // SET POSITION (x, y)
 	AlterEntityAddEventHandler                        // ADD EVENT HANDLER ON BEFORE/AFTER CREATE/COMMIT/DELETE/ROLLBACK CALL Mod.MF
 	AlterEntityDropEventHandler                       // DROP EVENT HANDLER ON BEFORE/AFTER CREATE/COMMIT/DELETE/ROLLBACK
 )

mdl/executor/cmd_entities.go

@@ -495,6 +495,21 @@ func (e *Executor) execAlterEntity(s *ast.AlterEntityStmt) error {
 		if a == nil {
 			return fmt.Errorf("no attribute definition provided")
 		}
+		// Pseudo-types: set entity flags instead of adding real attributes
+		switch a.Type.Kind {
+		case ast.TypeAutoOwner:
+			entity.HasOwner = true
+			return e.writer.UpdateEntity(dm.ID, entity)
+		case ast.TypeAutoChangedBy:
+			entity.HasChangedBy = true
+			return e.writer.UpdateEntity(dm.ID, entity)
+		case ast.TypeAutoCreatedDate:
+			entity.HasCreatedDate = true
+			return e.writer.UpdateEntity(dm.ID, entity)
+		case ast.TypeAutoChangedDate:
+			entity.HasChangedDate = true
+			return e.writer.UpdateEntity(dm.ID, entity)
+		}
 		// CALCULATED attributes are only supported on persistent entities
 		if a.Calculated && !entity.Persistable {
 			return fmt.Errorf("attribute '%s': CALCULATED attributes are only supported on persistent entities", a.Name)
@@ -639,6 +654,30 @@ func (e *Executor) execAlterEntity(s *ast.AlterEntityStmt) error {
 		fmt.Fprintf(e.output, "Modified attribute '%s' on entity %s\n", s.AttributeName, s.Name)
 
 	case ast.AlterEntityDropAttribute:
+		// System attribute pseudo-names: drop by clearing entity flags
+		switch strings.ToLower(s.AttributeName) {
+		case "owner":
+			if entity.HasOwner {
+				entity.HasOwner = false
+				return e.writer.UpdateEntity(dm.ID, entity)
+			}
+		case "changedby":
+			if entity.HasChangedBy {
+				entity.HasChangedBy = false
+				return e.writer.UpdateEntity(dm.ID, entity)
+			}
+		case "createddate":
+			if entity.HasCreatedDate {
+				entity.HasCreatedDate = false
+				return e.writer.UpdateEntity(dm.ID, entity)
+			}
+		case "changeddate":
+			if entity.HasChangedDate {
+				entity.HasChangedDate = false
+				return e.writer.UpdateEntity(dm.ID, entity)
+			}
+		}
+
 		idx := -1
 		for i, attr := range entity.Attributes {
 			if attr.Name == s.AttributeName {
@@ -746,70 +785,6 @@ func (e *Executor) execAlterEntity(s *ast.AlterEntityStmt) error {
 		e.invalidateDomainModelsCache()
 		fmt.Fprintf(e.output, "Set comment on entity %s\n", s.Name)
 
-	case ast.AlterEntitySetStoreOwner:
-		entity.HasOwner = true
-		if err := e.writer.UpdateEntity(dm.ID, entity); err != nil {
-			return fmt.Errorf("failed to set store owner: %w", err)
-		}
-		e.invalidateDomainModelsCache()
-		fmt.Fprintf(e.output, "Enabled store owner on entity %s\n", s.Name)
-
-	case ast.AlterEntitySetStoreChangedBy:
-		entity.HasChangedBy = true
-		if err := e.writer.UpdateEntity(dm.ID, entity); err != nil {
-			return fmt.Errorf("failed to set store changed by: %w", err)
-		}
-		e.invalidateDomainModelsCache()
-		fmt.Fprintf(e.output, "Enabled store changed by on entity %s\n", s.Name)
-
-	case ast.AlterEntitySetStoreCreatedDate:
-		entity.HasCreatedDate = true
-		if err := e.writer.UpdateEntity(dm.ID, entity); err != nil {
-			return fmt.Errorf("failed to set store created date: %w", err)
-		}
-		e.invalidateDomainModelsCache()
-		fmt.Fprintf(e.output, "Enabled store created date on entity %s\n", s.Name)
-
-	case ast.AlterEntitySetStoreChangedDate:
-		entity.HasChangedDate = true
-		if err := e.writer.UpdateEntity(dm.ID, entity); err != nil {
-			return fmt.Errorf("failed to set store changed date: %w", err)
-		}
-		e.invalidateDomainModelsCache()
-		fmt.Fprintf(e.output, "Enabled store changed date on entity %s\n", s.Name)
-
-	case ast.AlterEntityDropStoreOwner:
-		entity.HasOwner = false
-		if err := e.writer.UpdateEntity(dm.ID, entity); err != nil {
-			return fmt.Errorf("failed to drop store owner: %w", err)
-		}
-		e.invalidateDomainModelsCache()
-		fmt.Fprintf(e.output, "Disabled store owner on entity %s\n", s.Name)
-
-	case ast.AlterEntityDropStoreChangedBy:
-		entity.HasChangedBy = false
-		if err := e.writer.UpdateEntity(dm.ID, entity); err != nil {
-			return fmt.Errorf("failed to drop store changed by: %w", err)
-		}
-		e.invalidateDomainModelsCache()
-		fmt.Fprintf(e.output, "Disabled store changed by on entity %s\n", s.Name)
-
-	case ast.AlterEntityDropStoreCreatedDate:
-		entity.HasCreatedDate = false
-		if err := e.writer.UpdateEntity(dm.ID, entity); err != nil {
-			return fmt.Errorf("failed to drop store created date: %w", err)
-		}
-		e.invalidateDomainModelsCache()
-		fmt.Fprintf(e.output, "Disabled store created date on entity %s\n", s.Name)
-
-	case ast.AlterEntityDropStoreChangedDate:
-		entity.HasChangedDate = false
-		if err := e.writer.UpdateEntity(dm.ID, entity); err != nil {
-			return fmt.Errorf("failed to drop store changed date: %w", err)
-		}
-		e.invalidateDomainModelsCache()
-		fmt.Fprintf(e.output, "Disabled store changed date on entity %s\n", s.Name)
-
 	case ast.AlterEntitySetPosition:
 		if s.Position == nil {
 			return fmt.Errorf("no position provided")

mdl/grammar/MDLParser.g4

@@ -773,14 +773,6 @@ alterEntityAction
     | DROP COLUMN attributeName
     | SET DOCUMENTATION STRING_LITERAL
     | SET COMMENT STRING_LITERAL
-    | SET STORE OWNER
-    | SET STORE CHANGED BY
-    | SET STORE CREATED DATE_TYPE
-    | SET STORE CHANGED DATE_TYPE
-    | DROP STORE OWNER
-    | DROP STORE CHANGED BY
-    | DROP STORE CREATED DATE_TYPE
-    | DROP STORE CHANGED DATE_TYPE
     | SET POSITION LPAREN NUMBER_LITERAL COMMA NUMBER_LITERAL RPAREN
     | ADD INDEX indexDefinition
     | DROP INDEX IDENTIFIER