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

Commit e8f702d

Browse files
committed
Fix Limit expression in SqlServer
1 parent 0fb975e commit e8f702d

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

src/ServiceStack.OrmLite.SqlServer/SqlServerExpression.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,12 @@ public override string ToSelectStatement()
3737
OrderByExpression = String.Empty; // Required because ordering is done by Windowing function
3838

3939
//todo: review needed only check against sql server 2008 R2
40-
41-
var selectExpression = SelectExpression.Remove(SelectExpression.IndexOf("FROM")).Trim(); //0
4240
var tableName = OrmLiteConfig.DialectProvider.GetQuotedTableName(ModelDef).Trim(); //2
4341
var statement = string.Format("{0} {1} {2}", WhereExpression, GroupByExpression, HavingExpression).Trim();
4442

4543
var retVal = string.Format(
4644
"{0} FROM (SELECT ROW_NUMBER() OVER ({1}) As RowNum, * FROM {2} {3}) AS RowConstrainedResult WHERE RowNum > {4} AND RowNum <= {5}",
47-
selectExpression,
45+
SelectExpression,
4846
orderBy,
4947
tableName,
5048
statement,

src/ServiceStack.OrmLite.SqlServerTests/SqlServerExpressionVisitorQueryTest.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,12 @@ public void test_if_and_works_with_nullable_parameter()
105105
using(var db = OpenDbConnection())
106106
{
107107
db.CreateTable<TestEntity>(true);
108-
db.Insert(new TestEntity
108+
var id = db.Insert(new TestEntity
109109
{
110110
Foo = this.RandomString(16),
111111
Bar = this.RandomString(16),
112112
Baz = this.RandomDecimal()
113-
});
114-
115-
var id = (int)db.LastInsertId();
113+
}, selectIdentity: true);
116114

117115
var ev = OrmLiteConfig.DialectProvider.SqlExpression<TestEntity>();
118116
ev.Where(e => e.Id == id);

0 commit comments

Comments
 (0)