mujiannan/Analysis-Services
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1103 fix

Browse Source
This commit is contained in:
Christian Wade 2020-01-13 13:14:13 -08:00
parent fb05dc33e1
commit edb8a5f560
10 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.0.1.0")] [assembly: AssemblyVersion("5.0.0.13")]
[assembly: AssemblyFileVersion("5.0.1.0")] [assembly: AssemblyFileVersion("5.0.0.13")]

4
BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.0.1.0")] [assembly: AssemblyVersion("5.0.0.13")]
[assembly: AssemblyFileVersion("5.0.1.0")] [assembly: AssemblyFileVersion("5.0.0.13")]

4
BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.0.1.0")] [assembly: AssemblyVersion("5.0.0.13")]
[assembly: AssemblyFileVersion("5.0.1.0")] [assembly: AssemblyFileVersion("5.0.0.13")]

BIN
BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe
View File

Binary file not shown.

BIN
BismNormalizer/BismNormalizer/BismNormalizer.exe
View File

Binary file not shown.

4
BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.0.1.0")] [assembly: AssemblyVersion("5.0.0.13")]
[assembly: AssemblyFileVersion("5.0.1.0")] [assembly: AssemblyFileVersion("5.0.0.13")]

2
BismNormalizer/BismNormalizer/TabularCompare/ConnectionInfo.cs
View File

@ -695,7 +695,7 @@ $@"{{
} }
_compatibilityLevel = amoDatabase.CompatibilityLevel; _compatibilityLevel = amoDatabase.CompatibilityLevel;
_dataSourceVersion = amoDatabase.Model.DefaultPowerBIDataSourceVersion.ToString(); if (_compatibilityLevel >= 1400) _dataSourceVersion = amoDatabase.Model.DefaultPowerBIDataSourceVersion.ToString();
_serverMode = amoServer.ServerMode; _serverMode = amoServer.ServerMode;
_directQuery = ((amoDatabase.Model != null && amoDatabase.Model.DefaultMode == Microsoft.AnalysisServices.Tabular.ModeType.DirectQuery) || _directQuery = ((amoDatabase.Model != null && amoDatabase.Model.DefaultMode == Microsoft.AnalysisServices.Tabular.ModeType.DirectQuery) ||
amoDatabase.DirectQueryMode == DirectQueryMode.DirectQuery || amoDatabase.DirectQueryMode == DirectQueryMode.InMemoryWithDirectQuery || amoDatabase.DirectQueryMode == DirectQueryMode.DirectQueryWithInMemory); amoDatabase.DirectQueryMode == DirectQueryMode.DirectQuery || amoDatabase.DirectQueryMode == DirectQueryMode.InMemoryWithDirectQuery || amoDatabase.DirectQueryMode == DirectQueryMode.DirectQueryWithInMemory);

1
BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs
View File

@ -2194,7 +2194,6 @@ namespace BismNormalizer.TabularCompare.TabularMetadata
//Need recalc even if created no tables in case of new relationships without tables //Need recalc even if created no tables in case of new relationships without tables
_database.Model.RequestRefresh(RefreshType.Calculate); _database.Model.RequestRefresh(RefreshType.Calculate);
_database.Model.SaveChanges(); _database.Model.SaveChanges();
// Show row count for each table // Show row count for each table

11
BismNormalizer/BismNormalizer/TabularCompare/UI/TreeGridViewComparison.cs
View File

@ -215,8 +215,11 @@ namespace BismNormalizer.TabularCompare.UI
node.Cells[10].Value = comparisonObject.SourceObjectDefinition; node.Cells[10].Value = comparisonObject.SourceObjectDefinition;
node.Cells[11].Value = comparisonObject.TargetObjectDefinition; node.Cells[11].Value = comparisonObject.TargetObjectDefinition;
bool isMdMetadata = (comparisonObject is MultidimensionalMetadata.ComparisonObject);
string treeIndentLevel1 = new String(' ', 13); string treeIndentLevel1 = new String(' ', 13);
string treeIndentLevel2 = new String(' ', 20); string treeIndentLevel2 = new String(' ', 20);
string treeIndentLevel3 = new String(' ', 27);
switch (comparisonObject.ComparisonObjectType) switch (comparisonObject.ComparisonObjectType)
{ {
@ -242,20 +245,20 @@ namespace BismNormalizer.TabularCompare.UI
else else
{ {
node.ImageIndex = 1; node.ImageIndex = 1;
node.Cells[0].Value = treeIndentLevel1 + "Table"; node.Cells[0].Value = (isMdMetadata ? treeIndentLevel2 : treeIndentLevel1) + "Table";
} }
break; break;
case ComparisonObjectType.Relationship: case ComparisonObjectType.Relationship:
node.ImageIndex = 2; node.ImageIndex = 2;
node.Cells[0].Value = treeIndentLevel2 + "Relationship"; node.Cells[0].Value = (isMdMetadata ? treeIndentLevel3 : treeIndentLevel2) + "Relationship";
break; break;
case ComparisonObjectType.Measure: case ComparisonObjectType.Measure:
node.ImageIndex = 3; node.ImageIndex = 3;
node.Cells[0].Value = treeIndentLevel2 + "Measure"; node.Cells[0].Value = (isMdMetadata ? treeIndentLevel3 : treeIndentLevel2) + "Measure";
break; break;
case ComparisonObjectType.Kpi: case ComparisonObjectType.Kpi:
node.ImageIndex = 4; node.ImageIndex = 4;
node.Cells[0].Value = treeIndentLevel2 + "KPI"; node.Cells[0].Value = (isMdMetadata ? treeIndentLevel3 : treeIndentLevel2) + "KPI";
break; break;
case ComparisonObjectType.CalculationItem: case ComparisonObjectType.CalculationItem:
node.ImageIndex = 24; node.ImageIndex = 24;

2
BismNormalizer/BismNormalizer/source.extension.vsixmanifest
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011"> <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata> <Metadata>
<Identity Id="BismNormalizer.ea2aeb43-64a6-4dee-8816-099fb44513fa" Version="5.0.1.0" Language="en-US" Publisher="BISM Normalizer" /> <Identity Id="BismNormalizer.ea2aeb43-64a6-4dee-8816-099fb44513fa" Version="5.0.1.2" Language="en-US" Publisher="BISM Normalizer" />
<DisplayName>BISM Normalizer</DisplayName> <DisplayName>BISM Normalizer</DisplayName>
<Description xml:space="preserve">BISM Normalizer manages Analysis Services tabular models</Description> <Description xml:space="preserve">BISM Normalizer manages Analysis Services tabular models</Description>
<MoreInfo>http://bism-normalizer.com/</MoreInfo> <MoreInfo>http://bism-normalizer.com/</MoreInfo>