@finos/legend-graph 32.3.2 → 32.3.4

package/src/graph/metamodel/pure/packageableElements/runtime/Runtime.ts

@@ -83,10 +83,7 @@ export class ConnectionStores implements Hashable {
       this.connectionPointer,
       hashArray(
         this.storePointers.map((s) =>
-          hashElementPointer(
-            PackageableElementPointerType.STORE,
-            s.valueForSerialization ?? '',
-          ),
+          hashElementPointer(undefined, s.valueForSerialization ?? ''),
         ),
       ),
     ]);

package/src/graph/metamodel/pure/packageableElements/store/relational/model/Database.ts

@@ -21,11 +21,15 @@ import type { PackageableElementVisitor } from '../../../PackageableElement.js';
 import type { Schema } from './Schema.js';
 import type { Join } from './Join.js';
 import type { Filter } from './Filter.js';
+import type { IncludeStore } from './IncludeStore.js';
+import type { DataProduct } from '../../../../dataProduct/DataProduct.js';
+import type { IngestDefinition } from '../../../ingest/IngestDefinition.js';
 
 export class Database extends Store implements Hashable {
   schemas: Schema[] = [];
   joins: Join[] = [];
   filters: Filter[] = [];
+  includedStoreSpecifications: IncludeStore[] = [];
 
   protected override get _elementHashCode(): string {
     return hashArray([
@@ -39,6 +43,7 @@ export class Database extends Store implements Hashable {
       hashArray(this.filters),
       hashArray(this.stereotypes.map((val) => val.pointerHashCode)),
       hashArray(this.taggedValues),
+      hashArray(this.includedStoreSpecifications),
     ]);
   }
 
@@ -48,3 +53,25 @@ export class Database extends Store implements Hashable {
     return visitor.visit_Database(this);
   }
 }
+
+export class INTERNAL__LakehouseGeneratedDatabase extends Database {
+  readonly generatorElement: DataProduct | IngestDefinition;
+  readonly OWNER: Database;
+  constructor(
+    generatorElement: DataProduct | IngestDefinition,
+    owner: Database,
+  ) {
+    super(owner.name);
+    this.generatorElement = generatorElement;
+    this.OWNER = owner;
+  }
+  override accept_PackageableElementVisitor<T>(
+    visitor: PackageableElementVisitor<T>,
+  ): T {
+    return visitor.visit_Database(this);
+  }
+
+  override get path(): string {
+    return `${this.generatorElement.path}`;
+  }
+}

package/src/graph/metamodel/pure/packageableElements/store/relational/model/IncludeStore.ts

@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) 2025-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { hashArray, type Hashable } from '@finos/legend-shared';
+import type { PackageableElementReference } from '../../../PackageableElementReference.js';
+import type { IngestDefinition } from '../../../ingest/IngestDefinition.js';
+import type { DataProduct } from '../../../../dataProduct/DataProduct.js';
+import { CORE_HASH_STRUCTURE } from '../../../../../../../graph/Core_HashUtils.js';
+import type { INTERNAL__LakehouseGeneratedDatabase } from './Database.js';
+
+export class IncludeStore implements Hashable {
+  packageableElementPointer: PackageableElementReference<
+    IngestDefinition | DataProduct
+  >;
+  storeType: string;
+  generatedDatabase!: INTERNAL__LakehouseGeneratedDatabase;
+
+  constructor(
+    packageableElementPointer: PackageableElementReference<
+      IngestDefinition | DataProduct
+    >,
+    storeType: string,
+  ) {
+    this.packageableElementPointer = packageableElementPointer;
+    this.storeType = storeType;
+  }
+
+  get hashCode(): string {
+    return hashArray([
+      CORE_HASH_STRUCTURE.DATABASE_INCLUDE_STORE,
+      this.packageableElementPointer.value.path,
+      this.storeType,
+    ]);
+  }
+}

package/src/graph-manager/action/changeDetection/DomainObserverHelper.ts

@@ -85,7 +85,7 @@ import {
   observe_AtomicTest,
   observe_TestAssertion,
 } from './Testable_ObserverHelper.js';
-import type { FunctionStoreTestData } from '../../../graph/metamodel/pure/packageableElements/function/test/FunctionStoreTestData.js';
+import type { FunctionTestData } from '../../../graph/metamodel/pure/packageableElements/function/test/FunctionTestData.js';
 import { observe_EmbeddedData } from './DSL_Data_ObserverHelper.js';
 import type { HostedService } from '../../../graph/metamodel/pure/packageableElements/function/HostedService.js';
 import type { MemSQLFunction } from '../../../graph/metamodel/pure/packageableElements/function/MemSQLFunction.js';
@@ -499,9 +499,9 @@ export const observe_FunctionTest = skipObserved(
 );
 
 export const observe_FunctionTestData = skipObservedWithContext(
-  (metamodel: FunctionStoreTestData, context: ObserverContext) => {
+  (metamodel: FunctionTestData, context: ObserverContext) => {
     makeObservable(metamodel, {
-      store: observable,
+      element: observable,
       data: observable,
       hashCode: computed,
     });

package/src/graph-manager/protocol/pure/v1/V1_PureGraphManager.ts

@@ -369,6 +369,7 @@ import {
   V1_LineageInput,
   type V1_RawLineageModel,
 } from './model/lineage/V1_Lineage.js';
+import { V1_IngestDefinition } from './model/packageableElements/ingest/V1_IngestDefinition.js';
 
 class V1_PureModelContextDataIndex {
   elements: V1_PackageableElement[] = [];
@@ -4587,6 +4588,9 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
       protocol instanceof V1_INTERNAL__UnknownFunctionActivator ||
       protocol instanceof V1_INTERNAL__UnknownStore
     ) {
+      if (protocol instanceof V1_IngestDefinition) {
+        return CORE_PURE_PATH.INGEST_DEFINITION;
+      }
       const _type = protocol.content._type;
       const classifierPath = isString(_type)
         ? this.elementClassifierPathMap.get(_type)

package/src/graph-manager/protocol/pure/v1/lakehouse/entitlements/V1_EntitlementsDataProduct.ts

@@ -73,6 +73,19 @@ export class V1_EntitlementsDataProductDetails {
   dataProduct!: V1_EntitlementsDataProduct;
 }
 
+export class V1_EntitlementsDataProductLite {
+  id!: string;
+  deploymentId!: number;
+  title?: string;
+  description?: string;
+  origin?: V1_EntitlementsDataProductOrigin | null;
+  fullPath?: string;
+}
+
 export class V1_EntitlementsDataProductDetailsResponse {
   dataProducts?: V1_EntitlementsDataProductDetails[];
 }
+
+export class V1_EntitlementsDataProductLiteResponse {
+  dataProducts?: V1_EntitlementsDataProductLite[];
+}

package/src/graph-manager/protocol/pure/v1/model/data/V1_EmbeddedData.ts

@@ -31,6 +31,7 @@ export interface V1_EmbeddedDataVisitor<T> {
 
   visit_ExternalFormatData(data: V1_ExternalFormatData): T;
   visit_ModelStoreData(data: V1_ModelStoreData): T;
+  visit_RelationElementsData(data: V1_RelationElementsData): T;
   visit_DataElementReference(data: V1_DataElementReference): T;
   visit_RelationalData(data: V1_RelationalCSVData): T;
 }
@@ -125,3 +126,47 @@ export class V1_ModelStoreData extends V1_EmbeddedData implements Hashable {
     return visitor.visit_ModelStoreData(this);
   }
 }
+
+export class V1_RelationRowTestData implements Hashable {
+  values!: string[];
+
+  get hashCode(): string {
+    return hashArray([
+      CORE_HASH_STRUCTURE.RELATION_ROW_TEST_DATA,
+      hashArray(this.values),
+    ]);
+  }
+}
+
+export class V1_RelationElement implements Hashable {
+  paths!: string[];
+  columns!: string[];
+  rows: V1_RelationRowTestData[] = [];
+
+  get hashCode(): string {
+    return hashArray([
+      CORE_HASH_STRUCTURE.RELATION_ELEMENT,
+      hashArray(this.paths),
+      hashArray(this.columns),
+      hashArray(this.rows),
+    ]);
+  }
+}
+
+export class V1_RelationElementsData
+  extends V1_EmbeddedData
+  implements Hashable
+{
+  relationElements: V1_RelationElement[] = [];
+
+  get hashCode(): string {
+    return hashArray([
+      CORE_HASH_STRUCTURE.RELATION_ELEMENTS_DATA,
+      hashArray(this.relationElements),
+    ]);
+  }
+
+  accept_EmbeddedDataVisitor<T>(visitor: V1_EmbeddedDataVisitor<T>): T {
+    return visitor.visit_RelationElementsData(this);
+  }
+}

package/src/graph-manager/protocol/pure/v1/model/packageableElements/function/test/{V1_FunctionStoreTestData.ts → V1_FunctionTestData.ts}

@@ -19,16 +19,16 @@ import type { V1_EmbeddedData } from '../../../data/V1_EmbeddedData.js';
 import { CORE_HASH_STRUCTURE } from '../../../../../../../../graph/Core_HashUtils.js';
 import type { V1_PackageableElementPointer } from '../../V1_PackageableElement.js';
 
-export class V1_FunctionStoreTestData implements Hashable {
+export class V1_FunctionTestData implements Hashable {
   doc: string | undefined;
-  store!: V1_PackageableElementPointer;
+  packageableElementPointer!: V1_PackageableElementPointer;
   data!: V1_EmbeddedData;
 
   get hashCode(): string {
     return hashArray([
       CORE_HASH_STRUCTURE.FUNCTION_STORE_TEST_DATA,
       this.doc ?? '',
-      this.store.path,
+      this.packageableElementPointer.path,
       this.data,
     ]);
   }

package/src/graph-manager/protocol/pure/v1/model/packageableElements/function/test/V1_FunctionTestSuite.ts

@@ -17,10 +17,10 @@
 import { hashArray } from '@finos/legend-shared';
 import { V1_TestSuite } from '../../../test/V1_TestSuite.js';
 import { CORE_HASH_STRUCTURE } from '../../../../../../../../graph/Core_HashUtils.js';
-import type { V1_FunctionStoreTestData } from './V1_FunctionStoreTestData.js';
+import type { V1_FunctionTestData } from './V1_FunctionTestData.js';
 
 export class V1_FunctionTestSuite extends V1_TestSuite {
-  testData: V1_FunctionStoreTestData[] | undefined;
+  testData: V1_FunctionTestData[] | undefined;
 
   override get hashCode(): string {
     return hashArray([

package/src/graph-manager/protocol/pure/v1/model/packageableElements/store/relational/model/V1_Database.ts

@@ -23,6 +23,7 @@ import type { V1_Join } from './V1_Join.js';
 import type { V1_Filter } from './V1_Filter.js';
 import type { V1_StereotypePtr } from '../../../domain/V1_StereotypePtr.js';
 import type { V1_TaggedValue } from '../../../domain/V1_TaggedValue.js';
+import type { V1_IncludeStore } from './V1_IncludeStore.js';
 
 export class V1_Database extends V1_Store implements Hashable {
   schemas: V1_Schema[] = [];
@@ -30,6 +31,7 @@ export class V1_Database extends V1_Store implements Hashable {
   filters: V1_Filter[] = [];
   stereotypes: V1_StereotypePtr[] = [];
   taggedValues: V1_TaggedValue[] = [];
+  includedStoreSpecifications: V1_IncludeStore[] = [];
 
   override get hashCode(): string {
     return hashArray([
@@ -41,6 +43,7 @@ export class V1_Database extends V1_Store implements Hashable {
       hashArray(this.filters),
       hashArray(this.stereotypes),
       hashArray(this.taggedValues),
+      hashArray(this.includedStoreSpecifications),
     ]);
   }
 

package/src/graph-manager/protocol/pure/v1/model/packageableElements/store/relational/model/V1_IncludeStore.ts

@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2025-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { type Hashable, hashArray } from '@finos/legend-shared';
+import { type V1_PackageableElementPointer } from '../../../../../model/packageableElements/V1_PackageableElement.js';
+import { CORE_HASH_STRUCTURE } from '../../../../../../../../../graph/Core_HashUtils.js';
+
+export class V1_IncludeStore implements Hashable {
+  packageableElementPointer!: V1_PackageableElementPointer;
+  storeType!: string;
+
+  get hashCode(): string {
+    return hashArray([
+      CORE_HASH_STRUCTURE.DATABASE_INCLUDE_STORE,
+      this.packageableElementPointer.path,
+      this.storeType,
+    ]);
+  }
+}

package/src/graph-manager/protocol/pure/v1/transformation/pureGraph/from/V1_CoreTransformerHelper.ts

@@ -26,7 +26,7 @@ import {
 export const V1_transformElementReferencePointer = <
   T extends PackageableElement,
 >(
-  pointerType: string,
+  pointerType: string | undefined,
   ref: PackageableElementReference<T>,
 ): V1_PackageableElementPointer =>
   new V1_PackageableElementPointer(

package/src/graph-manager/protocol/pure/v1/transformation/pureGraph/from/V1_DataElementTransformer.ts

@@ -23,6 +23,9 @@ import {
   ModelStoreData,
   ModelEmbeddedData,
   ModelInstanceData,
+  RelationElementsData,
+  type RelationElement,
+  type RelationRowTestData,
 } from '../../../../../../../graph/metamodel/pure/data/EmbeddedData.js';
 import {
   type RelationalCSVDataTable,
@@ -38,6 +41,9 @@ import {
   V1_ModelStoreData,
   V1_ModelEmbeddedData,
   V1_ModelInstanceData,
+  V1_RelationElementsData,
+  V1_RelationElement,
+  V1_RelationRowTestData,
 } from '../../../model/data/V1_EmbeddedData.js';
 import {
   V1_RelationalCSVData,
@@ -103,6 +109,39 @@ const V1_transformModelStoreData = (
   return modelStoreDataElement;
 };
 
+const V1_transformRelationRowTestData = (
+  element: RelationRowTestData,
+  context: V1_GraphTransformerContext,
+): V1_RelationRowTestData => {
+  const relationRowTestData = new V1_RelationRowTestData();
+  relationRowTestData.values = element.values;
+  return relationRowTestData;
+};
+
+const V1_transformRelationElement = (
+  element: RelationElement,
+  context: V1_GraphTransformerContext,
+): V1_RelationElement => {
+  const relationElement = new V1_RelationElement();
+  relationElement.paths = element.paths;
+  relationElement.columns = element.columns;
+  relationElement.rows = element.rows.map((row) =>
+    V1_transformRelationRowTestData(row, context),
+  );
+  return relationElement;
+};
+
+const V1_transformRelationElementsData = (
+  element: RelationElementsData,
+  context: V1_GraphTransformerContext,
+): V1_RelationElementsData => {
+  const relationElementsDataElement = new V1_RelationElementsData();
+  relationElementsDataElement.relationElements = element.relationElements.map(
+    (relationElement) => V1_transformRelationElement(relationElement, context),
+  );
+  return relationElementsDataElement;
+};
+
 export const V1_transformExternalFormatData = (
   element: ExternalFormatData,
 ): V1_ExternalFormatData => {
@@ -180,6 +219,8 @@ export function V1_transformEmbeddedData(
     return V1_transformModelStoreData(metamodel, context);
   } else if (metamodel instanceof ExternalFormatData) {
     return V1_transformExternalFormatData(metamodel);
+  } else if (metamodel instanceof RelationElementsData) {
+    return V1_transformRelationElementsData(metamodel, context);
   } else if (metamodel instanceof DataElementReference) {
     return V1_transformDataElementReference(metamodel, context);
   } else if (metamodel instanceof RelationalCSVData) {

package/src/graph-manager/protocol/pure/v1/transformation/pureGraph/from/V1_DatabaseTransformer.ts

@@ -15,7 +15,10 @@
  */
 
 import { UnsupportedOperationError } from '@finos/legend-shared';
-import type { Database } from '../../../../../../../graph/metamodel/pure/packageableElements/store/relational/model/Database.js';
+import {
+  INTERNAL__LakehouseGeneratedDatabase,
+  type Database,
+} from '../../../../../../../graph/metamodel/pure/packageableElements/store/relational/model/Database.js';
 import {
   type RelationalDataType,
   Real,
@@ -61,6 +64,7 @@ import {
 import type { ColumnMapping } from '../../../../../../../graph/metamodel/pure/packageableElements/store/relational/model/ColumnMapping.js';
 import type { View } from '../../../../../../../graph/metamodel/pure/packageableElements/store/relational/model/View.js';
 import type { Schema } from '../../../../../../../graph/metamodel/pure/packageableElements/store/relational/model/Schema.js';
+import { type IncludeStore } from '../../../../../../../graph/metamodel/pure/packageableElements/store/relational/model/IncludeStore.js';
 import {
   type V1_RelationalDataType,
   V1_VarChar,
@@ -114,6 +118,7 @@ import {
 import { V1_PackageableElementPointer } from '../../../model/packageableElements/V1_PackageableElement.js';
 import type { TabularFunction } from '../../../../../../../graph/metamodel/pure/packageableElements/store/relational/model/TabularFunction.js';
 import { V1_TabularFunction } from '../../../model/packageableElements/store/relational/model/V1_TabularFunction.js';
+import { V1_IncludeStore } from '../../../model/packageableElements/store/relational/model/V1_IncludeStore.js';
 
 const transformRelationalDataType = (
   type: RelationalDataType,
@@ -194,9 +199,17 @@ export const V1_transformTableAliasToTablePointer = (
   },
 ): V1_TablePtr => {
   const tablePtr = new V1_TablePtr();
+  const ownerRef = tableAlias.relation.ownerReference;
   tablePtr.database = options?.TEMPORARY__resolveToFullPath
-    ? tableAlias.relation.ownerReference.value.path
-    : (tableAlias.relation.ownerReference.valueForSerialization ?? '');
+    ? ownerRef.value.path
+    : (ownerRef.valueForSerialization ?? '');
+  // make sure reference is to the owner not the generated database
+  if (
+    ownerRef.value instanceof INTERNAL__LakehouseGeneratedDatabase &&
+    ownerRef.valueForSerialization === ownerRef.value.OWNER.path
+  ) {
+    tablePtr.database = ownerRef.valueForSerialization;
+  }
   // NOTE: Sometimes, we interpret this, so to maintain roundtrip stability, we need to handle this differrently
   // See https://github.com/finos/legend-studio/issues/295
   tablePtr.mainTableDb = tablePtr.database;
@@ -458,6 +471,16 @@ const transformSchema = (
   return schema;
 };
 
+const transformIncludeStore = (element: IncludeStore): V1_IncludeStore => {
+  const v1IncludeStore = new V1_IncludeStore();
+  v1IncludeStore.packageableElementPointer = new V1_PackageableElementPointer(
+    undefined,
+    element.packageableElementPointer.valueForSerialization ?? '',
+  );
+  v1IncludeStore.storeType = element.storeType;
+  return v1IncludeStore;
+};
+
 export const V1_transformDatabase = (
   element: Database,
   context: V1_GraphTransformerContext,
@@ -484,5 +507,9 @@ export const V1_transformDatabase = (
         store.valueForSerialization ?? '',
       ),
   );
+  database.includedStoreSpecifications =
+    element.includedStoreSpecifications.map((includeStore) =>
+      transformIncludeStore(includeStore),
+    );
   return database;
 };

package/src/graph-manager/protocol/pure/v1/transformation/pureGraph/from/V1_DomainTransformer.ts

@@ -71,7 +71,7 @@ import {
   V1_FunctionTest,
 } from '../../../model/packageableElements/function/test/V1_FunctionTest.js';
 import { UnsupportedOperationError } from '@finos/legend-shared';
-import { V1_FunctionStoreTestData } from '../../../model/packageableElements/function/test/V1_FunctionStoreTestData.js';
+import { V1_FunctionTestData } from '../../../model/packageableElements/function/test/V1_FunctionTestData.js';
 import { V1_transformEmbeddedData } from './V1_DataElementTransformer.js';
 import { V1_transformTestAssertion } from './V1_TestTransformer.js';
 import { V1_DefaultValue } from '../../../model/packageableElements/domain/V1_DefaultValue.js';
@@ -354,11 +354,11 @@ const V1_transformFunctionSuite = (
   testSuite.doc = element.doc;
   if (element.testData?.length) {
     testSuite.testData = element.testData.map((elementData) => {
-      const pTestData = new V1_FunctionStoreTestData();
+      const pTestData = new V1_FunctionTestData();
       pTestData.doc = elementData.doc;
-      pTestData.store = V1_transformElementReferencePointer(
-        PackageableElementPointerType.STORE,
-        elementData.store,
+      pTestData.packageableElementPointer = V1_transformElementReferencePointer(
+        undefined,
+        elementData.element,
       );
       pTestData.data = V1_transformEmbeddedData(elementData.data, context);
       return pTestData;

package/src/graph-manager/protocol/pure/v1/transformation/pureGraph/from/V1_RuntimeTransformer.ts

@@ -98,10 +98,7 @@ const transformEngineRuntime = (
       connection.connectionPointer,
     );
     val.storePointers = connection.storePointers.map((s) =>
-      V1_transformElementReferencePointer(
-        PackageableElementPointerType.STORE,
-        s,
-      ),
+      V1_transformElementReferencePointer(undefined, s),
     );
     return val;
   });

package/src/graph-manager/protocol/pure/v1/transformation/pureGraph/to/V1_ClassMappingSecondPassBuilder.ts

@@ -247,7 +247,11 @@ export class V1_ClassMappingSecondPassBuilder
     }
     let mainTableAlias: TableAlias | undefined;
     if (classMapping.mainTable) {
-      const relation = this.context.resolveRelation(classMapping.mainTable);
+      const relation = this.context.resolveRelation(
+        classMapping.mainTable,
+        undefined,
+        true,
+      );
       mainTableAlias = new TableAlias();
       mainTableAlias.relation = relation;
       mainTableAlias.name = relation.value.name;

package/src/graph-manager/protocol/pure/v1/transformation/pureGraph/to/V1_ElementSecondPassBuilder.ts

@@ -24,6 +24,7 @@ import {
   LogEvent,
   guaranteeType,
   guaranteeNonNullable,
+  returnUndefOnError,
 } from '@finos/legend-shared';
 import { Stereotype } from '../../../../../../../graph/metamodel/pure/packageableElements/domain/Stereotype.js';
 import { Tag } from '../../../../../../../graph/metamodel/pure/packageableElements/domain/Tag.js';
@@ -63,7 +64,10 @@ import {
   V1_buildMappingInclude,
 } from './helpers/V1_MappingBuilderHelper.js';
 import { V1_buildFlatDataSection } from './helpers/V1_FlatDataStoreBuilderHelper.js';
-import { V1_buildSchema } from './helpers/V1_DatabaseBuilderHelper.js';
+import {
+  V1_buildSchema,
+  V1_initInternalLakehouseGeneratedDatabase,
+} from './helpers/V1_DatabaseBuilderHelper.js';
 import {
   V1_buildConfigurationProperty,
   V1_buildScopeElement,
@@ -94,7 +98,10 @@ import type { V1_ExecutionEnvironmentInstance } from '../../../model/packageable
 import { V1_buildExecutionParameters } from './V1_ExecutionEnvironmentBuilderHelper.js';
 import type { V1_INTERNAL__UnknownPackageableElement } from '../../../model/packageableElements/V1_INTERNAL__UnknownPackageableElement.js';
 import type { V1_INTERNAL__UnknownFunctionActivator } from '../../../model/packageableElements/function/V1_INTERNAL__UnknownFunctionActivator.js';
-import { PackageableElementExplicitReference } from '../../../../../../../graph/metamodel/pure/packageableElements/PackageableElementReference.js';
+import {
+  PackageableElementExplicitReference,
+  PackageableElementImplicitReference,
+} from '../../../../../../../graph/metamodel/pure/packageableElements/PackageableElementReference.js';
 import { generateFunctionPrettyName } from '../../../../../../../graph/helpers/PureLanguageHelper.js';
 import type { DSL_Mapping_PureProtocolProcessorPlugin_Extension } from '../../../../extensions/DSL_Mapping_PureProtocolProcessorPlugin_Extension.js';
 import {
@@ -136,6 +143,7 @@ import {
   V1_buildDataProductLink,
 } from './helpers/V1_DataProductBuilder.js';
 import type { V1_IngestDefinition } from '../../../model/packageableElements/ingest/V1_IngestDefinition.js';
+import { IncludeStore } from '../../../../../../../graph/metamodel/pure/packageableElements/store/relational/model/IncludeStore.js';
 
 export class V1_ElementSecondPassBuilder
   implements V1_PackageableElementVisitor<void>
@@ -507,6 +515,25 @@ export class V1_ElementSecondPassBuilder
     database.includes = element.includedStores.map((includedStore) =>
       this.context.resolveDatabase(includedStore.path),
     );
+    database.includedStoreSpecifications =
+      element.includedStoreSpecifications.map((v1IncludeStore) => {
+        const storePath = v1IncludeStore.packageableElementPointer.path;
+        const storeElement = guaranteeNonNullable(
+          returnUndefOnError(() =>
+            this.context.graph.getIngestDefinition(storePath),
+          ) ??
+            returnUndefOnError(() =>
+              this.context.graph.getDataProduct(storePath),
+            ),
+          `Ingest/Data Product ${storePath} not found`,
+        );
+        const includedStore = new IncludeStore(
+          PackageableElementImplicitReference.create(storeElement, storePath),
+          v1IncludeStore.storeType,
+        );
+        V1_initInternalLakehouseGeneratedDatabase(includedStore, database);
+        return includedStore;
+      });
     database.schemas = element.schemas.map((schema) =>
       V1_buildSchema(schema, database, this.context),
     );