Skip to content

Commit e19592b

Browse files
committed
Revert "NH-3336 - Fix error "MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery" by wrapping queries with limits into subquery"
This reverts commit 24ee723.
1 parent 0254751 commit e19592b

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

src/NHibernate/Dialect/MySQLDialect.cs

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Data;
3-
using System.Data.Common;
4-
using System.Globalization;
3+
using System.Data.Common;
54
using System.Text;
65
using NHibernate.Dialect.Function;
76
using NHibernate.Dialect.Schema;
@@ -178,12 +177,10 @@ public override bool SupportsSubSelects
178177
get { return false; }
179178
}
180179

181-
public override SqlString GetLimitString(SqlString queryString, SqlString offset, SqlString limit)
182-
{
183-
var pagingBuilder = new SqlStringBuilder()
184-
.Add("SELECT * FROM (")
185-
.Add(queryString)
186-
.Add(" limit ");
180+
public override SqlString GetLimitString(SqlString queryString, SqlString offset, SqlString limit)
181+
{
182+
var pagingBuilder = new SqlStringBuilder(queryString);
183+
pagingBuilder.Add(" limit ");
187184

188185
if (offset != null)
189186
{
@@ -194,10 +191,8 @@ public override SqlString GetLimitString(SqlString queryString, SqlString offset
194191
if (limit != null)
195192
pagingBuilder.Add(limit);
196193
else
197-
pagingBuilder.Add(int.MaxValue.ToString(CultureInfo.InvariantCulture));
194+
pagingBuilder.Add(int.MaxValue.ToString());
198195

199-
pagingBuilder.Add(") q_");
200-
201196
return pagingBuilder.ToSqlString();
202197
}
203198

0 commit comments

Comments
 (0)