Enhance initializers of ModelFetchSpecification

Allow for more things ...
ZeeQL · Nov 17, 2024 · 897a72f · 897a72f
1 parent d19d830
commit 897a72f
Showing 1 changed file with 30 additions and 5 deletions.
diff --git a/Sources/ZeeQL/Control/ModelFetchSpecification.swift b/Sources/ZeeQL/Control/ModelFetchSpecification.swift
@@ -3,7 +3,7 @@
 //  ZeeQL
 //
 //  Created by Helge Hess on 06/03/17.
-//  Copyright © 2017 ZeeZide GmbH. All rights reserved.
+//  Copyright © 2017-2024 ZeeZide GmbH. All rights reserved.
 //
 
 public struct ModelFetchSpecification : FetchSpecification {
@@ -13,6 +13,7 @@ public struct ModelFetchSpecification : FetchSpecification {
   public var entity              : Entity?
   public var _entityName         : String?
 
+  @inlinable
   public var entityName          : String? {
     if let e = entity      { return e.name }
     if let n = _entityName { return n }
@@ -31,43 +32,67 @@ public struct ModelFetchSpecification : FetchSpecification {
   public var deep                = false
   public var fetchesRawRows      = false
   public var fetchesReadOnly     = false
-  public var requiresAllQualifierBindingVariables = false
+  public var requiresAllQualifierBindingVariables = false // TBD: why false?
   public var prefetchingRelationshipKeyPathes : [ String ]?
 
+  @inlinable
   public init(entityName    : String?           = nil,
               qualifier     : Qualifier?        = nil,
               sortOrderings : [ SortOrdering ]? = nil,
-              limit         : Int?              = nil)
+              offset        : Int?              = nil,
+              limit         : Int?              = nil,
+              prefetch      : [ String ]?       = nil,
+              requiresAllQualifierBindingVariables: Bool = false)
   {
     self._entityName   = entityName
     self.qualifier     = qualifier
     self.sortOrderings = sortOrderings
+    self.fetchOffset   = offset
     self.fetchLimit    = limit
+    self.prefetchingRelationshipKeyPathes = prefetch
+    self.requiresAllQualifierBindingVariables =
+      requiresAllQualifierBindingVariables
   }
+
+  @inlinable
   public init(entity        : Entity,
               qualifier     : Qualifier?        = nil,
               sortOrderings : [ SortOrdering ]? = nil,
-              limit         : Int?              = nil)
+              offset        : Int?              = nil,
+              limit         : Int?              = nil,
+              prefetch      : [ String ]?       = nil,
+              requiresAllQualifierBindingVariables: Bool = false)
   {
     self.entity        = entity
     self.qualifier     = qualifier
     self.sortOrderings = sortOrderings
+    self.fetchOffset   = offset
     self.fetchLimit    = limit
+    self.prefetchingRelationshipKeyPathes = prefetch
+    self.requiresAllQualifierBindingVariables =
+      requiresAllQualifierBindingVariables
   }
 
+  @inlinable
   public init(entity        : Entity,
               _ q           : String,
               sortOrderings : [ SortOrdering ]? = nil,
+              offset        : Int?              = nil,
               limit         : Int?              = nil,
-              prefetch      : [ String ]?       = nil)
+              prefetch      : [ String ]?       = nil,
+              requiresAllQualifierBindingVariables: Bool = false)
   {
     self.entity        = entity
     self.qualifier     = qualifierWith(format: q)
     self.sortOrderings = sortOrderings
+    self.fetchOffset   = offset
     self.fetchLimit    = limit
     self.prefetchingRelationshipKeyPathes = prefetch
+    self.requiresAllQualifierBindingVariables =
+      requiresAllQualifierBindingVariables
   }
 
+  @inlinable
   public init(fetchSpecification fs: FetchSpecification) {
     entity              = fs.entity
     fetchAttributeNames = fs.fetchAttributeNames