Skip to content

Commit ed371c5

Browse files
oskarbjulian-maughan
authored andcommitted
SequenceStyleGenerator.cs: Delegate table/sequence name qualification to the dialect.
Table.cs: Remove Table.Qualify(), with no remaining users.
1 parent ce12a5f commit ed371c5

File tree

2 files changed

+3
-16
lines changed

2 files changed

+3
-16
lines changed

src/NHibernate/Id/Enhanced/SequenceStyleGenerator.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ protected string DetermineSequenceName(IDictionary<string, string> parms, Dialec
135135
string catalogName;
136136
parms.TryGetValue(PersistentIdGeneratorParmsNames.Schema, out schemaName);
137137
parms.TryGetValue(PersistentIdGeneratorParmsNames.Catalog, out catalogName);
138-
sequenceName = Table.Qualify(catalogName, schemaName, sequenceName);
138+
sequenceName = dialect.Qualify(catalogName, schemaName, sequenceName);
139139
}
140140
else
141141
{

src/NHibernate/Mapping/Table.cs

+2-15
Original file line numberDiff line numberDiff line change
@@ -984,7 +984,7 @@ public void ValidateColumns(Dialect.Dialect dialect, IMapping mapping, ITableMet
984984
if (columnInfo == null)
985985
{
986986
throw new HibernateException(string.Format("Missing column: {0} in {1}", column.Name,
987-
Qualify(tableInfo.Catalog, tableInfo.Schema, tableInfo.Name)));
987+
dialect.Qualify(tableInfo.Catalog, tableInfo.Schema, tableInfo.Name)));
988988
}
989989

990990
else
@@ -995,27 +995,14 @@ public void ValidateColumns(Dialect.Dialect dialect, IMapping mapping, ITableMet
995995
if (!typesMatch)
996996
{
997997
throw new HibernateException(string.Format("Wrong column type in {0} for column {1}. Found: {2}, Expected {3}",
998-
Qualify(tableInfo.Catalog, tableInfo.Schema, tableInfo.Name),
998+
dialect.Qualify(tableInfo.Catalog, tableInfo.Schema, tableInfo.Name),
999999
column.Name, columnInfo.TypeName.ToLower(),
10001000
column.GetSqlType(dialect, mapping)));
10011001
}
10021002
}
10031003
}
10041004
}
10051005

1006-
public static string Qualify(string catalog, string schema, string table)
1007-
{
1008-
var qualifiedName = new StringBuilder(100);
1009-
if (catalog != null)
1010-
{
1011-
qualifiedName.Append(catalog).Append('.');
1012-
}
1013-
if (schema != null)
1014-
{
1015-
qualifiedName.Append(schema).Append('.');
1016-
}
1017-
return qualifiedName.Append(table).ToString();
1018-
}
10191006

10201007
#region Nested type: ForeignKeyKey
10211008
[Serializable]

0 commit comments

Comments
 (0)