Do not set the attributeValueClassName

helje5 · helje5 · commit a971db337e7e · 2023-10-07T14:21:18.000+02:00
Gives issues w/ optional base types when nil is
set (converted to `NSNull` which then doesn't
match an internal preconditions).
diff --git a/Sources/ManagedModels/SchemaCompatibility/CoreDataPrimitiveValue.swift b/Sources/ManagedModels/SchemaCompatibility/CoreDataPrimitiveValue.swift
@@ -9,7 +9,7 @@ public extension CoreData.NSAttributeDescription {
   struct TypeConfiguration {
     let attributeType           : NSAttributeType
     let isOptional              : Bool
-    let attributeValueClassName : String
+    let attributeValueClassName : String?
   }
 }
 
@@ -37,35 +37,35 @@ extension Int: CoreDataPrimitiveValue {
   public static let coreDataValue = NSAttributeDescription.TypeConfiguration(
     attributeType           : .integer64AttributeType,
     isOptional              : false,
-    attributeValueClassName : "NSNumber"
+    attributeValueClassName : nil
   )
 }
 extension Int16: CoreDataPrimitiveValue {
   public static let coreDataValue = NSAttributeDescription.TypeConfiguration(
     attributeType           : .integer16AttributeType,
     isOptional              : false,
-    attributeValueClassName : "NSNumber"
+    attributeValueClassName : nil
   )
 }
 extension Int32: CoreDataPrimitiveValue {
   public static let coreDataValue = NSAttributeDescription.TypeConfiguration(
     attributeType           : .integer32AttributeType,
     isOptional              : false,
-    attributeValueClassName : "NSNumber"
+    attributeValueClassName : nil
   )
 }
 extension Int64: CoreDataPrimitiveValue {
   public static let coreDataValue = NSAttributeDescription.TypeConfiguration(
     attributeType           : .integer64AttributeType,
     isOptional              : false,
-    attributeValueClassName : "NSNumber"
+    attributeValueClassName : nil
   )
 }
 extension Int8: CoreDataPrimitiveValue {
   public static let coreDataValue = NSAttributeDescription.TypeConfiguration(
     attributeType           : .integer16AttributeType,
     isOptional              : false,
-    attributeValueClassName : "NSNumber"
+    attributeValueClassName : nil
   )
 }
 
@@ -91,30 +91,30 @@ extension String: CoreDataPrimitiveValue {
   public static let coreDataValue = NSAttributeDescription.TypeConfiguration(
     attributeType           : .stringAttributeType,
     isOptional              : false,
-    attributeValueClassName : "NSString"
+    attributeValueClassName : nil
   )
 }
 
 extension Bool: CoreDataPrimitiveValue {
   public static let coreDataValue = NSAttributeDescription.TypeConfiguration(
     attributeType           : .booleanAttributeType,
     isOptional              : false,
-    attributeValueClassName : "NSNumber"
+    attributeValueClassName : nil
   )
 }
 
 extension Double: CoreDataPrimitiveValue {
   public static let coreDataValue = NSAttributeDescription.TypeConfiguration(
     attributeType           : .doubleAttributeType,
     isOptional              : false,
-    attributeValueClassName : "NSNumber"
+    attributeValueClassName : nil
   )
 }
 extension Float: CoreDataPrimitiveValue {
   public static let coreDataValue = NSAttributeDescription.TypeConfiguration(
     attributeType           : .floatAttributeType,
     isOptional              : false,
-    attributeValueClassName : "NSNumber"
+    attributeValueClassName : nil
   )
 }
 
@@ -124,38 +124,38 @@ extension Date: CoreDataPrimitiveValue {
   public static let coreDataValue = NSAttributeDescription.TypeConfiguration(
     attributeType           : .dateAttributeType,
     isOptional              : false,
-    attributeValueClassName : "NSDate"
+    attributeValueClassName : nil
   )
 }
 
 extension Data: CoreDataPrimitiveValue {
   public static let coreDataValue = NSAttributeDescription.TypeConfiguration(
     attributeType           : .binaryDataAttributeType,
     isOptional              : false,
-    attributeValueClassName : "NSDate"
+    attributeValueClassName : nil
   )
 }
 
 extension Decimal: CoreDataPrimitiveValue {
   public static let coreDataValue = NSAttributeDescription.TypeConfiguration(
     attributeType           : .decimalAttributeType,
     isOptional              : false,
-    attributeValueClassName : "NSDecimalNumber"
+    attributeValueClassName : nil
   )
 }
 
 extension UUID: CoreDataPrimitiveValue {
   public static let coreDataValue = NSAttributeDescription.TypeConfiguration(
     attributeType           : .UUIDAttributeType,
     isOptional              : false,
-    attributeValueClassName : "NSUUID"
+    attributeValueClassName : nil
   )
 }
 
 extension URL: CoreDataPrimitiveValue {
   public static let coreDataValue = NSAttributeDescription.TypeConfiguration(
     attributeType           : .URIAttributeType,
     isOptional              : false,
-    attributeValueClassName : "NSURL"
+    attributeValueClassName : nil
   )
 }
diff --git a/Sources/ManagedModels/SchemaCompatibility/NSAttributeDescription+Data.swift b/Sources/ManagedModels/SchemaCompatibility/NSAttributeDescription+Data.swift
@@ -42,7 +42,9 @@ extension CoreData.NSAttributeDescription: SchemaProperty {
         let config = primitiveType.coreDataValue
         self.attributeType           = config.attributeType
         self.isOptional              = config.isOptional
-        self.attributeValueClassName = config.attributeValueClassName
+        if let newClassName = config.attributeValueClassName {
+          self.attributeValueClassName = newClassName
+        }
         return
       }
       
@@ -55,7 +57,9 @@ extension CoreData.NSAttributeDescription: SchemaProperty {
             let config = primitiveType.coreDataValue
             self.attributeType           = config.attributeType
             self.isOptional              = config.isOptional
-            self.attributeValueClassName = config.attributeValueClassName
+            if let newClassName = config.attributeValueClassName {
+              self.attributeValueClassName = newClassName
+            }
             return true
           }
           else {

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public extension CoreData.NSAttributeDescription {`
`9`	`9`	`struct TypeConfiguration {`
`10`	`10`	`let attributeType : NSAttributeType`
`11`	`11`	`let isOptional : Bool`
`12`		`- let attributeValueClassName : String`
	`12`	`+ let attributeValueClassName : String?`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`
`@@ -37,35 +37,35 @@ extension Int: CoreDataPrimitiveValue {`
`37`	`37`	`public static let coreDataValue = NSAttributeDescription.TypeConfiguration(`
`38`	`38`	`attributeType : .integer64AttributeType,`
`39`	`39`	`isOptional : false,`
`40`		`- attributeValueClassName : "NSNumber"`
	`40`	`+ attributeValueClassName : nil`
`41`	`41`	`)`
`42`	`42`	`}`
`43`	`43`	`extension Int16: CoreDataPrimitiveValue {`
`44`	`44`	`public static let coreDataValue = NSAttributeDescription.TypeConfiguration(`
`45`	`45`	`attributeType : .integer16AttributeType,`
`46`	`46`	`isOptional : false,`
`47`		`- attributeValueClassName : "NSNumber"`
	`47`	`+ attributeValueClassName : nil`
`48`	`48`	`)`
`49`	`49`	`}`
`50`	`50`	`extension Int32: CoreDataPrimitiveValue {`
`51`	`51`	`public static let coreDataValue = NSAttributeDescription.TypeConfiguration(`
`52`	`52`	`attributeType : .integer32AttributeType,`
`53`	`53`	`isOptional : false,`
`54`		`- attributeValueClassName : "NSNumber"`
	`54`	`+ attributeValueClassName : nil`
`55`	`55`	`)`
`56`	`56`	`}`
`57`	`57`	`extension Int64: CoreDataPrimitiveValue {`
`58`	`58`	`public static let coreDataValue = NSAttributeDescription.TypeConfiguration(`
`59`	`59`	`attributeType : .integer64AttributeType,`
`60`	`60`	`isOptional : false,`
`61`		`- attributeValueClassName : "NSNumber"`
	`61`	`+ attributeValueClassName : nil`
`62`	`62`	`)`
`63`	`63`	`}`
`64`	`64`	`extension Int8: CoreDataPrimitiveValue {`
`65`	`65`	`public static let coreDataValue = NSAttributeDescription.TypeConfiguration(`
`66`	`66`	`attributeType : .integer16AttributeType,`
`67`	`67`	`isOptional : false,`
`68`		`- attributeValueClassName : "NSNumber"`
	`68`	`+ attributeValueClassName : nil`
`69`	`69`	`)`
`70`	`70`	`}`
`71`	`71`
`@@ -91,30 +91,30 @@ extension String: CoreDataPrimitiveValue {`
`91`	`91`	`public static let coreDataValue = NSAttributeDescription.TypeConfiguration(`
`92`	`92`	`attributeType : .stringAttributeType,`
`93`	`93`	`isOptional : false,`
`94`		`- attributeValueClassName : "NSString"`
	`94`	`+ attributeValueClassName : nil`
`95`	`95`	`)`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`extension Bool: CoreDataPrimitiveValue {`
`99`	`99`	`public static let coreDataValue = NSAttributeDescription.TypeConfiguration(`
`100`	`100`	`attributeType : .booleanAttributeType,`
`101`	`101`	`isOptional : false,`
`102`		`- attributeValueClassName : "NSNumber"`
	`102`	`+ attributeValueClassName : nil`
`103`	`103`	`)`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`extension Double: CoreDataPrimitiveValue {`
`107`	`107`	`public static let coreDataValue = NSAttributeDescription.TypeConfiguration(`
`108`	`108`	`attributeType : .doubleAttributeType,`
`109`	`109`	`isOptional : false,`
`110`		`- attributeValueClassName : "NSNumber"`
	`110`	`+ attributeValueClassName : nil`
`111`	`111`	`)`
`112`	`112`	`}`
`113`	`113`	`extension Float: CoreDataPrimitiveValue {`
`114`	`114`	`public static let coreDataValue = NSAttributeDescription.TypeConfiguration(`
`115`	`115`	`attributeType : .floatAttributeType,`
`116`	`116`	`isOptional : false,`
`117`		`- attributeValueClassName : "NSNumber"`
	`117`	`+ attributeValueClassName : nil`
`118`	`118`	`)`
`119`	`119`	`}`
`120`	`120`
`@@ -124,38 +124,38 @@ extension Date: CoreDataPrimitiveValue {`
`124`	`124`	`public static let coreDataValue = NSAttributeDescription.TypeConfiguration(`
`125`	`125`	`attributeType : .dateAttributeType,`
`126`	`126`	`isOptional : false,`
`127`		`- attributeValueClassName : "NSDate"`
	`127`	`+ attributeValueClassName : nil`
`128`	`128`	`)`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`extension Data: CoreDataPrimitiveValue {`
`132`	`132`	`public static let coreDataValue = NSAttributeDescription.TypeConfiguration(`
`133`	`133`	`attributeType : .binaryDataAttributeType,`
`134`	`134`	`isOptional : false,`
`135`		`- attributeValueClassName : "NSDate"`
	`135`	`+ attributeValueClassName : nil`
`136`	`136`	`)`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`extension Decimal: CoreDataPrimitiveValue {`
`140`	`140`	`public static let coreDataValue = NSAttributeDescription.TypeConfiguration(`
`141`	`141`	`attributeType : .decimalAttributeType,`
`142`	`142`	`isOptional : false,`
`143`		`- attributeValueClassName : "NSDecimalNumber"`
	`143`	`+ attributeValueClassName : nil`
`144`	`144`	`)`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`extension UUID: CoreDataPrimitiveValue {`
`148`	`148`	`public static let coreDataValue = NSAttributeDescription.TypeConfiguration(`
`149`	`149`	`attributeType : .UUIDAttributeType,`
`150`	`150`	`isOptional : false,`
`151`		`- attributeValueClassName : "NSUUID"`
	`151`	`+ attributeValueClassName : nil`
`152`	`152`	`)`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`extension URL: CoreDataPrimitiveValue {`
`156`	`156`	`public static let coreDataValue = NSAttributeDescription.TypeConfiguration(`
`157`	`157`	`attributeType : .URIAttributeType,`
`158`	`158`	`isOptional : false,`
`159`		`- attributeValueClassName : "NSURL"`
	`159`	`+ attributeValueClassName : nil`
`160`	`160`	`)`
`161`	`161`	`}`