Skip to content

Commit 4494e9a

Browse files
fixup! Obsolete fixes in documentation.
1 parent 75d7380 commit 4494e9a

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

doc/reference/modules/basic_mapping.xml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2650,7 +2650,7 @@
26502650
</entry>
26512651
<entry>
26522652
Default when no <literal>type</literal> attribute specified. Does no
2653-
more ignore milliseconds since NHibernate v5.0.
2653+
longer ignore fractional seconds since NHibernate v5.0.
26542654
</entry>
26552655
</row>
26562656
<row>
@@ -2659,7 +2659,10 @@
26592659
<entry>
26602660
<literal>DbType.DateTime</literal> / <literal>DbType.DateTime2</literal><coref linkend="basic_mapping.datetime-co" />
26612661
</entry>
2662-
<entry><literal>type="DateTimeNoMs"</literal> must be specified. Ignores milliseconds.</entry>
2662+
<entry>
2663+
<literal>type="DateTimeNoMs"</literal> must be specified. Ignores fractional seconds.
2664+
Available since NHibernate v5.0.
2665+
</entry>
26632666
</row>
26642667
<row>
26652668
<entry><literal>DateTime2</literal></entry>
@@ -2734,7 +2737,7 @@
27342737
<literal>type="LocalDateTime"</literal> must be specified. Ensures the
27352738
<literal>DateTimeKind</literal> is set to <literal>DateTimeKind.Local</literal>.
27362739
Throws if set with a date having another kind.
2737-
Does no more ignore milliseconds since NHibernate v5.0.
2740+
Does no longer ignore fractional seconds since NHibernate v5.0.
27382741
</entry>
27392742
</row>
27402743
<row>
@@ -2745,7 +2748,8 @@
27452748
</entry>
27462749
<entry>
27472750
<literal>type="LocalDateTimeNoMs"</literal> must be specified. Similar to
2748-
<literal>type="LocalDateTime"</literal> but ignores milliseconds.
2751+
<literal>LocalDateTime</literal> but ignores fractional seconds.
2752+
Available since NHibernate v5.0.
27492753
</entry>
27502754
</row>
27512755
<row>
@@ -2836,7 +2840,7 @@
28362840
<entry>
28372841
Ensures the <literal>DateTimeKind</literal> is set to <literal>DateTimeKind.Utc</literal>.
28382842
Throws if set with a date having another kind.
2839-
Does no more ignore milliseconds since NHibernate v5.0.
2843+
Does no longer ignore fractional seconds since NHibernate v5.0.
28402844
</entry>
28412845
</row>
28422846
<row>
@@ -2847,7 +2851,8 @@
28472851
</entry>
28482852
<entry>
28492853
<literal>type="UtcDateTimeNoMs"</literal> must be specified. Similar to
2850-
<literal>type="LocalDateTime"</literal> but ignores milliseconds.
2854+
<literal>UtcDateTime</literal> but ignores fractional seconds.
2855+
Available since NHibernate v5.0.
28512856
</entry>
28522857
</row>
28532858
<row>

doc/reference/modules/query_linq.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -428,15 +428,15 @@ using NHibernate.Linq;]]></programlisting>
428428
At that point, all defined future results are evaluated in one single round-trip to database.
429429
</para>
430430
<programlisting><![CDATA[// Define queries
431-
IEnumerable<Cat> cats =
431+
IFutureEnumerable<Cat> cats =
432432
session.Query<Cat>()
433433
.Where(c => c.Color == "black")
434434
.ToFuture();
435435
IFutureValue<int> catCount =
436436
session.Query<Cat>()
437437
.ToFutureValue(q => q.Count());
438438
// Execute them
439-
foreach(Cat cat in cats)
439+
foreach(Cat cat in cats.GetEnumerable())
440440
{
441441
// Do something
442442
}
@@ -447,7 +447,9 @@ if (catCount.Value > 10)
447447
]]></programlisting>
448448
<para>
449449
In above example, accessing <literal>catCount.Value</literal> does not trigger a round-trip to database:
450-
it has been evaluated with <literal>cats</literal> enumeration.
450+
it has been evaluated with <literal>cats.GetEnumerable()</literal> call. If instead
451+
<literal>catCount.Value</literal> was accessed first, it would have executed both future and
452+
<literal>cats.GetEnumerable()</literal> would have not trigger a round-trip to database.
451453
</para>
452454
</sect1>
453455

@@ -482,6 +484,7 @@ IList<Cat> oldCats =
482484
oldCatsQuery
483485
.FetchMany(c => c.AnotherCollection)
484486
.ToFuture()
487+
.GetEnumerable()
485488
.ToList();]]></programlisting>
486489
<para>&nbsp;</para>
487490

0 commit comments

Comments
 (0)