Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions src/NHibernate.Test/NHSpecificTest/NH3749/Fixture.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
using NUnit.Framework;
using NHibernate.Mapping;

namespace NHibernate.Test.NHSpecificTest.NH3749
{
[TestFixture]
public class Fixture
{
[Test]
public void SupportsNotNullUniqueFalse()
{
Table tbl = new Table();
tbl.Name = "Table";

Column column = new Column("Column");
column.IsNullable = true;

UniqueKey uk = new UniqueKey { Name = "UniqueKey", Table = tbl };
uk.Columns.Add(column);

tbl.AddUniqueKey(uk);

Dialect.Dialect dialect = new TestDialect();

string sql = tbl.SqlCreateString(dialect, null, "", "");

Assert.IsFalse(sql.Contains(",)"), "Create command has unnecessary comma: " + sql);
}
}
}
11 changes: 11 additions & 0 deletions src/NHibernate.Test/NHSpecificTest/NH3749/TestDialect.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@

namespace NHibernate.Test.NHSpecificTest.NH3749
{
public class TestDialect : Dialect.Dialect
{
public override bool SupportsNotNullUnique
{
get { return false; }
}
}
}
6 changes: 5 additions & 1 deletion src/NHibernate/Mapping/Table.cs
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,11 @@ public string SqlCreateString(Dialect.Dialect dialect, IMapping p, string defaul

foreach (UniqueKey uk in UniqueKeyIterator)
{
buf.Append(',').Append(uk.SqlConstraintString(dialect));
string ukSql = uk.SqlConstraintString(dialect);
if (!string.IsNullOrEmpty(ukSql))
{
buf.Append(',').Append(ukSql);
}
}

if (dialect.SupportsTableCheck)
Expand Down