Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit 0d2b99e

Browse files
committed
don't prefix with Table name if interface
1 parent 3a04482 commit 0d2b99e

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

src/ServiceStack.OrmLite/Expressions/SqlExpression.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1980,7 +1980,7 @@ protected virtual string GetQuotedColumnName(ModelDefinition tableDef, string me
19801980
? fd.FieldName
19811981
: memberName;
19821982

1983-
var includePrefix = PrefixFieldWithTableName && fd?.CustomSelect == null;
1983+
var includePrefix = PrefixFieldWithTableName && fd?.CustomSelect == null && !tableDef.ModelType.IsInterface();
19841984
return includePrefix
19851985
? DialectProvider.GetQuotedColumnName(tableDef, fieldName)
19861986
: DialectProvider.GetQuotedColumnName(fieldName);

tests/ServiceStack.OrmLite.Tests/UseCase/SoftDeleteUseCase.cs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using NUnit.Framework;
22
using ServiceStack.DataAnnotations;
3+
using ServiceStack.OrmLite.Tests.Shared;
34

45
namespace ServiceStack.OrmLite.Tests.UseCase
56
{
@@ -98,6 +99,10 @@ public void Can_add_generic_soft_delete_filter_to_SqlExpression_using_SqlExpress
9899
db.Insert(new ModelWithSoftDelete { Name = "foo" });
99100
db.Insert(new ModelWithSoftDelete { Name = "bar", IsDeleted = true });
100101

102+
db.DropAndCreateTable<Table1>();
103+
db.Insert(new Table1 { Id = 1, String = "foo" });
104+
db.Insert(new Table1 { Id = 2, String = "bar" });
105+
101106
var results = db.Select(db.From<ModelWithSoftDelete>());
102107

103108
Assert.That(results.Count, Is.EqualTo(1));
@@ -114,6 +119,16 @@ public void Can_add_generic_soft_delete_filter_to_SqlExpression_using_SqlExpress
114119
result = db.Single<ModelWithSoftDelete>(x => x.Name == "bar");
115120
Assert.That(result, Is.Null);
116121

122+
result = db.Single(db.From<ModelWithSoftDelete>()
123+
.Join<Table1>((m, t) => m.Name == t.String)
124+
.Where(x => x.Name == "foo"));
125+
Assert.That(result.Name, Is.EqualTo("foo"));
126+
127+
result = db.Single(db.From<ModelWithSoftDelete>()
128+
.Join<Table1>((m, t) => m.Name == t.String)
129+
.Where(x => x.Name == "bar"));
130+
Assert.That(result, Is.Null);
131+
117132
OrmLiteConfig.SqlExpressionSelectFilter = null;
118133
}
119134
}

0 commit comments

Comments
 (0)