Add support for restrictingQualifiers in models

...
ZeeQL · Nov 11, 2024 · b6a5e37 · b6a5e37
1 parent f5cef91
commit b6a5e37
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/Sources/ZeeQL/Access/CodeEntity.swift b/Sources/ZeeQL/Access/CodeEntity.swift
@@ -32,6 +32,7 @@ open class CodeEntityBase : Entity {
   public final var name                     : String = ""
   public final var externalName             : String?
   public final var className                : String? // TBD: Hm.
+  public final var restrictingQualifier     : Qualifier?
 
   public final var attributes               = Array<ZeeQL.Attribute>()
   public final var relationships            = [ Relationship  ]()
@@ -179,7 +180,8 @@ open class CodeObjectEntity<T: CodeObjectType> : CodeEntityBase {
 
 // MARK: - Reflection
 
-fileprivate let specialTableKey = "table"
+fileprivate let specialTableKey = "table" // TBD
+fileprivate let specialRestrictingQualifierKey = "_restrictingQualifier"
 
 fileprivate extension CodeEntityBase {
 
@@ -209,7 +211,14 @@ fileprivate extension CodeEntityBase {
         externalName = v
         continue
       }
-
+      if propname == specialRestrictingQualifierKey {
+        assert(propValue is Qualifier)
+        if let v = propValue as? Qualifier {
+          restrictingQualifier = v
+          continue
+        }
+      }
+
       if let attribute = CodeAttributeFactory.attributeFor(property: propname,
                                                            value: propValue)
       {

diff --git a/Sources/ZeeQL/Access/ModelPattern.swift b/Sources/ZeeQL/Access/ModelPattern.swift
@@ -44,9 +44,9 @@ fileprivate extension ModelAttribute {
           attrs.append(attr)
         }
         else {
-          globalZeeQLLogger.warn("Did not find column as name", columnName,
-                                 "in template", entity.name,
-                                 "in database:", inAttrs)
+          globalZeeQLLogger.warn("Did not find column w/ name", columnName,
+                                 "\n  in template", entity.name,
+                                 "\n  in database:", inAttrs)
 
         }
       }