Skip to content

Commit e1c1018

Browse files
hazzikhazzik
committed
Merge branch 'NH-1752' of https://github.com/fredericDelaporte/nhibernate-core into fredericDelaporte-NH-1752
2 parents 60839bd + 15575b4 commit e1c1018

File tree

27 files changed

+186
-83
lines changed

27 files changed

+186
-83
lines changed

‎build-common/nhibernate-properties.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<project xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd">
33
<property name="nhibernate.dialect" value="NHibernate.Dialect.MsSql2008Dialect" overwrite="false"/>
44
<property name="nhibernate.command_timeout" value="444" overwrite="false"/>
5-
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.SqlClientDriver" overwrite="false"/>
5+
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.Sql2008ClientDriver" overwrite="false"/>
66
<property name="nhibernate.connection.connection_string" value="Server=.\SQLExpress;initial catalog=nhibernate;Integrated Security=SSPI" overwrite="false"/>
77
</project>

‎build-common/teamcity-hibernate.cfg.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<property name="format_sql">true</property>
1616

1717
<!-- This is the System.Data.dll provider for MSSQL Server -->
18-
<property name="connection.driver_class">NHibernate.Driver.SqlClientDriver</property>
18+
<property name="connection.driver_class">NHibernate.Driver.Sql2008ClientDriver</property>
1919
<property name="dialect">NHibernate.Dialect.MsSql2008Dialect</property>
2020
<property name="connection.connection_string">Server=.\SQLExpress;initial catalog=nhibernate;Integrated Security=SSPI</property>
2121
<property name="show_sql">false</property>

‎doc/reference/modules/configuration.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1002,12 +1002,6 @@ ISession session = sessions.OpenSession(conn);
10021002
<session-factory>
10031003
10041004
<!-- properties -->
1005-
<property name="connection.provider">
1006-
NHibernate.Connection.DriverConnectionProvider
1007-
</property>
1008-
<property name="connection.driver_class">
1009-
NHibernate.Driver.SqlClientDriver
1010-
</property>
10111005
<property name="connection.connection_string">
10121006
Server=localhost;initial catalog=nhibernate;User Id=;Password=
10131007
</property>

‎doc/reference/modules/example_weblog.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -333,9 +333,6 @@ namespace Eg
333333
<hibernate-configuration xmlns="urn:nhibernate-configuration-2.2">
334334
<session-factory>
335335
<property name="dialect">NHibernate.Dialect.MsSql2012Dialect</property>
336-
<property name="connection.provider">
337-
NHibernate.Connection.DriverConnectionProvider
338-
</property>
339336
<property name="connection.connection_string">
340337
Server=localhost\SQLEXPRESS;initial catalog=Eg;Integrated Security=True
341338
</property>

‎doc/reference/modules/quickstart.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@
5252
<hibernate-configuration xmlns="urn:nhibernate-configuration-2.2">
5353
<session-factory>
5454
<property name="dialect">NHibernate.Dialect.MsSql2012Dialect</property>
55-
<property name="connection.provider">
56-
NHibernate.Connection.DriverConnectionProvider
57-
</property>
5855
<property name="connection.connection_string">
5956
Server=localhost\SQLEXPRESS;initial catalog=quickstart;Integrated Security=True
6057
</property>

‎src/NHibernate.Config.Templates/MSSQL.cfg.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ for your own use before compile tests in VisualStudio.
77
<!-- This is the System.Data.dll provider for SQL Server -->
88
<hibernate-configuration xmlns="urn:nhibernate-configuration-2.2" >
99
<session-factory name="NHibernate.Test">
10-
<property name="connection.driver_class">NHibernate.Driver.SqlClientDriver</property>
10+
<property name="connection.driver_class">NHibernate.Driver.Sql2008ClientDriver</property>
1111
<property name="connection.connection_string">
1212
Server=(local);initial catalog=nhibernate;Integrated Security=SSPI
1313
</property>
1414
<property name="dialect">NHibernate.Dialect.MsSql2008Dialect</property>
1515
</session-factory>
16-
</hibernate-configuration>
16+
</hibernate-configuration>

‎src/NHibernate.Example.Web/Infrastructure/AppSessionFactory.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public AppSessionFactory(Microsoft.Extensions.Logging.ILoggerFactory loggerFacto
2424
{
2525
db.ConnectionString = @"Server=(local)\SQLEXPRESS;initial catalog=nhibernate;Integrated Security=true";
2626
db.Dialect<MsSql2008Dialect>();
27-
db.Driver<SqlClientDriver>();
27+
db.Driver<Sql2008ClientDriver>();
2828
})
2929
.AddMapping(domainMapping);
3030
Configuration.SessionFactory().GenerateStatistics();
@@ -37,4 +37,4 @@ public ISession OpenSession()
3737
return SessionFactory.OpenSession();
3838
}
3939
}
40-
}
40+
}

‎src/NHibernate.Test/App.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
<property name="dialect">NHibernate.Dialect.MsSql2008Dialect</property>
3232

33-
<property name="connection.driver_class">NHibernate.Driver.SqlClientDriver</property> <!-- Shouldn't be necessary, but is required by some tests -->
33+
<property name="connection.driver_class">NHibernate.Driver.Sql2008ClientDriver</property> <!-- Shouldn't be necessary, but is required by some tests -->
3434
<property name="connection.connection_string_name">TestConnectionString</property>
3535
<property name="connection.provider">NHibernate.Test.DebugConnectionProvider, NHibernate.Test</property>
3636
<property name="connection.isolation">ReadCommitted</property> <!-- See System.Data.IsolationLevel for valid values -->

‎src/NHibernate.Test/Async/FilterTest/DynamicFilterTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -773,4 +773,4 @@ public void Dispose()
773773
}
774774
}
775775
}
776-
}
776+
}

‎src/NHibernate.Test/Async/TypesTest/DateTypeTest.cs

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
//------------------------------------------------------------------------------
2+
// <auto-generated>
3+
// This code was generated by AsyncGenerator.
4+
//
5+
// Changes to this file may cause incorrect behavior and will be lost if
6+
// the code is regenerated.
7+
// </auto-generated>
8+
//------------------------------------------------------------------------------
9+
10+
11+
using System.Collections.Generic;
12+
using NHibernate.Dialect;
13+
using NHibernate.Type;
14+
using NUnit.Framework;
15+
using System;
16+
17+
namespace NHibernate.Test.TypesTest
18+
{
19+
using System.Threading.Tasks;
20+
using System.Threading;
21+
22+
[TestFixture]
23+
public class DateTypeFixtureAsync : TypeFixtureBase
24+
{
25+
protected override string TypeName
26+
{
27+
get { return "Date"; }
28+
}
29+
30+
[Test]
31+
public Task ReadWriteNormalAsync()
32+
{
33+
try
34+
{
35+
var expected = DateTime.Today.Date;
36+
37+
return ReadWriteAsync(expected);
38+
}
39+
catch (Exception ex)
40+
{
41+
return Task.FromException<object>(ex);
42+
}
43+
}
44+
45+
[Test]
46+
public Task ReadWriteMinAsync()
47+
{
48+
try
49+
{
50+
var expected = Sfi.ConnectionProvider.Driver.MinDate;
51+
52+
return ReadWriteAsync(expected);
53+
}
54+
catch (Exception ex)
55+
{
56+
return Task.FromException<object>(ex);
57+
}
58+
}
59+
60+
private async Task ReadWriteAsync(DateTime expected, CancellationToken cancellationToken = default(CancellationToken))
61+
{
62+
var basic = new DateClass { DateValue = expected.AddHours(1) };
63+
object savedId;
64+
using (var s = OpenSession())
65+
{
66+
savedId = await (s.SaveAsync(basic, cancellationToken));
67+
await (s.FlushAsync(cancellationToken));
68+
}
69+
using (var s = OpenSession())
70+
{
71+
basic = await (s.GetAsync<DateClass>(savedId, cancellationToken));
72+
Assert.That(basic.DateValue, Is.EqualTo(expected));
73+
await (s.DeleteAsync(basic, cancellationToken));
74+
await (s.FlushAsync(cancellationToken));
75+
}
76+
}
77+
}
78+
}

0 commit comments

Comments
 (0)