From 6a2394052c93641f61bf12a4e8023b76529ae307 Mon Sep 17 00:00:00 2001 From: Pimenov Sergey Date: Sun, 4 Apr 2021 20:12:40 -0700 Subject: [PATCH] fix compound indexes for dynamic models --- CoreStoreTests/DynamicModelTests.swift | 2 +- Sources/CoreStoreSchema.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CoreStoreTests/DynamicModelTests.swift b/CoreStoreTests/DynamicModelTests.swift index 767f9b7..d187b9e 100644 --- a/CoreStoreTests/DynamicModelTests.swift +++ b/CoreStoreTests/DynamicModelTests.swift @@ -197,7 +197,7 @@ class DynamicModelTests: BaseTestDataTestCase { modelVersion: "V1", entities: [ Entity("Animal"), - Entity("Dog"), + Entity("Dog", indexes: [[\Dog.$nickname, \Dog.$age]]), Entity("Person") ], versionLock: [ diff --git a/Sources/CoreStoreSchema.swift b/Sources/CoreStoreSchema.swift index 98150f5..f7a617c 100644 --- a/Sources/CoreStoreSchema.swift +++ b/Sources/CoreStoreSchema.swift @@ -585,7 +585,7 @@ public final class CoreStoreSchema: DynamicSchema { entityDescription.indexes = entity.indexes.map { (compoundIndexes) in return NSFetchIndexDescription.init( - name: "_CoreStoreSchema_indexes_\(entityDescription.name!)_\(compoundIndexes.joined(separator: "-"))", + name: "_CoreStoreSchema_indexes_\(entityDescription.name!)_\(compoundIndexes.joined(separator: "_"))", elements: compoundIndexes.map { (keyPath) in return NSFetchIndexElementDescription(