From 88dc332767135eac94b38e9018e0d7ba5b1dbedf Mon Sep 17 00:00:00 2001 From: Christian Wade Date: Wed, 6 Dec 2017 11:42:51 -0800 Subject: [PATCH] Fix for recursive M expressions --- .../BismNormalizer.CommandLine/Properties/AssemblyInfo.cs | 4 ++-- .../BismNormalizer.IconSetup/Properties/AssemblyInfo.cs | 4 ++-- BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs | 4 ++-- .../TabularCompare/TabularMetadata/TabularModel.cs | 7 ++++++- .../BismNormalizer/source.extension.vsixmanifest | 2 +- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs index f2d083b..0398284 100644 --- a/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs +++ b/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("4.0.0.18")] -[assembly: AssemblyFileVersion("4.0.0.18")] +[assembly: AssemblyVersion("4.0.0.19")] +[assembly: AssemblyFileVersion("4.0.0.19")] diff --git a/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs index 86f1e06..7e1763a 100644 --- a/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs +++ b/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("4.0.0.18")] -[assembly: AssemblyFileVersion("4.0.0.18")] +[assembly: AssemblyVersion("4.0.0.19")] +[assembly: AssemblyFileVersion("4.0.0.19")] diff --git a/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs index 2681011..e65f9da 100644 --- a/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs +++ b/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("4.0.0.18")] -[assembly: AssemblyFileVersion("4.0.0.18")] +[assembly: AssemblyVersion("4.0.0.19")] +[assembly: AssemblyFileVersion("4.0.0.19")] diff --git a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs index be6cf41..0824707 100644 --- a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs +++ b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs @@ -144,7 +144,12 @@ namespace BismNormalizer.TabularCompare.TabularMetadata private void InitializeCalcDependencies() { _calcDependencies.Clear(); - string command = "SELECT * FROM $System.DISCOVER_CALC_DEPENDENCY WHERE OBJECT_TYPE = 'PARTITION' OR OBJECT_TYPE = 'M_EXPRESSION';"; + string command = + "SELECT * FROM $System.DISCOVER_CALC_DEPENDENCY " + + "WHERE (OBJECT_TYPE = 'PARTITION' OR OBJECT_TYPE = 'M_EXPRESSION') AND " + + "NOT (OBJECT_TYPE = REFERENCED_OBJECT_TYPE AND " + + " [TABLE] = REFERENCED_TABLE AND" + + " OBJECT = REFERENCED_OBJECT);"; //Ignore recursive M expression dependencies XmlNodeList rows = Core.Comparison.ExecuteXmlaCommand(_server, _connectionInfo.DatabaseName, command); foreach (XmlNode row in rows) diff --git a/BismNormalizer/BismNormalizer/source.extension.vsixmanifest b/BismNormalizer/BismNormalizer/source.extension.vsixmanifest index 5732a62..c3b3cd0 100644 --- a/BismNormalizer/BismNormalizer/source.extension.vsixmanifest +++ b/BismNormalizer/BismNormalizer/source.extension.vsixmanifest @@ -1,7 +1,7 @@  - + BISM Normalizer BISM Normalizer manages Analysis Services tabular models http://bism-normalizer.com/