diff --git a/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs b/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs index 1ca6520..c0b09be 100644 --- a/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs +++ b/BismNormalizer/AlmToolkit/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("5.0.0.13")] -[assembly: AssemblyFileVersion("5.0.0.13")] +[assembly: AssemblyVersion("5.0.1.3")] +[assembly: AssemblyFileVersion("5.0.1.3")] diff --git a/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs index d0b9945..99a8841 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("5.0.0.13")] -[assembly: AssemblyFileVersion("5.0.0.13")] +[assembly: AssemblyVersion("5.0.1.3")] +[assembly: AssemblyFileVersion("5.0.1.3")] diff --git a/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs index 42db231..7b0b38c 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("5.0.0.13")] -[assembly: AssemblyFileVersion("5.0.0.13")] +[assembly: AssemblyVersion("5.0.1.3")] +[assembly: AssemblyFileVersion("5.0.1.3")] diff --git a/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe b/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe index 63d71d7..8f8e48d 100644 Binary files a/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe and b/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe differ diff --git a/BismNormalizer/BismNormalizer/BismNormalizer.exe b/BismNormalizer/BismNormalizer/BismNormalizer.exe index 1c8e572..6a09c21 100644 Binary files a/BismNormalizer/BismNormalizer/BismNormalizer.exe and b/BismNormalizer/BismNormalizer/BismNormalizer.exe differ diff --git a/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs index 1ae709d..e56ca14 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("5.0.0.13")] -[assembly: AssemblyFileVersion("5.0.0.13")] +[assembly: AssemblyVersion("5.0.1.3")] +[assembly: AssemblyFileVersion("5.0.1.3")] diff --git a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs index 1e1b33e..de758b3 100644 --- a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs +++ b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs @@ -1729,7 +1729,8 @@ namespace BismNormalizer.TabularCompare.TabularMetadata ( //check columns are both in same table (could have columns with same name in different tables) !(translation.Object.Parent.ObjectType == ObjectType.Table && namedObjectSource.Parent.ObjectType == ObjectType.Table) || - (((NamedMetadataObject)translation.Parent).Name == ((NamedMetadataObject)namedObjectSource.Parent).Name) + (((NamedMetadataObject)translation.Parent).Name == ((NamedMetadataObject)namedObjectSource.Parent).Name) || //Is this line necessary? I don't think so. + (((NamedMetadataObject)translation.Object.Parent).Name == ((NamedMetadataObject)namedObjectSource.Parent).Name) ) && translation.Property == translationSource.Property ) @@ -2134,19 +2135,26 @@ namespace BismNormalizer.TabularCompare.TabularMetadata private void UpdateWithScript() { - //_database.Update(Amo.UpdateOptions.ExpandFull); //If make minor changes to table (e.g. display folder) without changes to the partition or column structure, this command will still lose the data due to TOM applying a full log of operations. So instead reconnect and run TMSL script. + if (_connectionInfo.UseDesktop) + { + _database.Update(Amo.UpdateOptions.ExpandFull); //Not bothered about losing partition data, and till Desktop hardened, won't accept the full TMSL command + } + else + { + //_database.Update(Amo.UpdateOptions.ExpandFull); //If make minor changes to table (e.g. display folder) without changes to the partition or column structure, this command will still lose the data due to TOM applying a full log of operations. So instead reconnect and run TMSL script. - //includeRestrictedInformation only includes passwords in connections if they were added during this session (does not allow derivation of passwords from the server) - string tmslCommand = JsonScripter.ScriptCreateOrReplace(_database, includeRestrictedInformation: true); + //includeRestrictedInformation only includes passwords in connections if they were added during this session (does not allow derivation of passwords from the server) + string tmslCommand = JsonScripter.ScriptCreateOrReplace(_database, includeRestrictedInformation: true); - _server.Disconnect(); - _server = new Server(); - _server.Connect(_connectionInfo.BuildConnectionString()); - Amo.XmlaResultCollection results = _server.Execute(tmslCommand); - if (results.ContainsErrors) - throw new Amo.OperationException(results); + _server.Disconnect(); + _server = new Server(); + _server.Connect(_connectionInfo.BuildConnectionString()); + Amo.XmlaResultCollection results = _server.Execute(tmslCommand); + if (results.ContainsErrors) + throw new Amo.OperationException(results); - _database = _server.Databases.FindByName(_connectionInfo.DatabaseName); + _database = _server.Databases.FindByName(_connectionInfo.DatabaseName); + } //FROM THIS POINT ONWARDS use only TOM as have not bothered re-hydrating the BismNorm object model } diff --git a/BismNormalizer/BismNormalizer/source.extension.vsixmanifest b/BismNormalizer/BismNormalizer/source.extension.vsixmanifest index 69ec939..0eb4442 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/