Skip to content

Commit 02bcc42

Browse files
Fix types handled as SQL strings
Not including EnumStringType which ObjectToSQLString is invalid.
1 parent 2da9e9e commit 02bcc42

File tree

3 files changed

+3
-10
lines changed

3 files changed

+3
-10
lines changed

src/NHibernate/Type/CharBooleanType.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using System.Data.Common;
44
using NHibernate.Engine;
55
using NHibernate.SqlTypes;
6-
using NHibernate.Util;
76

87
namespace NHibernate.Type
98
{
@@ -57,9 +56,7 @@ private string ToCharacter(object value)
5756
}
5857

5958
public override string ObjectToSQLString(object value, Dialect.Dialect dialect)
60-
{
61-
return "'" + ToCharacter(value) + "'";
62-
}
59+
=> dialect.ToStringLiteral(ToCharacter(value), SqlType);
6360

6461
// 6.0 TODO: rename "xml" parameter as "value": it is not a xml string. The fact it generally comes from a xml
6562
// attribute value is irrelevant to the method behavior.

src/NHibernate/Type/EnumCharType.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,6 @@ public override object FromStringValue(string xml)
171171
}
172172

173173
public override string ObjectToSQLString(object value, Dialect.Dialect dialect)
174-
{
175-
return '\'' + GetValue(value).ToString() + '\'';
176-
}
174+
=> dialect.ToStringLiteral(GetValue(value).ToString(), SqlType);
177175
}
178176
}

src/NHibernate/Type/UriType.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,7 @@ public override object FromStringValue(string xml)
8484
}
8585

8686
public string ObjectToSQLString(object value, Dialect.Dialect dialect)
87-
{
88-
return "'" + ((Uri)value).OriginalString + "'";
89-
}
87+
=> dialect.ToStringLiteral(((Uri) value).OriginalString, SqlType);
9088

9189
/// <inheritdoc />
9290
public override object Assemble(object cached, ISessionImplementor session, object owner)

0 commit comments

Comments
 (0)