fix: add Date as distinct type from DateTime throughout the pipeline

engalar · engalar · commit 4ac63e5ec1ea · 2026-03-26T14:54:50.000+08:00
Date attributes are stored as DomainModels$DateTimeAttributeType with LocalizeDate=false in BSON. Added DateAttributeType (domain model) and DateType (microflows) structs. Parser now distinguishes Date (LocalizeDate=false) from DateTime (LocalizeDate=true). Updated all type switches in executor, formatters, writers, and catalog. Also fixed Long type mapping in cmd_dbconnection.go (DataTypes$LongType). Fixes #26
diff --git a/mdl/catalog/builder_microflows.go b/mdl/catalog/builder_microflows.go
@@ -318,6 +318,8 @@ func getDataTypeName(dt microflows.DataType) string {
 		return "String"
 	case *microflows.DateTimeType:
 		return "DateTime"
+	case *microflows.DateType:
+		return "Date"
 	case *microflows.ObjectType:
 		return "Object:" + t.EntityQualifiedName
 	case *microflows.ListType:
diff --git a/mdl/executor/cmd_constants.go b/mdl/executor/cmd_constants.go
@@ -178,6 +178,8 @@ func formatConstantType(dt model.ConstantDataType) string {
 		return "Boolean"
 	case "DateTime":
 		return "DateTime"
+	case "Date":
+		return "Date"
 	case "Binary":
 		return "Binary"
 	case "Enumeration":
@@ -218,6 +220,8 @@ func formatConstantTypeForMDL(dt model.ConstantDataType) string {
 		return "Boolean"
 	case "DateTime":
 		return "DateTime"
+	case "Date":
+		return "Date"
 	case "Binary":
 		return "Binary"
 	case "Enumeration":
@@ -397,6 +401,8 @@ func astDataTypeToConstantDataType(dt ast.DataType) model.ConstantDataType {
 		return model.ConstantDataType{Kind: "Boolean"}
 	case ast.TypeDateTime:
 		return model.ConstantDataType{Kind: "DateTime"}
+	case ast.TypeDate:
+		return model.ConstantDataType{Kind: "Date"}
 	case ast.TypeBinary:
 		return model.ConstantDataType{Kind: "Binary"}
 	case ast.TypeEnumeration:
diff --git a/mdl/executor/cmd_dbconnection.go b/mdl/executor/cmd_dbconnection.go
@@ -326,12 +326,12 @@ func astDataTypeToDBType(dt ast.DataType) string {
 	case ast.TypeInteger:
 		return "DataTypes$IntegerType"
 	case ast.TypeLong:
-		return "DataTypes$IntegerType"
+		return "DataTypes$LongType"
 	case ast.TypeDecimal:
 		return "DataTypes$DecimalType"
 	case ast.TypeBoolean:
 		return "DataTypes$BooleanType"
-	case ast.TypeDateTime:
+	case ast.TypeDateTime, ast.TypeDate:
 		return "DataTypes$DateTimeType"
 	default:
 		return "DataTypes$StringType"
diff --git a/mdl/executor/cmd_diff_local.go b/mdl/executor/cmd_diff_local.go
@@ -374,7 +374,11 @@ func (e *Executor) attributeBsonToMDL(raw map[string]any) string {
 		case strings.Contains(attrType, "BooleanAttributeType"):
 			typeStr = "Boolean"
 		case strings.Contains(attrType, "DateTimeAttributeType"):
-			typeStr = "DateTime"
+			if localize, ok := raw["LocalizeDate"].(bool); ok && localize {
+				typeStr = "DateTime"
+			} else {
+				typeStr = "Date"
+			}
 		case strings.Contains(attrType, "AutoNumberAttributeType"):
 			typeStr = "AutoNumber"
 		case strings.Contains(attrType, "BinaryAttributeType"):
@@ -404,7 +408,11 @@ func (e *Executor) attributeBsonToMDL(raw map[string]any) string {
 			case strings.Contains(typeType, "BooleanAttributeType"):
 				typeStr = "Boolean"
 			case strings.Contains(typeType, "DateTimeAttributeType"):
-				typeStr = "DateTime"
+				if localize, ok := typeObj["LocalizeDate"].(bool); ok && localize {
+					typeStr = "DateTime"
+				} else {
+					typeStr = "Date"
+				}
 			case strings.Contains(typeType, "AutoNumberAttributeType"):
 				typeStr = "AutoNumber"
 			case strings.Contains(typeType, "BinaryAttributeType"):
diff --git a/mdl/executor/cmd_diff_mdl.go b/mdl/executor/cmd_diff_mdl.go
@@ -638,7 +638,7 @@ func (e *Executor) dataTypeToString(dt ast.DataType) string {
 	case ast.TypeDateTime:
 		return "DateTime"
 	case ast.TypeDate:
-		return "DateTime"
+		return "Date"
 	case ast.TypeAutoNumber:
 		return "AutoNumber"
 	case ast.TypeBinary:
diff --git a/mdl/executor/cmd_microflows_helpers.go b/mdl/executor/cmd_microflows_helpers.go
@@ -27,8 +27,10 @@ func convertASTToMicroflowDataType(dt ast.DataType, entityResolver func(ast.Qual
 		return &microflows.DecimalType{}
 	case ast.TypeString:
 		return &microflows.StringType{}
-	case ast.TypeDateTime, ast.TypeDate:
+	case ast.TypeDateTime:
 		return &microflows.DateTimeType{}
+	case ast.TypeDate:
+		return &microflows.DateType{}
 	case ast.TypeBinary:
 		return &microflows.BinaryType{}
 	case ast.TypeVoid:
diff --git a/mdl/executor/cmd_microflows_show.go b/mdl/executor/cmd_microflows_show.go
@@ -525,6 +525,8 @@ func (e *Executor) formatMicroflowDataType(dt microflows.DataType, entityNames m
 		return "String"
 	case *microflows.DateTimeType:
 		return "DateTime"
+	case *microflows.DateType:
+		return "Date"
 	case *microflows.BinaryType:
 		return "Binary"
 	case *microflows.VoidType:
diff --git a/mdl/executor/cmd_pages_builder_input_filters.go b/mdl/executor/cmd_pages_builder_input_filters.go
@@ -24,7 +24,7 @@ func (pb *pageBuilder) getFilterWidgetIDForAttribute(attrPath string) string {
 	case *domainmodel.IntegerAttributeType, *domainmodel.LongAttributeType,
 		*domainmodel.DecimalAttributeType, *domainmodel.AutoNumberAttributeType:
 		return pages.WidgetIDDataGridNumberFilter
-	case *domainmodel.DateTimeAttributeType:
+	case *domainmodel.DateTimeAttributeType, *domainmodel.DateAttributeType:
 		return pages.WidgetIDDataGridDateFilter
 	case *domainmodel.BooleanAttributeType, *domainmodel.EnumerationAttributeType:
 		return pages.WidgetIDDataGridDropdownFilter
diff --git a/mdl/executor/cmd_pages_builder_v3.go b/mdl/executor/cmd_pages_builder_v3.go
@@ -967,7 +967,7 @@ func mdlTypeToBsonType(mdlType string) string {
 		return "DataTypes$LongType"
 	case "decimal":
 		return "DataTypes$DecimalType"
-	case "datetime":
+	case "datetime", "date":
 		return "DataTypes$DateTimeType"
 	default:
 		// Could be an entity type - use ObjectType
diff --git a/mdl/executor/cmd_structure.go b/mdl/executor/cmd_structure.go
@@ -990,6 +990,8 @@ func formatDataTypeDisplay(dt microflows.DataType) string {
 		return "String"
 	case *microflows.DateTimeType:
 		return "DateTime"
+	case *microflows.DateType:
+		return "Date"
 	case *microflows.ObjectType:
 		return shortName(t.EntityQualifiedName)
 	case *microflows.ListType:
diff --git a/mdl/executor/helpers.go b/mdl/executor/helpers.go
@@ -472,9 +472,9 @@ func convertDataType(dt ast.DataType) domainmodel.AttributeType {
 	case ast.TypeBoolean:
 		return &domainmodel.BooleanAttributeType{}
 	case ast.TypeDateTime:
-		return &domainmodel.DateTimeAttributeType{}
+		return &domainmodel.DateTimeAttributeType{LocalizeDate: true}
 	case ast.TypeDate:
-		return &domainmodel.DateTimeAttributeType{} // Date is a DateTime variant
+		return &domainmodel.DateAttributeType{}
 	case ast.TypeAutoNumber:
 		return &domainmodel.AutoNumberAttributeType{}
 	case ast.TypeBinary:
@@ -510,6 +510,8 @@ func getAttributeTypeName(at domainmodel.AttributeType) string {
 		return "Boolean"
 	case *domainmodel.DateTimeAttributeType:
 		return "DateTime"
+	case *domainmodel.DateAttributeType:
+		return "Date"
 	case *domainmodel.AutoNumberAttributeType:
 		return "AutoNumber"
 	case *domainmodel.BinaryAttributeType:
diff --git a/mdl/executor/oql_type_inference.go b/mdl/executor/oql_type_inference.go
@@ -704,6 +704,8 @@ func convertDomainModelTypeToAST(attrType domainmodel.AttributeType) ast.DataTyp
 		return ast.DataType{Kind: ast.TypeBoolean}
 	case *domainmodel.DateTimeAttributeType:
 		return ast.DataType{Kind: ast.TypeDateTime}
+	case *domainmodel.DateAttributeType:
+		return ast.DataType{Kind: ast.TypeDate}
 	case *domainmodel.AutoNumberAttributeType:
 		return ast.DataType{Kind: ast.TypeAutoNumber}
 	case *domainmodel.BinaryAttributeType:
@@ -786,6 +788,8 @@ func formatDataTypeForError(dt ast.DataType) string {
 		return "Boolean"
 	case ast.TypeDateTime:
 		return "DateTime"
+	case ast.TypeDate:
+		return "Date"
 	case ast.TypeAutoNumber:
 		return "AutoNumber"
 	case ast.TypeEnumeration:
@@ -816,6 +820,8 @@ func formatDataTypeForMDL(dt ast.DataType) string {
 		return "Boolean"
 	case ast.TypeDateTime:
 		return "DateTime"
+	case ast.TypeDate:
+		return "Date"
 	case ast.TypeAutoNumber:
 		return "AutoNumber"
 	case ast.TypeEnumeration:
diff --git a/sdk/domainmodel/domainmodel.go b/sdk/domainmodel/domainmodel.go
@@ -229,6 +229,17 @@ func (t *DateTimeAttributeType) GetTypeName() string {
 	return "DateTime"
 }
 
+// DateAttributeType represents a date-only attribute type (no time component).
+// Stored as DomainModels$DateTimeAttributeType with LocalizeDate=false in BSON.
+type DateAttributeType struct {
+	model.BaseElement
+}
+
+// GetTypeName returns the type name.
+func (t *DateAttributeType) GetTypeName() string {
+	return "Date"
+}
+
 // EnumerationAttributeType represents an enumeration attribute type.
 type EnumerationAttributeType struct {
 	model.BaseElement
diff --git a/sdk/microflows/microflows_datatypes.go b/sdk/microflows/microflows_datatypes.go
@@ -63,6 +63,15 @@ type DateTimeType struct {
 func (DateTimeType) isDataType()         {}
 func (DateTimeType) GetTypeName() string { return "DateTime" }
 
+// DateType represents a date-only type (no time component).
+// Stored as DataTypes$DateTimeType in BSON.
+type DateType struct {
+	model.BaseElement
+}
+
+func (DateType) isDataType()         {}
+func (DateType) GetTypeName() string { return "Date" }
+
 // ObjectType represents an object type.
 type ObjectType struct {
 	model.BaseElement
diff --git a/sdk/mpr/parser_domainmodel.go b/sdk/mpr/parser_domainmodel.go
@@ -299,12 +299,16 @@ func parseAttributeType(raw map[string]any) domainmodel.AttributeType {
 		t.ID = typeID
 		return t
 	case "DomainModels$DateTimeAttributeType":
-		t := &domainmodel.DateTimeAttributeType{}
-		t.ID = typeID
-		if localize, ok := raw["LocalizeDate"].(bool); ok {
-			t.LocalizeDate = localize
+		localize, _ := raw["LocalizeDate"].(bool)
+		if localize {
+			t := &domainmodel.DateTimeAttributeType{LocalizeDate: true}
+			t.ID = typeID
+			return t
 		}
-		return t
+		// LocalizeDate=false means date-only type
+		dt := &domainmodel.DateAttributeType{}
+		dt.ID = typeID
+		return dt
 	case "DomainModels$EnumerationAttributeType":
 		t := &domainmodel.EnumerationAttributeType{}
 		t.ID = typeID
diff --git a/sdk/mpr/writer_businessevents.go b/sdk/mpr/writer_businessevents.go
@@ -173,7 +173,7 @@ func attributeTypeToBsonType(typeName string) string {
 		return "DomainModels$IntegerAttributeType"
 	case "Boolean":
 		return "DomainModels$BooleanAttributeType"
-	case "DateTime":
+	case "DateTime", "Date":
 		return "DomainModels$DateTimeAttributeType"
 	case "Decimal":
 		return "DomainModels$DecimalAttributeType"
diff --git a/sdk/mpr/writer_domainmodel.go b/sdk/mpr/writer_domainmodel.go
@@ -794,7 +794,13 @@ func serializeAttribute(a *domainmodel.Attribute) bson.D {
 	// Attribute type with its own ID - use bson.D for ordered fields
 	typeName := "DomainModels$StringAttributeType"
 	if a.Type != nil {
-		typeName = "DomainModels$" + a.Type.GetTypeName() + "AttributeType"
+		switch a.Type.(type) {
+		case *domainmodel.DateAttributeType:
+			// Date is stored as DateTimeAttributeType with LocalizeDate=false
+			typeName = "DomainModels$DateTimeAttributeType"
+		default:
+			typeName = "DomainModels$" + a.Type.GetTypeName() + "AttributeType"
+		}
 	}
 
 	attrTypeID := generateUUID()
@@ -812,6 +818,10 @@ func serializeAttribute(a *domainmodel.Attribute) bson.D {
 		switch t := a.Type.(type) {
 		case *domainmodel.StringAttributeType:
 			attrType = append(attrType, bson.E{Key: "Length", Value: t.Length})
+		case *domainmodel.DateTimeAttributeType:
+			attrType = append(attrType, bson.E{Key: "LocalizeDate", Value: t.LocalizeDate})
+		case *domainmodel.DateAttributeType:
+			attrType = append(attrType, bson.E{Key: "LocalizeDate", Value: false})
 		case *domainmodel.EnumerationAttributeType:
 			// Enumeration uses BY_NAME_REFERENCE - store as qualified name string
 			enumRef := t.EnumerationRef
diff --git a/sdk/mpr/writer_enumeration.go b/sdk/mpr/writer_enumeration.go
@@ -175,7 +175,7 @@ func serializeConstantDataType(dt model.ConstantDataType) bson.D {
 			{Key: "$ID", Value: typeID},
 			{Key: "$Type", Value: "DataTypes$BooleanType"},
 		}
-	case "DateTime":
+	case "DateTime", "Date":
 		return bson.D{
 			{Key: "$ID", Value: typeID},
 			{Key: "$Type", Value: "DataTypes$DateTimeType"},
diff --git a/sdk/mpr/writer_microflow.go b/sdk/mpr/writer_microflow.go
@@ -268,7 +268,7 @@ func serializeMicroflowDataType(dt microflows.DataType) bson.D {
 			{Key: "$ID", Value: idToBsonBinary(generateUUID())},
 			{Key: "$Type", Value: "DataTypes$StringType"},
 		}
-	case *microflows.DateTimeType:
+	case *microflows.DateTimeType, *microflows.DateType:
 		return bson.D{
 			{Key: "$ID", Value: idToBsonBinary(generateUUID())},
 			{Key: "$Type", Value: "DataTypes$DateTimeType"},
