remove mondrian from code

dbulahov · stbischof · commit 857106a5afaf · 2025-11-25T17:28:35.000+01:00
Signed-off-by: dbulahov &lt;bulahovdenis@gmail.com&gt;
diff --git a/mondrian/src/test/java/mondrian/olap/fun/FunctionTest.java b/mondrian/src/test/java/mondrian/olap/fun/FunctionTest.java
@@ -1099,7 +1099,7 @@ void testCast(Context<?> context) {
 
     // This case demonstrates the relative precedence of 'AS' in 'CAST'
     // and 'AS' for creating inline named sets. See also bug MONDRIAN-648.
-//    discard( Bug.BugMondrian648Fixed );
+//    discard( Bug.Bug648Fixed );
     assertExprReturns(context.getConnectionWithDefaultRole(),
       "'xxx' || Cast(1 = 1 AND 1 = 2 AS String)",
       "xxxfalse" );
diff --git a/mondrian/src/test/java/mondrian/rolap/BatchTestCase.java b/mondrian/src/test/java/mondrian/rolap/BatchTestCase.java
@@ -340,8 +340,8 @@ protected void assertRequestSql(
                 new ExecutionImpl(
                     ((Connection) connection).getInternalStatement(),
                     Optional.of(Duration.ofMillis(1000)));
-            AbstractBasicContext<?> abc = (AbstractBasicContext) execution.getMondrianStatement()
-                    .getMondrianConnection()
+            AbstractBasicContext<?> abc = (AbstractBasicContext) execution.getDaanseStatement()
+                    .getDaanseConnection()
                     .getContext();
             final AggregationManager aggMgr =
                 (AggregationManager)abc.getAggregationManager();
diff --git a/mondrian/src/test/java/mondrian/rolap/FastBatchingCellReaderTest.java b/mondrian/src/test/java/mondrian/rolap/FastBatchingCellReaderTest.java
@@ -135,7 +135,7 @@ private void prepareContext(Context<?> context) {
     connection.getCacheControl( null ).flushSchemaCache();
     final Statement statement = ((Connection) connection).getInternalStatement();
     e = new ExecutionImpl( statement, Optional.empty() );
-    AbstractBasicContext<?> abc = (AbstractBasicContext) e.getMondrianStatement().getMondrianConnection().getContext();
+    AbstractBasicContext<?> abc = (AbstractBasicContext) e.getDaanseStatement().getDaanseConnection().getContext();
     aggMgr = (AggregationManager)abc.getAggregationManager();
     locus = new LocusImpl( e, "FastBatchingCellReaderTest", null );
     LocusImpl.push( locus );
@@ -470,7 +470,7 @@ void testGroupBatchesForTwoSetOfGroupableBatches(Context<?> context) {
 
     // Until MONDRIAN-1001 is fixed, behavior is flaky due to interaction
     // with previous tests.
-    if ( Bug.BugMondrian1001Fixed ) {
+    if ( Bug.Bug1001Fixed ) {
       if ( context.getConfigValue(ConfigConstants.USE_AGGREGATES, ConfigConstants.USE_AGGREGATES_DEFAULT_VALUE ,Boolean.class) && context.getConfigValue(ConfigConstants.READ_AGGREGATES, ConfigConstants.READ_AGGREGATES_DEFAULT_VALUE ,Boolean.class) ) {
         assertEquals( 4, groupedBatchCount );
       } else {
@@ -812,7 +812,7 @@ void testCanBatchForBatchesFromSameAggregationButDifferentRollupOption(Context<?
     // with previous tests.
     final boolean batch2CanBatch1 = batch2.canBatch( batch1 );
     final boolean batch1CanBatch2 = batch1.canBatch( batch2 );
-    if ( Bug.BugMondrian1001Fixed ) {
+    if ( Bug.Bug1001Fixed ) {
       if ( context.getConfigValue(ConfigConstants.USE_AGGREGATES, ConfigConstants.USE_AGGREGATES_DEFAULT_VALUE ,Boolean.class) && context.getConfigValue(ConfigConstants.READ_AGGREGATES, ConfigConstants.READ_AGGREGATES_DEFAULT_VALUE ,Boolean.class) ) {
         assertFalse( batch2CanBatch1 );
         assertFalse( batch1CanBatch2 );
diff --git a/mondrian/src/test/java/mondrian/rolap/NonEmptyTest.java b/mondrian/src/test/java/mondrian/rolap/NonEmptyTest.java
@@ -120,7 +120,7 @@ void testBugMondrian584EnumOrder(Context<?> context) {
     // in the query. Native evaluation returns the females before males,
     // which is probably a reflection of the database ordering.
     //
-    if ( Bug.BugMondrian584Fixed ) {
+    if ( Bug.Bug584Fixed ) {
       checkNative(context,
         4,
         4,
@@ -3900,7 +3900,7 @@ void testCjUnionEnumCalcMembers(Context<?> context)  {
   @ContextSource(propertyUpdater = AppandFoodMartCatalog.class, dataloader = FastFoodmardDataLoader.class)
   void testNonEmptyWithWeirdDefaultMember(Context<?> context)  {
     ((TestContextImpl)context).setLevelPreCacheThreshold(0);
-    if ( !Bug.BugMondrian229Fixed ) {
+    if ( !Bug.Bug229Fixed ) {
       return;
     }
     /*
@@ -4466,7 +4466,7 @@ void testDependentSlicerMemberNative(Context<?> context)  {
   @ContextSource(propertyUpdater = AppandFoodMartCatalog.class, dataloader = FastFoodmardDataLoader.class)
   void testBug1791609NonEmptyCrossJoinEliminatesCalcMember(Context<?> context)  {
     ((TestContextImpl)context).setLevelPreCacheThreshold(0);
-    if ( !Bug.BugMondrian328Fixed ) {
+    if ( !Bug.Bug328Fixed ) {
       return;
     }
     // From the bug:
@@ -4620,7 +4620,7 @@ void testNonEmptyLevelMembers(Context<?> context)  {
           + "Row #1: 142,277.07\n"
           + "Row #1: 263,793.22\n" );
 
-      if ( Bug.BugMondrian446Fixed ) {
+      if ( Bug.Bug446Fixed ) {
         SystemWideProperties.instance().EnableNativeNonEmpty = true;
         assertQueryReturns(context.getConnectionWithDefaultRole(),
           "WITH MEMBER [Measures].[One] AS '1' "
diff --git a/mondrian/src/test/java/mondrian/rolap/TestAggregationManager.java b/mondrian/src/test/java/mondrian/rolap/TestAggregationManager.java
@@ -120,8 +120,8 @@ private void prepareContext(Context<?> context) {
                 .getInternalStatement();
         execution = new ExecutionImpl(statement, Optional.empty());
         aggMgr =
-            (AggregationManager)((AbstractBasicContext)execution.getMondrianStatement()
-                .getMondrianConnection()
+            (AggregationManager)((AbstractBasicContext)execution.getDaanseStatement()
+                .getDaanseConnection()
                 .getContext()).getAggregationManager();
         locus = new LocusImpl(execution, "TestAggregationManager", null);
         LocusImpl.push(locus);
diff --git a/mondrian/src/test/java/mondrian/rolap/agg/SegmentLoaderTest.java b/mondrian/src/test/java/mondrian/rolap/agg/SegmentLoaderTest.java
@@ -108,7 +108,7 @@ private void prepareContext(Context<?> context) {
         statement = ((Connection) connection).getInternalStatement();
         execution = new ExecutionImpl(statement, Optional.of(Duration.ofMillis(1000)));
         locus = new LocusImpl(execution, null, null);
-        cacheMgr = (SegmentCacheManager) ((AbstractBasicContext)execution.getMondrianStatement().getMondrianConnection()
+        cacheMgr = (SegmentCacheManager) ((AbstractBasicContext)execution.getDaanseStatement().getDaanseConnection()
             .getContext()).getAggregationManager().getCacheMgr();
 
         LocusImpl.push(locus);
diff --git a/mondrian/src/test/java/mondrian/test/CompoundSlicerTest.java b/mondrian/src/test/java/mondrian/test/CompoundSlicerTest.java
@@ -519,7 +519,7 @@ void testCompoundSlicer(Context<?> context) {
                         + "[Gender].Members on 1\n"
                         + "from [Sales]\n"
                         + "where {[Product].[Drink], [Product].[Food], [Product].[Drink]}",
-                Bug.BugMondrian555Fixed
+                Bug.Bug555Fixed
                         ? "Axis #0:\n"
                         + "{[Product].[Product].[Drink]}\n"
                         + "{[Product].[Product].[Food]}\n"
@@ -601,7 +601,7 @@ void testCompoundSlicer(Context<?> context) {
                         + "  [Product].[Drink],\n"
                         + "  [Product].[Food].[Dairy],\n"
                         + "  [Product].[Drink].[Alcoholic Beverages].[Beer and Wine].[Beer]}",
-                Bug.BugMondrian555Fixed
+                Bug.Bug555Fixed
                         ? "Axis #0:\n"
                         + "{[Product].[Product].[Drink]}\n"
                         + "{[Product].[Product].[Food].[Dairy]}\n"
diff --git a/mondrian/src/test/java/mondrian/test/NativeSetEvaluationTest.java b/mondrian/src/test/java/mondrian/test/NativeSetEvaluationTest.java
@@ -909,7 +909,7 @@ void testSlicerTuplesPartialCrossJoin(Context<?> context) {
   @ContextSource(propertyUpdater = AppandFoodMartCatalog.class, dataloader = FastFoodmardDataLoader.class)
   void testSlicerTuplesFullCrossJoin(Context<?> context) {
     if ( !context.getConfigValue(ConfigConstants.ENABLE_NATIVE_CROSS_JOIN, ConfigConstants.ENABLE_NATIVE_CROSS_JOIN_DEFAULT_VALUE, Boolean.class)
-      && !Bug.BugMondrian2452Fixed ) {
+      && !Bug.Bug2452Fixed ) {
       // The NonEmptyCrossJoin in the TSET named set below returns
       // extra tuples due to MONDRIAN-2452.
       return;
diff --git a/mondrian/src/test/java/mondrian/test/ParentChildHierarchyTest.java b/mondrian/src/test/java/mondrian/test/ParentChildHierarchyTest.java
@@ -1426,7 +1426,7 @@ void testCatalogReaderLevelMembers(Context<?> context)
     @ParameterizedTest
     @ContextSource(propertyUpdater = AppandFoodMartCatalog.class, dataloader = FastFoodmardDataLoader.class)
     void testBridgeTable(Context<?> context) {
-        if (!Bug.BugMondrian441Fixed) {
+        if (!Bug.Bug441Fixed) {
             return;
         }
         // The test case in the bug has a new table "bri_store_employee". For
diff --git a/mondrian/src/test/java/mondrian/test/PerformanceTest.java b/mondrian/src/test/java/mondrian/test/PerformanceTest.java
@@ -188,7 +188,7 @@ void getBugMondrian550Schema(Context<?> context) {
   @ParameterizedTest
   @ContextSource(propertyUpdater = AppandFoodMartCatalog.class, dataloader = FastFoodmardDataLoader.class)
   void testMondrianBug641(Context<?> context) {
-    if ( !Bug.BugMondrian641Fixed ) {
+    if ( !Bug.Bug641Fixed ) {
       return;
     }
     long start = System.currentTimeMillis();
diff --git a/mondrian/src/test/java/mondrian/test/SchemaTest.java b/mondrian/src/test/java/mondrian/test/SchemaTest.java
@@ -395,7 +395,7 @@ public TestHierarchyDefaultMemberModifierEmf(org.eclipse.daanse.rolap.mapping.mo
                     dimensionConnector.setOverrideDimensionName("Gender with default");
                     dimensionConnector.setForeignKey(CatalogSupplier.COLUMN_CUSTOMER_ID_SALESFACT);
                     dimensionConnector.setDimension(standardDimension);
-                    
+
                     List connectors = cube.getDimensionConnectors();
                     connectors.add(dimensionConnector);
                 }
@@ -2320,7 +2320,7 @@ void testSnowflakeHierarchyValidationNotNeeded(Context<?> context) {
         // due to a known limitation
         if ((context.getConfigValue(ConfigConstants.READ_AGGREGATES, ConfigConstants.READ_AGGREGATES_DEFAULT_VALUE ,Boolean.class)
              || context.getConfigValue(ConfigConstants.USE_AGGREGATES, ConfigConstants.USE_AGGREGATES_DEFAULT_VALUE ,Boolean.class))
-            && !Bug.BugMondrian361Fixed)
+            && !Bug.Bug361Fixed)
         {
             return;
         }
@@ -7098,7 +7098,7 @@ public TestDeprecatedDistinctCountAggregatorModifierEmf(org.eclipse.daanse.rolap
                 measureGroup.getMeasures().add(customerCount2);
 
                 cube.getMeasureGroups().add(measureGroup);
-                
+
                 CalculatedMember calculatedMember = RolapMappingFactory.eINSTANCE.createCalculatedMember();
                 calculatedMember.setName("Half Customer Count");
                 calculatedMember.setVisible(false);
@@ -10151,7 +10151,7 @@ protected List<CubeMapping> cubes(List<? extends CubeMapping> cubes) {
             }
         }
         */
-        if (Bug.BugMondrian361Fixed) {
+        if (Bug.Bug361Fixed) {
             /*
             String baseSchema = TestUtil.getRawSchema(context);
             String schema = SchemaUtil.getSchema(baseSchema,
@@ -12656,7 +12656,7 @@ public org.eclipse.daanse.rolap.mapping.model.Catalog get() {
     void testBugMondrian482(Context<?> context) {
         // until bug MONDRIAN-495, "Table filter concept does not support
         // dialects." is fixed, this test case only works on MySQL
-        if (!Bug.BugMondrian495Fixed
+        if (!Bug.Bug495Fixed
             && getDatabaseProduct(getDialect(context.getConnectionWithDefaultRole()).getDialectName())
             != MYSQL)
         {
@@ -13469,7 +13469,7 @@ class TestCaptionDescriptionAndAnnotationModifierEmf implements CatalogMappingSu
             private org.eclipse.daanse.rolap.mapping.model.Catalog catalog;
 
             public TestCaptionDescriptionAndAnnotationModifierEmf(org.eclipse.daanse.rolap.mapping.model.Catalog cat) {
-                
+
                 this.catalog = RolapMappingFactory.eINSTANCE.createCatalog();
 
 
@@ -13850,7 +13850,7 @@ public TestCaptionDescriptionAndAnnotationModifierEmf(org.eclipse.daanse.rolap.m
                 vc1.getDimensionConnectors().add(warehouseConnector);
                 vc1.getReferencedMeasures().add(unitSalesMeasure);
                 vc1.getReferencedMeasures().add(unitsShippedMeasure);
-                
+
                 // Create virtual cube calculated member
                 org.eclipse.daanse.rolap.mapping.model.CalculatedMember vcCalcMember =
                     RolapMappingFactory.eINSTANCE.createCalculatedMember();
@@ -14855,7 +14855,7 @@ public org.eclipse.daanse.rolap.mapping.model.Catalog get() {
             + "</Schema>");
         */
 
-        if (!Bug.BugMondrian747Fixed
+        if (!Bug.Bug747Fixed
             && context.getConfigValue(ConfigConstants.ENABLE_GROUPING_SETS, ConfigConstants.ENABLE_GROUPING_SETS_DEFAULT_VALUE, Boolean.class))
         {
             // With grouping sets enabled, MONDRIAN-747 behavior is even worse.
@@ -14867,7 +14867,7 @@ public org.eclipse.daanse.rolap.mapping.model.Catalog get() {
         // [Store].[All Stores] and [Store].[USA] should be 266,773. A higher
         // value would indicate that there is a cartesian product going on --
         // because "store_state" is not unique in "store" table.
-        final String x = !Bug.BugMondrian747Fixed
+        final String x = !Bug.Bug747Fixed
             ? "1,379,620"
             : "266,773";
         assertQueryReturns(context.getConnectionWithDefaultRole(),
@@ -15422,7 +15422,7 @@ class TestBugMondrian463Modifier2Emf implements CatalogMappingSupplier {
             private org.eclipse.daanse.rolap.mapping.model.Catalog catalog;
 
             public TestBugMondrian463Modifier2Emf(org.eclipse.daanse.rolap.mapping.model.Catalog cat) {
-                
+
                 this.catalog = RolapMappingFactory.eINSTANCE.createCatalog();
 
 
@@ -18715,7 +18715,7 @@ public static class TestNonCollapsedAggregateOnNonUniqueLevelFailsModifierEmf im
         public TestNonCollapsedAggregateOnNonUniqueLevelFailsModifierEmf(org.eclipse.daanse.rolap.mapping.model.Catalog cat) {
             EcoreUtil.Copier copier = org.opencube.junit5.EmfUtil.copier((CatalogImpl) cat);
             catalog = (CatalogImpl) copier.get(cat);
-            
+
             AggregationExclude aggExclude1 = RolapMappingFactory.eINSTANCE.createAggregationExclude();
             AggregationExclude aggExclude2 = RolapMappingFactory.eINSTANCE.createAggregationExclude();
             AggregationExclude aggExclude3 = RolapMappingFactory.eINSTANCE.createAggregationExclude();
@@ -18877,7 +18877,7 @@ public TestNonCollapsedAggregateOnNonUniqueLevelFailsModifierEmf(org.eclipse.daa
             fooCube.getDimensionConnectors().add(dimensionConnector);
             fooCube.getMeasureGroups().add(measureGroup);
 
-            
+
             catalog.getCubes().removeIf(c -> "Foo".equals(c.getName()));
             catalog.getCubes().add(fooCube);
         }
diff --git a/mondrian/src/test/java/mondrian/test/SteelWheelsSchemaTest.java b/mondrian/src/test/java/mondrian/test/SteelWheelsSchemaTest.java
@@ -1865,7 +1865,7 @@ void testMondrian2411_3(Context<?> context) throws Exception {
         // Tests an admin query followed by a user query, but both are wrapped
         // with a no-op role in a union.
         if ((context.getConfigValue(ConfigConstants.USE_AGGREGATES, ConfigConstants.USE_AGGREGATES_DEFAULT_VALUE ,Boolean.class)
-                    && !Bug.BugMondrian2440Fixed))
+                    && !Bug.Bug2440Fixed))
         {
             return;
         }
diff --git a/mondrian/src/test/java/mondrian/test/clearview/MetricFilterTest.java b/mondrian/src/test/java/mondrian/test/clearview/MetricFilterTest.java
@@ -48,7 +48,7 @@ protected void runTest(Context<?> context) {
         for (String name : diffRepos.getTestCaseNames()) {
             setName(name);
             diffRepos.setCurrentTestCaseName(name);
-            if (!Bug.BugMondrian2452Fixed
+            if (!Bug.Bug2452Fixed
                     && (getName().equals("testMetricFiltersWithNoSubtotals"))
                     && !context.getConfigValue(ConfigConstants.ENABLE_NATIVE_CROSS_JOIN, ConfigConstants.ENABLE_NATIVE_CROSS_JOIN_DEFAULT_VALUE, Boolean.class)) {
                 // Tests give wrong results if native crossjoin is disabled.
diff --git a/mondrian/src/test/java/mondrian/test/clearview/SummaryMetricPercentTest.java b/mondrian/src/test/java/mondrian/test/clearview/SummaryMetricPercentTest.java
@@ -50,7 +50,7 @@ protected void runTest(Context<?> context) {
             setName(name);
             diffRepos.setCurrentTestCaseName(name);
 
-            if (!Bug.BugMondrian2452Fixed
+            if (!Bug.Bug2452Fixed
                     && (getName().equals("testSpecialMetricPctOfCol"))
                     && !context.getConfigValue(ConfigConstants.ENABLE_NATIVE_CROSS_JOIN, ConfigConstants.ENABLE_NATIVE_CROSS_JOIN_DEFAULT_VALUE, Boolean.class)) {
                 // Tests give wrong results if native crossjoin is disabled.
diff --git a/mondrian/src/test/java/mondrian/test/clearview/SummaryTest.java b/mondrian/src/test/java/mondrian/test/clearview/SummaryTest.java
@@ -50,15 +50,15 @@ protected void runTest(Context<?> context) {
             setName(name);
             diffRepos.setCurrentTestCaseName(name);
 
-            if (!Bug.BugMondrian785Fixed
+            if (!Bug.Bug785Fixed
                     && (getName().equals("testRankExpandNonNative")
                     || getName().equals("testCountExpandNonNative")
                     || getName().equals("testCountOverTimeExpandNonNative"))
                     && context.getConfigValue(ConfigConstants.ENABLE_NATIVE_CROSS_JOIN, ConfigConstants.ENABLE_NATIVE_CROSS_JOIN_DEFAULT_VALUE, Boolean.class)) {
                 // Tests give wrong results if native crossjoin is disabled.
                 return;
             }
-            if (!Bug.BugMondrian2452Fixed
+            if (!Bug.Bug2452Fixed
                     && (getName().equals("testRankExpandNonNative"))
                     && !context.getConfigValue(ConfigConstants.ENABLE_NATIVE_CROSS_JOIN, ConfigConstants.ENABLE_NATIVE_CROSS_JOIN_DEFAULT_VALUE, Boolean.class)) {
                 // Tests give wrong results if native crossjoin is disabled.
diff --git a/mondrian/src/test/java/org/eclipse/daanse/olap/function/def/as/AsAliasFunDefTest.java b/mondrian/src/test/java/org/eclipse/daanse/olap/function/def/as/AsAliasFunDefTest.java
@@ -265,7 +265,7 @@ void testAsWith2AliasesOfSameName(Context<?> context) {
 	@ContextSource(propertyUpdater = AppandFoodMartCatalog.class, dataloader = FastFoodmardDataLoader.class)
 	void testAsWithAsterics(Context<?> context) {
 		// Bug MONDRIAN-648 causes 'AS' to have lower precedence than '*'.
-		if (Bug.BugMondrian648Fixed) {
+		if (Bug.Bug648Fixed) {
 			// Note that 'as' has higher precedence than '*'.
 			assertQueryReturns(context.getConnectionWithDefaultRole(), """
 					select
diff --git a/mondrian/src/test/java/org/eclipse/daanse/olap/function/def/logical/IsEmptyFunDefTest.java b/mondrian/src/test/java/org/eclipse/daanse/olap/function/def/logical/IsEmptyFunDefTest.java
@@ -52,7 +52,7 @@ void testIsEmpty(Context<?> context) {
             "[Gender].CurrentMember.Parent.NextMember IS NULL",
             true );
 
-        if ( !Bug.BugMondrian207Fixed ) {
+        if ( !Bug.Bug207Fixed ) {
             return;
         }
 
diff --git a/mondrian/src/test/java/org/eclipse/daanse/olap/function/def/string/UCaseFunDefTest.java b/mondrian/src/test/java/org/eclipse/daanse/olap/function/def/string/UCaseFunDefTest.java
@@ -19,8 +19,7 @@
 import static org.opencube.junit5.TestUtil.executeQuery;
 
 import org.eclipse.daanse.olap.api.Context;
-import org.eclipse.daanse.olap.api.exception.OlapRuntimeException;
-import org.eclipse.daanse.olap.fun.MondrianEvaluationException;
+import org.eclipse.daanse.olap.fun.DaanseEvaluationException;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.opencube.junit5.ContextSource;
 import org.opencube.junit5.dataloader.FastFoodmardDataLoader;
@@ -81,7 +80,7 @@ void testUCaseWithNull(Context<?> context) {
                     + " UCase(NULL) = \"\" "
                     + "And [Store].CURRENTMEMBER.Name = \"Bellingham\") "
                     + "on 0 from sales" );
-        } catch ( MondrianEvaluationException e ) {
+        } catch ( DaanseEvaluationException e ) {
             assertEquals( "No method with the signature UCase(NULL) matches known functions.",
                 e.getMessage() );
             return;
diff --git a/mondrian/src/test/java/org/opencube/junit5/TestUtil.java b/mondrian/src/test/java/org/opencube/junit5/TestUtil.java
@@ -880,7 +880,7 @@ public static Result executeQueryTimeoutTest(Connection connection, String query
 	    Query query = connection.parseQuery( queryString );
 	    Statement statement = query.getStatement();
 	    assertThat(statement).isNotNull();
-	    final Result result = statement.getMondrianConnection().execute(new ExecutionImpl(statement, Optional.of(Duration.ofMillis(statement.getQueryTimeoutMillis()))));
+	    final Result result = statement.getDaanseConnection().execute(new ExecutionImpl(statement, Optional.of(Duration.ofMillis(statement.getQueryTimeoutMillis()))));
 	    return result;
 	  }
 
@@ -890,7 +890,7 @@ public static Result executeQuery(Connection connection, String queryString, lon
 		Statement statement = query.getStatement();
 		assertThat(statement).isNotNull();
 
-		Result result = statement.getMondrianConnection().execute(new ExecutionImpl(statement, Optional.of(Duration.ofMillis(timeoutIntervalMillis))));
+		Result result = statement.getDaanseConnection().execute(new ExecutionImpl(statement, Optional.of(Duration.ofMillis(timeoutIntervalMillis))));
 		return result;
 	}
 
diff --git a/mondrian/src/test/java/org/opencube/junit5/dbprovider/AbstractDockerBasesDatabaseProvider.java b/mondrian/src/test/java/org/opencube/junit5/dbprovider/AbstractDockerBasesDatabaseProvider.java
@@ -51,7 +51,7 @@
 
 public abstract class AbstractDockerBasesDatabaseProvider implements DatabaseProvider{
 
-	private static final String THIS_IS_MONDRIAN_INSTANCE = "thisIsMondrianInstance";
+	private static final String THIS_IS_MONDRIAN_INSTANCE = "thisIsDaanseInstance";
 	private DockerClient dc;
     protected int port;
 
diff --git a/mondrian/test.bndrun b/mondrian/test.bndrun
@@ -71,7 +71,6 @@
 	org.eclipse.daanse.jdbc.db.dialect.db.common;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.jdbc.db.dialect.db.h2;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.jdbc.db.dialect.db.mysql;version='[0.0.1,0.0.2)',\
-	org.eclipse.daanse.jdbc.db.dialect.db.postgresql;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.jdbc.db.record;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.mdx.model.api;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.mdx.model.record;version='[0.0.1,0.0.2)',\

Original file line number	Diff line number	Diff line change
`@@ -1426,7 +1426,7 @@ void testCatalogReaderLevelMembers(Context<?> context)`
`1426`	`1426`	`@ParameterizedTest`
`1427`	`1427`	`@ContextSource(propertyUpdater = AppandFoodMartCatalog.class, dataloader = FastFoodmardDataLoader.class)`
`1428`	`1428`	`void testBridgeTable(Context<?> context) {`
`1429`		`- if (!Bug.BugMondrian441Fixed) {`
	`1429`	`+ if (!Bug.Bug441Fixed) {`
`1430`	`1430`	`return;`
`1431`	`1431`	`}`
`1432`	`1432`	`// The test case in the bug has a new table "bri_store_employee". For`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ void getBugMondrian550Schema(Context<?> context) {`
`188`	`188`	`@ParameterizedTest`
`189`	`189`	`@ContextSource(propertyUpdater = AppandFoodMartCatalog.class, dataloader = FastFoodmardDataLoader.class)`
`190`	`190`	`void testMondrianBug641(Context<?> context) {`
`191`		`- if ( !Bug.BugMondrian641Fixed ) {`
	`191`	`+ if ( !Bug.Bug641Fixed ) {`
`192`	`192`	`return;`
`193`	`193`	`}`
`194`	`194`	`long start = System.currentTimeMillis();`