Refined GetByKey query approach after encountering issues where key c…

…olumns are renamed.
Ed-Fi-Alliance-OSS · Nov 6, 2024 · bca8328 · bca8328
1 parent 6571bd1
commit bca8328
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Application/EdFi.Ods.Common/Infrastructure/Repositories/GetEntitiesBase.cs b/Application/EdFi.Ods.Common/Infrastructure/Repositories/GetEntitiesBase.cs
@@ -308,15 +308,15 @@ private Aggregate GetAggregate()
             return aggregate;
         }
 
-        protected (QueryBuilder queryBuilder, string rootTableAlias) GetSingleItemQueryBuilder()
+        protected QueryBuilder GetSingleItemQueryBuilder()
         {
             // Get the fully qualified physical table name
             Entity aggregateRootEntity = _aggregate.Value.AggregateRoot;
             string rootTableAlias = aggregateRootEntity.IsDerived ? "b" : "r";
 
             if (_queryBuilder != null)
             {
-                return (_queryBuilder.Clone(), rootTableAlias);
+                return _queryBuilder.Clone();
             }
 
             var idQueryBuilder = new QueryBuilder(_dialect);
@@ -357,7 +357,7 @@ private Aggregate GetAggregate()
 
             _queryBuilder = idQueryBuilder;
 
-            return (idQueryBuilder.Clone(), rootTableAlias);
+            return idQueryBuilder.Clone();
         }
     }
 }
diff --git a/Application/EdFi.Ods.Common/Infrastructure/Repositories/GetEntitiesByIds.cs b/Application/EdFi.Ods.Common/Infrastructure/Repositories/GetEntitiesByIds.cs
@@ -56,7 +56,7 @@ public async Task<IList<TEntity>> GetByIdsAsync(IList<Guid> ids, CancellationTok
                 if (SerializationEnabled)
                 {
                     // Get the item from serialized form
-                    var (singleItemQueryBuilder, rootTableAlias) = GetSingleItemQueryBuilder();
+                    var singleItemQueryBuilder = GetSingleItemQueryBuilder();
 
                     singleItemQueryBuilder.Where("Id", ids[0]);
                     var singleItemTemplate = singleItemQueryBuilder.BuildTemplate();

diff --git a/Application/EdFi.Ods.Common/Infrastructure/Repositories/GetEntityByKey.cs b/Application/EdFi.Ods.Common/Infrastructure/Repositories/GetEntityByKey.cs
@@ -180,11 +180,12 @@ string GetWhereClause(OrderedDictionary keyValues)
             async Task<ItemData<TEntity>> GetItemData(OrderedDictionary compositeKeyValues, SessionScope scope)
             {
                 // Get the item from serialized form
-                var (singleItemQueryBuilder, rootTableAlias) = GetSingleItemQueryBuilder();
+                var singleItemQueryBuilder = GetSingleItemQueryBuilder();
 
+                // Apply primary key values to the root (derived, if applicable) table, as that's how the composite key values are provided
                 foreach (DictionaryEntry keyValue in compositeKeyValues)
                 {
-                    singleItemQueryBuilder.Where($"{rootTableAlias}.{(string) keyValue.Key}", keyValue.Value);
+                    singleItemQueryBuilder.Where($"r.{(string) keyValue.Key}", keyValue.Value);
                 }
 
                 var singleItemTemplate = singleItemQueryBuilder.BuildTemplate();