Skip to content

Commit fb5fd49

Browse files
Saad HESSANEfredericDelaporte
Saad HESSANE
authored andcommitted
Add fallback to "TypeName" if "SQL_TYPE_NAME" is not found
1 parent 6610eac commit fb5fd49

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

src/NHibernate/Dialect/Schema/DB2MetaData.cs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,19 @@ public override ISet<string> GetReservedWords()
3737

3838
var dtTypes = Connection.GetSchema(DbMetaDataCollectionNames.DataTypes);
3939

40-
var typeNameColumn = dtTypes.Columns.Cast<DataColumn>()
41-
.FirstOrDefault(column => column.ColumnName == "SQL_TYPE_NAME");
40+
var typeNameColumnIndex = dtTypes.Columns.IndexOf("SQL_TYPE_NAME");
4241

43-
if (typeNameColumn == null) //todo We can try to fallback to "TypeName" columnName
44-
return result;
42+
if (typeNameColumnIndex == -1)
43+
{
44+
typeNameColumnIndex = dtTypes.Columns.IndexOf("TypeName");
45+
46+
if (typeNameColumnIndex == -1)
47+
return result;
48+
}
4549

4650
foreach (DataRow row in dtTypes.Rows)
4751
{
48-
result.Add(row[typeNameColumn].ToString());
52+
result.Add(row[typeNameColumnIndex].ToString());
4953
}
5054

5155
return result;

0 commit comments

Comments
 (0)