fix: merge conflicts

Author: indietyp

libs/@local/hashql/eval/src/postgres/authorization/mod.rs

@@ -149,7 +149,7 @@ impl<A: Allocator + Clone, S: Allocator> PatchPreparedQueryLayer<A, S>
         query.statement.where_expression.add_condition(condition);
 
         // Lower protection BEFORE join materialization so its join demands
-        // (e.g. entity_is_of_type_ids for TypeBaseUrls) are registered.
+        // (e.g. entity_edition_cache for TypeBaseUrls) are registered.
         // The resulting mask expression is grafted AFTER joins are built.
         let entity_edition_alias = context.projections.entity_edition_alias();
 

libs/@local/hashql/eval/src/postgres/authorization/policy/mod.rs

@@ -35,7 +35,7 @@ fn convert_is_of_type<A: Allocator + Clone>(
     unit: &mut PolicyTranslationUnit<'_, A>,
     url: VersionedUrl,
 ) -> Expression {
-    let table = unit.projections.entity_is_of_type_ids();
+    let table = unit.projections.entity_edition_cache();
 
     let base_url_index = unit.parameters.push(url.base_url);
     let version_index = unit.parameters.push(url.version);
@@ -45,7 +45,7 @@ fn convert_is_of_type<A: Allocator + Clone>(
         hash_graph_postgres_store::store::postgres::query::Function::ArrayPositions(
             Box::new(Expression::ColumnReference(ColumnReference {
                 correlation: Some(table.clone()),
-                name: Column::EntityIsOfTypeIds(table::EntityIsOfTypeIds::BaseUrls).into(),
+                name: Column::EntityEditionCache(table::EntityEditionCache::BaseUrls).into(),
             })),
             Box::new(Expression::Parameter(base_url_index)),
         ),
@@ -56,7 +56,7 @@ fn convert_is_of_type<A: Allocator + Clone>(
         hash_graph_postgres_store::store::postgres::query::Function::ArrayPositions(
             Box::new(Expression::ColumnReference(ColumnReference {
                 correlation: Some(table),
-                name: Column::EntityIsOfTypeIds(table::EntityIsOfTypeIds::Versions).into(),
+                name: Column::EntityEditionCache(table::EntityEditionCache::Versions).into(),
             })),
             Box::new(Expression::Parameter(version_index)),
         ),
@@ -86,8 +86,8 @@ fn convert_is_of_base_type<A: Allocator + Clone>(
         op: BinaryOperator::In,
         left: Box::new(Expression::Parameter(base_url_index)),
         right: Box::new(Expression::ColumnReference(ColumnReference {
-            correlation: Some(unit.projections.entity_is_of_type_ids()),
-            name: Column::EntityIsOfTypeIds(table::EntityIsOfTypeIds::BaseUrls).into(),
+            correlation: Some(unit.projections.entity_edition_cache()),
+            name: Column::EntityEditionCache(table::EntityEditionCache::BaseUrls).into(),
         })),
     })
 }

libs/@local/hashql/eval/src/postgres/authorization/policy/tests.rs

@@ -403,8 +403,8 @@ fn algebra_blank_forbid_denies_all() {
         "blank forbid should not register entity_ids",
     );
     assert!(
-        fixture.projections.entity_is_of_type_ids.is_none(),
-        "blank forbid should not register entity_is_of_type_ids",
+        fixture.projections.entity_edition_cache.is_none(),
+        "blank forbid should not register entity_edition_cache",
     );
 }
 

libs/@local/hashql/eval/src/postgres/authorization/protection/mod.rs

@@ -32,11 +32,11 @@ fn resolve_path<A: Allocator>(
             correlation: Some(unit.projections.temporal_metadata()),
             name: Column::EntityTemporalMetadata(table::EntityTemporalMetadata::EntityUuid).into(),
         }),
-        // eit.base_urls
+        // eec.base_urls
         PropertyFilterEntityQueryPath::TypeBaseUrls => {
             Expression::ColumnReference(ColumnReference {
-                correlation: Some(unit.projections.entity_is_of_type_ids()),
-                name: Column::EntityIsOfTypeIds(table::EntityIsOfTypeIds::BaseUrls).into(),
+                correlation: Some(unit.projections.entity_edition_cache()),
+                name: Column::EntityEditionCache(table::EntityEditionCache::BaseUrls).into(),
             })
         }
     }

libs/@local/hashql/eval/src/postgres/authorization/tests.rs

@@ -661,7 +661,7 @@ fn patch_instance_admin_bypasses_protection() {
 }
 
 /// Protection filter that references `TypeBaseUrls`, requiring the
-/// `entity_is_of_type_ids` auxiliary join to be in scope inside the
+/// `entity_edition_cache` auxiliary join to be in scope inside the
 /// `entity_editions` LATERAL mask expression.
 #[test]
 fn patch_protection_with_type_base_urls() {
@@ -688,7 +688,7 @@ fn patch_protection_with_type_base_urls() {
     let actor = Some(ActorId::User(UserId::new(ACTOR_UUID)));
     let policy = policy_components(actor, vec![permit(|| None)]);
 
-    // Protection uses TypeBaseUrls path, which demands entity_is_of_type_ids join.
+    // Protection uses TypeBaseUrls path, which demands entity_edition_cache join.
     let mut properties = PropertyProtectionFilterConfig::new();
     properties.protect_property(
         BaseUrl::new("https://hash.ai/@h/types/property-type/email/".to_owned())

libs/@local/hashql/eval/src/postgres/projections.rs

@@ -513,7 +513,7 @@ pub struct AuxiliaryProjections {
     base: Projections,
 
     pub entity_ids: Option<Alias>,
-    pub entity_is_of_type_ids: Option<Alias>,
+    pub entity_edition_cache: Option<Alias>,
 }
 
 impl AuxiliaryProjections {
@@ -522,7 +522,7 @@ impl AuxiliaryProjections {
             index: base.index,
             base: base.snapshot(),
             entity_ids: None,
-            entity_is_of_type_ids: None,
+            entity_edition_cache: None,
         }
     }
 
@@ -574,18 +574,18 @@ impl AuxiliaryProjections {
     ///
     /// Always allocates a fresh join; the base projections' type aggregate
     /// is a scoped LATERAL subquery and cannot be reused.
-    pub(crate) fn entity_is_of_type_ids(&mut self) -> TableReference<'static> {
-        let alias = if let Some(alias) = self.entity_is_of_type_ids {
+    pub(crate) fn entity_edition_cache(&mut self) -> TableReference<'static> {
+        let alias = if let Some(alias) = self.entity_edition_cache {
             alias
         } else {
             let alias = self.next_alias();
-            self.entity_is_of_type_ids = Some(alias);
+            self.entity_edition_cache = Some(alias);
             alias
         };
 
         TableReference {
             schema: None,
-            name: TableName::from(Table::EntityIsOfTypeIds),
+            name: TableName::from(Table::EntityEditionCache),
             alias: Some(alias),
         }
     }
@@ -615,7 +615,7 @@ impl AuxiliaryProjections {
             tablesample: None,
         };
 
-        if self.entity_ids.is_none() && self.entity_is_of_type_ids.is_none() {
+        if self.entity_ids.is_none() && self.entity_edition_cache.is_none() {
             return from;
         }
 
@@ -633,18 +633,18 @@ impl AuxiliaryProjections {
             core = self.base.build_entity_ids(core, alias);
         }
 
-        if let Some(alias) = self.entity_is_of_type_ids {
+        if let Some(alias) = self.entity_edition_cache {
             let fk = ForeignKeyReference::Single {
                 on: Column::EntityTemporalMetadata(table::EntityTemporalMetadata::EditionId),
-                join: Column::EntityIsOfTypeIds(table::EntityIsOfTypeIds::EntityEditionId),
+                join: Column::EntityEditionCache(table::EntityEditionCache::EntityEditionId),
                 join_type: JoinType::Inner,
             };
 
             core = core
                 .join(
                     JoinType::Inner,
-                    FromItem::table(Table::EntityIsOfTypeIds)
-                        .alias(Table::EntityIsOfTypeIds.aliased(alias)),
+                    FromItem::table(Table::EntityEditionCache)
+                        .alias(Table::EntityEditionCache.aliased(alias)),
                 )
                 .on(fk.conditions(self.base.base_alias, alias))
                 .build();
@@ -793,7 +793,7 @@ mod tests {
     fn build_joins_inserts_before_laterals() {
         let base = Projections::new();
         let mut aux = AuxiliaryProjections::new(&base);
-        aux.entity_is_of_type_ids();
+        aux.entity_edition_cache();
 
         let core = FromItem::table(Table::EntityTemporalMetadata)
             .alias(TableReference {
@@ -823,7 +823,7 @@ mod tests {
         let base = Projections::new();
         let mut aux = AuxiliaryProjections::new(&base);
         aux.entity_ids();
-        aux.entity_is_of_type_ids();
+        aux.entity_edition_cache();
 
         let from = FromItem::table(Table::EntityTemporalMetadata)
             .alias(TableReference {