Skip to content

Commit

Permalink
MONDRIAN: Fixes failing test following the fix for shared dimensions.
Browse files Browse the repository at this point in the history 
[git-p4: depot-paths = "//open/mondrian/": change = 14512]
  • Loading branch information
@lucboudreau
lucboudreau committed Aug 2, 2011
1 parent 5940bc4 commit c5d3985
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 112 deletions.
3 changes: 3 additions & 0 deletions src/main/mondrian/xmla/RowsetDefinition.java
View file
Expand Up @@ -6131,6 +6131,9 @@ protected void populateCube(
List<Row> rows)
throws XmlaException, SQLException
{
if (cube instanceof SharedDimensionHolderCube) {
return;
}
if (isRestricted(LevelUniqueName)) {
// Note: If the LEVEL_UNIQUE_NAME has been specified, then
// the dimension and hierarchy are specified implicitly.
Expand Down
112 changes: 0 additions & 112 deletions testsrc/main/mondrian/xmla/XmlaBasicTest.ref.xml
View file
Expand Up @@ -10636,118 +10636,6 @@ xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
</xsd:sequence>
</xsd:complexType>
</xsd:schema>
<row>
<CATALOG_NAME>FoodMart</CATALOG_NAME>
<SCHEMA_NAME>FoodMart</SCHEMA_NAME>
<CUBE_NAME/>
<DIMENSION_UNIQUE_NAME>[Store]</DIMENSION_UNIQUE_NAME>
<HIERARCHY_UNIQUE_NAME>[Store]</HIERARCHY_UNIQUE_NAME>
<LEVEL_UNIQUE_NAME>[Store].[Store Name]</LEVEL_UNIQUE_NAME>
<PROPERTY_NAME>Store Type</PROPERTY_NAME>
<PROPERTY_CAPTION>Store Type</PROPERTY_CAPTION>
<PROPERTY_TYPE>1</PROPERTY_TYPE>
<DATA_TYPE>130</DATA_TYPE>
<PROPERTY_CONTENT_TYPE>0</PROPERTY_CONTENT_TYPE>
<DESCRIPTION> Cube - Store Hierarchy - Store Name Level - Store Type Property</DESCRIPTION>
</row>
<row>
<CATALOG_NAME>FoodMart</CATALOG_NAME>
<SCHEMA_NAME>FoodMart</SCHEMA_NAME>
<CUBE_NAME/>
<DIMENSION_UNIQUE_NAME>[Store]</DIMENSION_UNIQUE_NAME>
<HIERARCHY_UNIQUE_NAME>[Store]</HIERARCHY_UNIQUE_NAME>
<LEVEL_UNIQUE_NAME>[Store].[Store Name]</LEVEL_UNIQUE_NAME>
<PROPERTY_NAME>Store Manager</PROPERTY_NAME>
<PROPERTY_CAPTION>Store Manager</PROPERTY_CAPTION>
<PROPERTY_TYPE>1</PROPERTY_TYPE>
<DATA_TYPE>130</DATA_TYPE>
<PROPERTY_CONTENT_TYPE>0</PROPERTY_CONTENT_TYPE>
<DESCRIPTION> Cube - Store Hierarchy - Store Name Level - Store Manager Property</DESCRIPTION>
</row>
<row>
<CATALOG_NAME>FoodMart</CATALOG_NAME>
<SCHEMA_NAME>FoodMart</SCHEMA_NAME>
<CUBE_NAME/>
<DIMENSION_UNIQUE_NAME>[Store]</DIMENSION_UNIQUE_NAME>
<HIERARCHY_UNIQUE_NAME>[Store]</HIERARCHY_UNIQUE_NAME>
<LEVEL_UNIQUE_NAME>[Store].[Store Name]</LEVEL_UNIQUE_NAME>
<PROPERTY_NAME>Store Sqft</PROPERTY_NAME>
<PROPERTY_CAPTION>Store Sqft</PROPERTY_CAPTION>
<PROPERTY_TYPE>1</PROPERTY_TYPE>
<DATA_TYPE>5</DATA_TYPE>
<PROPERTY_CONTENT_TYPE>0</PROPERTY_CONTENT_TYPE>
<DESCRIPTION> Cube - Store Hierarchy - Store Name Level - Store Sqft Property</DESCRIPTION>
</row>
<row>
<CATALOG_NAME>FoodMart</CATALOG_NAME>
<SCHEMA_NAME>FoodMart</SCHEMA_NAME>
<CUBE_NAME/>
<DIMENSION_UNIQUE_NAME>[Store]</DIMENSION_UNIQUE_NAME>
<HIERARCHY_UNIQUE_NAME>[Store]</HIERARCHY_UNIQUE_NAME>
<LEVEL_UNIQUE_NAME>[Store].[Store Name]</LEVEL_UNIQUE_NAME>
<PROPERTY_NAME>Grocery Sqft</PROPERTY_NAME>
<PROPERTY_CAPTION>Grocery Sqft</PROPERTY_CAPTION>
<PROPERTY_TYPE>1</PROPERTY_TYPE>
<DATA_TYPE>5</DATA_TYPE>
<PROPERTY_CONTENT_TYPE>0</PROPERTY_CONTENT_TYPE>
<DESCRIPTION> Cube - Store Hierarchy - Store Name Level - Grocery Sqft Property</DESCRIPTION>
</row>
<row>
<CATALOG_NAME>FoodMart</CATALOG_NAME>
<SCHEMA_NAME>FoodMart</SCHEMA_NAME>
<CUBE_NAME/>
<DIMENSION_UNIQUE_NAME>[Store]</DIMENSION_UNIQUE_NAME>
<HIERARCHY_UNIQUE_NAME>[Store]</HIERARCHY_UNIQUE_NAME>
<LEVEL_UNIQUE_NAME>[Store].[Store Name]</LEVEL_UNIQUE_NAME>
<PROPERTY_NAME>Frozen Sqft</PROPERTY_NAME>
<PROPERTY_CAPTION>Frozen Sqft</PROPERTY_CAPTION>
<PROPERTY_TYPE>1</PROPERTY_TYPE>
<DATA_TYPE>5</DATA_TYPE>
<PROPERTY_CONTENT_TYPE>0</PROPERTY_CONTENT_TYPE>
<DESCRIPTION> Cube - Store Hierarchy - Store Name Level - Frozen Sqft Property</DESCRIPTION>
</row>
<row>
<CATALOG_NAME>FoodMart</CATALOG_NAME>
<SCHEMA_NAME>FoodMart</SCHEMA_NAME>
<CUBE_NAME/>
<DIMENSION_UNIQUE_NAME>[Store]</DIMENSION_UNIQUE_NAME>
<HIERARCHY_UNIQUE_NAME>[Store]</HIERARCHY_UNIQUE_NAME>
<LEVEL_UNIQUE_NAME>[Store].[Store Name]</LEVEL_UNIQUE_NAME>
<PROPERTY_NAME>Meat Sqft</PROPERTY_NAME>
<PROPERTY_CAPTION>Meat Sqft</PROPERTY_CAPTION>
<PROPERTY_TYPE>1</PROPERTY_TYPE>
<DATA_TYPE>5</DATA_TYPE>
<PROPERTY_CONTENT_TYPE>0</PROPERTY_CONTENT_TYPE>
<DESCRIPTION> Cube - Store Hierarchy - Store Name Level - Meat Sqft Property</DESCRIPTION>
</row>
<row>
<CATALOG_NAME>FoodMart</CATALOG_NAME>
<SCHEMA_NAME>FoodMart</SCHEMA_NAME>
<CUBE_NAME/>
<DIMENSION_UNIQUE_NAME>[Store]</DIMENSION_UNIQUE_NAME>
<HIERARCHY_UNIQUE_NAME>[Store]</HIERARCHY_UNIQUE_NAME>
<LEVEL_UNIQUE_NAME>[Store].[Store Name]</LEVEL_UNIQUE_NAME>
<PROPERTY_NAME>Has coffee bar</PROPERTY_NAME>
<PROPERTY_CAPTION>Has coffee bar</PROPERTY_CAPTION>
<PROPERTY_TYPE>1</PROPERTY_TYPE>
<DATA_TYPE>11</DATA_TYPE>
<PROPERTY_CONTENT_TYPE>0</PROPERTY_CONTENT_TYPE>
<DESCRIPTION> Cube - Store Hierarchy - Store Name Level - Has coffee bar Property</DESCRIPTION>
</row>
<row>
<CATALOG_NAME>FoodMart</CATALOG_NAME>
<SCHEMA_NAME>FoodMart</SCHEMA_NAME>
<CUBE_NAME/>
<DIMENSION_UNIQUE_NAME>[Store]</DIMENSION_UNIQUE_NAME>
<HIERARCHY_UNIQUE_NAME>[Store]</HIERARCHY_UNIQUE_NAME>
<LEVEL_UNIQUE_NAME>[Store].[Store Name]</LEVEL_UNIQUE_NAME>
<PROPERTY_NAME>Street address</PROPERTY_NAME>
<PROPERTY_CAPTION>Street address</PROPERTY_CAPTION>
<PROPERTY_TYPE>1</PROPERTY_TYPE>
<DATA_TYPE>130</DATA_TYPE>
<PROPERTY_CONTENT_TYPE>0</PROPERTY_CONTENT_TYPE>
<DESCRIPTION> Cube - Store Hierarchy - Store Name Level - Street address Property</DESCRIPTION>
</row>
<row>
<CATALOG_NAME>FoodMart</CATALOG_NAME>
<SCHEMA_NAME>FoodMart</SCHEMA_NAME>
Expand Down

0 comments on commit c5d3985

Please sign in to comment.