From 0ed6cf9d36ee61ad8a2fc4f9cc3c2f73918c90cd Mon Sep 17 00:00:00 2001 From: Christian Wade Date: Wed, 29 Jan 2020 18:05:00 -0800 Subject: [PATCH] 3PT fixes --- .../AlmToolkit/Properties/AssemblyInfo.cs | 4 +-- .../Properties/AssemblyInfo.cs | 4 +-- .../Properties/AssemblyInfo.cs | 4 +-- .../BismNormalizer.IconSetup.exe | Bin 10240 -> 10240 bytes .../BismNormalizer/BismNormalizer.exe | Bin 16384 -> 16384 bytes .../BismNormalizer/Properties/AssemblyInfo.cs | 4 +-- .../TabularMetadata/TabularModel.cs | 30 +++++++++++------- .../source.extension.vsixmanifest | 2 +- 8 files changed, 28 insertions(+), 20 deletions(-) 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 63d71d7530bb3f713f1ab48f2aae0f26d18c2f48..8f8e48d41b6aebd5604cfe99fbcfd177e168cdb5 100644 GIT binary patch delta 253 zcmZn&Xb70l!MxDIXkvFGQw#q@Md8VcjO~mqn^!U(XJdRZxsXGYnUR5cb0-Hsr@+Jz z8D#;Ehn^cxuN1sLb#>_G6@s@Jxp){E*iH2e^bGYT_X&sTG5`&WV*mmsAeLcdVEAJQ z#KH^=LBTG;@v&+rq83iUAiYqg|nH(y9p4otbW3sx0Dyt!b9)t1bP>E(nW)q;$ZAndT funbeukn delta 262 zcmZn&Xb70l!93-T%*5_SrV0EL6@@1&GPW~L*u0YQI2+^3$%P!E%nS^?n>#u9IR%uO zX5LeoKhM8$?}an_i{IC8ULkm!k(-y1fx}eK00<2y_X>yU01b;{00Jf;mSJRI_+tpf z!VC;S!7jm7-GaqA4i*mEs^34CRD2?}SwJL*Nz{jhfnkCJ1H&$$RWPt?@takJ};KYC^gwoT$%CP-`01e7PfdBvi diff --git a/BismNormalizer/BismNormalizer/BismNormalizer.exe b/BismNormalizer/BismNormalizer/BismNormalizer.exe index 1c8e5728fdf6b3f34e45bdcd152657564c402524..6a09c21951bb6fd566f63c6cd885b870d43017ec 100644 GIT binary patch delta 407 zcmXw#KS)Ax5XbM{@0FUb(zNJ*iADrwPoICD4K4j62r5NHqWm*7g-ff@YYSR@{2W>v z4I<+gG(|2gA=DPMwMJ1x5G~PJc*EU&kKf&W?q?Wi7+5}JCwj;{8o?K{n(jJI0IUI7 z4#3xLdR&SDpfvRcz%chnexAWe{NM-VeY}ckY;crZitGbmAOQljb7xo;>(Xu~*2Hyp zMjk6jgYW~0%UFOC+<_DOQKrFdG#G*Lh}+93icR<8up{}lzw|u1H-GW5damwduS88v zNgWD;B@$2r!2ow?DL*l9Q!_0jEZSKjypjfxNG>Gn-WO|pAis1uR6YAHhE7FAvtm!3 zE^FCSGaolSeb^AU;T1GhnRi8ty*?SBoCBz^)=SE{8P)8pc^L6h97dSJ}^^NZ0rBu`x+9?xpxAw F`~pHMTh0Ig delta 417 zcmYjNJxc>Y5PfqOHNjkB{37Uy#wa5AamkrWA|fJ+h=rOE!zq5-2;wiWI6J{6$EK9@ zHY%*0SOlyDF`Xb{;SW#?>)@y;zF}u}9?YA!>p0{%R5((LPr7^DL9gy`9Y{O1PO8Q9Rk}a;N3+Bzb8qQE?LRjmdq*p(Z{g>o-{Ueg{zk4*_X&rm BT3i4C 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/