Case sensitive bug fix #61

src/protobuf-net-data/ProtoDataReader.cs

@@ -604,15 +604,43 @@ private void Dispose(bool disposing)
 
         private int? GetColumnOrdinalByName(string name)
         {
+            // via case sensitive search, first match with lowest ordinal matches
+            var ordinal = this.GetColumnOrdinalByName(name, CompareOptions.None);
+            if (ordinal.HasValue)
+            {
+                return ordinal;
+            }
+
+            // via case insensitive search, first match with lowest ordinal matches
+            ordinal = this.GetColumnOrdinalByName(name, CompareOptions.IgnoreCase);
+            if (ordinal.HasValue)
+            {
+                return ordinal;
+            }
+
+            // do the slow search now (kana, width insensitive comparison)
+            var compareOptions = CompareOptions.IgnoreKanaType | CompareOptions.IgnoreWidth | CompareOptions.IgnoreCase;
+            ordinal = this.GetColumnOrdinalByName(name, compareOptions);
+            if (ordinal.HasValue)
+            {
+                return ordinal;
+            }
+
+            return null;
+        }
+
+        private int? GetColumnOrdinalByName(string name, CompareOptions compareOptions)
+        {
+            var compareInfo = CultureInfo.InvariantCulture.CompareInfo;
             for (var ordinal = 0; ordinal < this.context.Columns.Count; ordinal++)
             {
-                if (name == this.context.Columns[ordinal].Name)
+                if (compareInfo.Compare(name, this.context.Columns[ordinal].Name, compareOptions) == 0)
                 {
                     return ordinal;
                 }
-            }
-
-            return null;
+            }
+
+            return null;
         }
 
         private DataTable BuildSchemaTable()

test/protobuf-net-data.Tests/ProtoDataReaderTests.TheGetOrdinalMethod.cs

@@ -52,6 +52,51 @@ public void ShouldReturnCorrespondingOrdinal()
                 // Assert
                 Assert.Equal(1, dataReader.GetOrdinal(dataTable.Columns[1].ColumnName));
             }
+
+            [Fact]
+            public void ShouldReturnCorrespondingOrdinalWithCaseInsensitiveMatch()
+            {
+                // Arrange
+                var dataTable = new DataTable();
+
+                dataTable.Columns.Add("foo", typeof(int));
+                dataTable.Columns.Add("bar", typeof(int));
+
+                var dataReader = this.ToProtoDataReader(dataTable.CreateDataReader());
+
+                // Assert
+                Assert.Equal(1, dataReader.GetOrdinal("BAR"));
+            }
+
+            [Fact]
+            public void ShouldReturnCorrespondingOrdinalWithKanaInsensitiveMatch()
+            {
+                // Arrange
+                var dataTable = new DataTable();
+
+                dataTable.Columns.Add("foo", typeof(int));
+                dataTable.Columns.Add("カナ", typeof(int));
+
+                var dataReader = this.ToProtoDataReader(dataTable.CreateDataReader());
+
+                // Assert
+                Assert.Equal(1, dataReader.GetOrdinal("かな"));
+            }
+
+            [Fact]
+            public void ShouldReturnCorrespondingOrdinalWithWidthInsensitiveMatch()
+            {
+                // Arrange
+                var dataTable = new DataTable();
+
+                dataTable.Columns.Add("foo", typeof(int));
+                dataTable.Columns.Add("Ａｱ", typeof(int));
+
+                var dataReader = this.ToProtoDataReader(dataTable.CreateDataReader());
+
+                // Assert
+                Assert.Equal(1, dataReader.GetOrdinal("Aア"));
+            }
         }
     }
 }