Skip to content

Commit bf2fd3c

Browse files
committed
NH-4043 - PostgreSQL didn't like getting types.
1 parent 7e63fe8 commit bf2fd3c

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

src/NHibernate.Test/Tools/hbm2ddl/SchemaMetadataUpdaterTest/SchemaMetadataUpdaterFixture.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,8 @@ public void EnsureReservedWordsHardCodedInDialect()
7676
var metaData = dialect.GetDataBaseSchema(connectionHelper.Connection);
7777
foreach (var rw in metaData.GetReservedWords())
7878
{
79-
var rwl = rw.ToLowerInvariant();
80-
if (rwl.Contains(", version=")) continue;
81-
reservedDb.Add(rwl);
79+
if (rw.Contains(" ")) continue;
80+
reservedDb.Add(rw.ToLowerInvariant());
8281
}
8382
}
8483
finally

src/NHibernate/Dialect/Schema/PostgreSQLMetadata.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using System.Collections.Generic;
23
using System.Data;
34
using System.Data.Common;
45
using System.Globalization;
@@ -74,6 +75,17 @@ public override DataTable GetForeignKeys(string catalog, string schema, string t
7475
return foreignKeys;
7576
}
7677

78+
public override ISet<string> GetReservedWords()
79+
{
80+
var result = new HashSet<string>();
81+
DataTable dtReservedWords = Connection.GetSchema(DbMetaDataCollectionNames.ReservedWords);
82+
foreach (DataRow row in dtReservedWords.Rows)
83+
{
84+
result.Add(row["ReservedWord"].ToString());
85+
}
86+
87+
return result;
88+
}
7789
}
7890

7991
public class PostgreSQLTableMetadata : AbstractTableMetadata

0 commit comments

Comments
 (0)