Fixes #658 case sensitive when passing database name on commandline

DaxStudio · Jun 25, 2021 · 7e4eafb · 7e4eafb
1 parent fd4b63d
commit 7e4eafb
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/src/ADOTabular/ADOTabularConnection.cs b/src/ADOTabular/ADOTabularConnection.cs
@@ -102,7 +102,7 @@ public ADOTabularDatabase Database
                     var db = dd[_currentDatabase];
                     if (_db == null || db.Id != _db.Id) // && db.Name != FileName)
                     {
-                        _db = new ADOTabularDatabase(this, _currentDatabase, db.Id, db.LastUpdate, db.CompatibilityLevel, db.Roles);
+                        _db = new ADOTabularDatabase(this, db.Name, db.Id, db.LastUpdate, db.CompatibilityLevel, db.Roles);
                         _db.Caption = db.Caption;
                     } 
 

diff --git a/src/ADOTabular/ADOTabularDatabaseCollection.cs b/src/ADOTabular/ADOTabularDatabaseCollection.cs
@@ -127,7 +127,7 @@ private void MergeDatabaseDictionaries(IDictionary<string, DatabaseDetails> tmpD
 
         private IDictionary<string, DatabaseDetails> GetDatabaseDictionaryFromDMV()
         {
-            var databaseDictionary = new SortedDictionary<string, DatabaseDetails>();
+            var databaseDictionary = new SortedDictionary<string, DatabaseDetails>(StringComparer.OrdinalIgnoreCase);
             var ds = _adoTabConn.GetSchemaDataSet("DBSCHEMA_CATALOGS", null);
             foreach( DataRow row in ds.Tables[0].Rows)
             {
@@ -148,7 +148,7 @@ private void MergeDatabaseDictionaries(IDictionary<string, DatabaseDetails> tmpD
         private IDictionary<string, DatabaseDetails> GetDatabaseDictionaryFromXml()
         {
 
-            var databaseDictionary = new SortedDictionary<string, DatabaseDetails>();
+            var databaseDictionary = new SortedDictionary<string, DatabaseDetails>(StringComparer.OrdinalIgnoreCase);
 
             var ds = _adoTabConn.GetSchemaDataSet("DISCOVER_XML_METADATA",
                                                  new AdomdRestrictionCollection

diff --git a/src/ADOTabular/AdomdClientWrappers/AdomdConnection.cs b/src/ADOTabular/AdomdClientWrappers/AdomdConnection.cs
@@ -123,6 +123,7 @@ public void ChangeDatabase(string database)
         {
             if (database == null) return; 
             if (database.Trim().Length == 0) return;
+            if (String.Compare(database, _conn.Database, true) == 0) return;
             if (_type == AdomdType.AnalysisServices)
             {
                 _conn.ChangeDatabase(database);

diff --git a/src/ADOTabular/MetaDataVisitorCSDL.cs b/src/ADOTabular/MetaDataVisitorCSDL.cs
@@ -823,7 +823,7 @@ private void ProcessDisplayFolder(XmlReader rdr, ADOTabularTable table, IADOTabu
             var folderReference = "";
             string folderCaption = null;
             string objRef = "";
-            bool hasVisibleChild = false;
+
             IADOTabularFolderReference folder = null;
 
             while (!(rdr.NodeType == XmlNodeType.EndElement