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

3PT fixes

Browse Source
This commit is contained in:
Christian Wade 2020-01-29 18:05:00 -08:00
parent 1cb859c531
commit 0ed6cf9d36
8 changed files with 28 additions and 20 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.0.13")] [assembly: AssemblyVersion("5.0.1.3")]
[assembly: AssemblyFileVersion("5.0.0.13")] [assembly: AssemblyFileVersion("5.0.1.3")]

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.0.13")] [assembly: AssemblyVersion("5.0.1.3")]
[assembly: AssemblyFileVersion("5.0.0.13")] [assembly: AssemblyFileVersion("5.0.1.3")]

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.0.13")] [assembly: AssemblyVersion("5.0.1.3")]
[assembly: AssemblyFileVersion("5.0.0.13")] [assembly: AssemblyFileVersion("5.0.1.3")]

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.0.13")] [assembly: AssemblyVersion("5.0.1.3")]
[assembly: AssemblyFileVersion("5.0.0.13")] [assembly: AssemblyFileVersion("5.0.1.3")]

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

@ -1729,7 +1729,8 @@ namespace BismNormalizer.TabularCompare.TabularMetadata
( (
//check columns are both in same table (could have columns with same name in different tables) //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) || !(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 translation.Property == translationSource.Property
) )
@ -2134,19 +2135,26 @@ namespace BismNormalizer.TabularCompare.TabularMetadata
private void UpdateWithScript() 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) //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); string tmslCommand = JsonScripter.ScriptCreateOrReplace(_database, includeRestrictedInformation: true);
_server.Disconnect(); _server.Disconnect();
_server = new Server(); _server = new Server();
_server.Connect(_connectionInfo.BuildConnectionString()); _server.Connect(_connectionInfo.BuildConnectionString());
Amo.XmlaResultCollection results = _server.Execute(tmslCommand); Amo.XmlaResultCollection results = _server.Execute(tmslCommand);
if (results.ContainsErrors) if (results.ContainsErrors)
throw new Amo.OperationException(results); 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 //FROM THIS POINT ONWARDS use only TOM as have not bothered re-hydrating the BismNorm object model
} }

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.2" Language="en-US" Publisher="BISM Normalizer" /> <Identity Id="BismNormalizer.ea2aeb43-64a6-4dee-8816-099fb44513fa" Version="5.0.1.3" 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>