|
30 | 30 | import org.neo4j.configuration.helpers.DatabaseNameValidator; |
31 | 31 | import org.neo4j.dbms.api.DatabaseManagementService; |
32 | 32 | import org.neo4j.exceptions.KernelException; |
33 | | -import org.neo4j.fabric.FabricDatabaseManager; |
34 | 33 | import org.neo4j.gds.annotation.SuppressForbidden; |
35 | 34 | import org.neo4j.gds.compat.CompatCallableProcedure; |
36 | 35 | import org.neo4j.gds.compat.CompatExecutionMonitor; |
|
104 | 103 | import org.neo4j.kernel.api.KernelTransactionHandle; |
105 | 104 | import org.neo4j.kernel.api.procedure.CallableProcedure; |
106 | 105 | import org.neo4j.kernel.api.procedure.CallableUserAggregationFunction; |
| 106 | +import org.neo4j.kernel.database.DatabaseReferenceImpl; |
| 107 | +import org.neo4j.kernel.database.DatabaseReferenceRepository; |
107 | 108 | import org.neo4j.kernel.database.NormalizedDatabaseName; |
108 | 109 | import org.neo4j.kernel.impl.coreapi.InternalTransaction; |
109 | 110 | import org.neo4j.kernel.impl.index.schema.IndexImporterFactoryImpl; |
@@ -808,8 +809,11 @@ public TransactionalContext newQueryContext( |
808 | 809 |
|
809 | 810 | @Override |
810 | 811 | public boolean isCompositeDatabase(GraphDatabaseService databaseService) { |
811 | | - var databaseManager = GraphDatabaseApiProxy.resolveDependency(databaseService, FabricDatabaseManager.class); |
812 | | - return databaseManager.isFabricDatabase(GraphDatabaseApiProxy.databaseId(databaseService)); |
| 812 | + var databaseId = GraphDatabaseApiProxy.databaseId(databaseService); |
| 813 | + var repo = GraphDatabaseApiProxy.resolveDependency(databaseService, DatabaseReferenceRepository.class); |
| 814 | + return repo.getCompositeDatabaseReferences().stream() |
| 815 | + .map(DatabaseReferenceImpl.Internal::databaseId) |
| 816 | + .anyMatch(databaseId::equals); |
813 | 817 | } |
814 | 818 |
|
815 | 819 | public abstract CursorContextFactory cursorContextFactory(Optional<PageCacheTracer> pageCacheTracer); |
|
0 commit comments