Skip to content

Commit 6ea7f43

Browse files
committed
Revert "Merge pull request #251 from ggeurts/NH3594-Mssql2012Dialect"
This reverts commit 8531daf, reversing changes made to 8ddb412. Merged caused 30 test failures.
1 parent 2b6e12c commit 6ea7f43

File tree

4 files changed

+8
-15
lines changed

4 files changed

+8
-15
lines changed

src/NHibernate.Test/Linq/MethodCallTests.cs

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Linq;
33
using NHibernate.DomainModel.Northwind.Entities;
4-
using NHibernate.Hql.Ast.ANTLR;
54
using NUnit.Framework;
65

76
namespace NHibernate.Test.Linq
@@ -35,7 +34,6 @@ public void CanExecuteCountWithOrderByArguments()
3534
public void CanSelectPropertiesIntoObjectArray()
3635
{
3736
var result = db.Users
38-
.Where(u => u.Name == "ayende")
3937
.Select(u => new object[] {u.Id, u.Name, u.InvalidLoginAttempts})
4038
.First();
4139

@@ -48,8 +46,7 @@ public void CanSelectPropertiesIntoObjectArray()
4846
public void CanSelectComponentsIntoObjectArray()
4947
{
5048
var result = db.Users
51-
.Where(u => u.Component.Property1 == "test1")
52-
.Select(u => new object[] { u.Component, u.Component.OtherComponent })
49+
.Select(u => new object[] {u.Component, u.Component.OtherComponent})
5350
.First();
5451

5552
Assert.That(result.Length, Is.EqualTo(2));
@@ -84,8 +81,7 @@ public void CanSelectConstantsIntoObjectArray()
8481
const string name = "Julian";
8582

8683
var result = db.Users
87-
.OrderBy(u => u.Id)
88-
.Select(u => new object[] { u.Id, pi, name, DateTime.MinValue })
84+
.Select(u => new object[] {u.Id, pi, name, DateTime.MinValue})
8985
.First();
9086

9187
Assert.That(result.Length, Is.EqualTo(4));
@@ -98,7 +94,6 @@ public void CanSelectConstantsIntoObjectArray()
9894
public void CanSelectPropertiesFromAssociationsIntoObjectArray()
9995
{
10096
var result = db.Users
101-
.OrderBy(u => u.Id)
10297
.Select(u => new object[] {u.Id, u.Role.Name, u.Role.Entity.Output})
10398
.First();
10499

@@ -110,10 +105,8 @@ public void CanSelectPropertiesFromAssociationsIntoObjectArray()
110105
[Test, Description("NH-2744")]
111106
public void CanSelectPropertiesIntoNestedObjectArrays()
112107
{
113-
var result = db.Users
114-
.OrderBy(u => u.Id)
115-
.Select(u => new object[] { "Root", new object[] { "Sub1", u.Name, new object[] { "Sub2", u.Name } } })
116-
.First();
108+
var query = db.Users.Select(u => new object[] {"Root", new object[] {"Sub1", u.Name, new object[] {"Sub2", u.Name}}});
109+
var result = query.First();
117110

118111
Assert.That(result.Length, Is.EqualTo(2));
119112
Assert.That(result[0], Is.EqualTo("Root"));

src/NHibernate.Test/NHSpecificTest/NH2214/Fixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public void PagedQueryWithDistinctAndOrderingByNonProjectedColumn()
7979

8080
var query = criteria.GetExecutableCriteria(session);
8181

82-
Assert.Catch<HibernateException>(() => query.List());
82+
Assert.Throws<HibernateException>(() => query.List());
8383
}
8484
}
8585

src/NHibernate/Dialect/MsSql2005DialectQueryPager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ private static void BuildFromClauseForPagingQuery(MsSqlSelectParser sqlQuery, Sq
107107

108108
if (orderIndex == 0)
109109
{
110-
result.Add("1"); // order by first column in select clause
110+
result.Add("CURRENT_TIMESTAMP");
111111
}
112112

113113
result.Add(") as __hibernate_sort_row ")
@@ -134,7 +134,7 @@ private static void BuildFromClauseForPagingDistinctQuery(MsSqlSelectParser sqlQ
134134
}
135135
if (orderIndex == 0)
136136
{
137-
result.Add("1"); // order by first column in select
137+
result.Add("CURRENT_TIMESTAMP");
138138
}
139139

140140
result.Add(") as __hibernate_sort_row FROM (")

src/NHibernate/Dialect/MsSql2012Dialect.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public override SqlString GetLimitString(SqlString querySqlString, SqlString off
6464
var result = new SqlStringBuilder(querySqlString);
6565
if (!tokenEnum.TryParseUntil("order"))
6666
{
67-
result.Add(" ORDER BY 1"); // Order by first column in select clause
67+
result.Add(" ORDER BY CURRENT_TIMESTAMP");
6868
}
6969

7070
result.Add(" OFFSET ");

0 commit comments

Comments
 (0)