From a11f2367e3b64b7ad3cff79ba917023f31b1faa7 Mon Sep 17 00:00:00 2001
From: Xiaogang Cao <caoxg@yahoo.com>
Date: Thu, 2 Feb 2006 15:35:28 +0000
Subject: [PATCH] update to v3.1.2

git-svn-id: https://svn.jboss.org/repos/hibernate/trunk/Hibernate3/doc@9198 1b8cb986-b30d-0410-93ca-fae66ebed9b2
---
 reference/zh-cn/master.xml                |  2 +-
 reference/zh-cn/modules/basic_mapping.xml |  4 ++--
 reference/zh-cn/modules/batch.xml         | 19 ++++++++++++++++++-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/reference/zh-cn/master.xml b/reference/zh-cn/master.xml
index 8430fdba34..9cb185234a 100644
--- a/reference/zh-cn/master.xml
+++ b/reference/zh-cn/master.xml
@@ -35,7 +35,7 @@
         <title>HIBERNATE - 符合Java习惯的关系数据库持久化</title>
         
         <subtitle>Hibernate参考文档</subtitle>
-        <releaseinfo>3.1.1</releaseinfo>
+        <releaseinfo>3.1.2</releaseinfo>
     </bookinfo>
 
     <toc/>
diff --git a/reference/zh-cn/modules/basic_mapping.xml b/reference/zh-cn/modules/basic_mapping.xml
index ecc0cc2a56..dcc3067cb8 100644
--- a/reference/zh-cn/modules/basic_mapping.xml
+++ b/reference/zh-cn/modules/basic_mapping.xml
@@ -1071,7 +1071,7 @@
             </para>
         </sect2>
         
-        <sect2 id="mapping-declaration-timestamp" revision="3">
+        <sect2 id="mapping-declaration-timestamp" revision="4">
             <title>timestamp (optional)</title>
 
             <para>
@@ -1140,7 +1140,7 @@
             </programlistingco>
             
             <para>
-                注意，<literal>&lt;timestamp&gt;</literal> 和<literal>&lt;version type="timestamp"&gt;</literal>是等价的。并且<literal>&lt;timestamp use-db="true"&gt;</literal>和<literal>&lt;version type="dbtimestamp"&gt;</literal>是等价的。
+                注意，<literal>&lt;timestamp&gt;</literal> 和<literal>&lt;version type="timestamp"&gt;</literal>是等价的。并且<literal>&lt;timestamp source="true"&gt;</literal>和<literal>&lt;version type="dbtimestamp"&gt;</literal>是等价的。
             </para>
         </sect2>
 
diff --git a/reference/zh-cn/modules/batch.xml b/reference/zh-cn/modules/batch.xml
index 52e5df6245..a9122ca9d0 100644
--- a/reference/zh-cn/modules/batch.xml
+++ b/reference/zh-cn/modules/batch.xml
@@ -123,7 +123,7 @@ session.close();]]></programlisting>
 
     </sect1>
 
-    <sect1 id="batch-direct" revision="2">
+    <sect1 id="batch-direct" revision="3">
         <title>DML(数据操作语言)风格的操作(DML-style operations)</title>
 
         <para>
@@ -189,6 +189,23 @@ session.close();]]></programlisting>
 		tx.commit();
 		session.close();]]></programlisting>
 
+        <para>
+            HQL <literal>UPDATE</literal>语句，默认不会影响更新实体的<xref linkend="mapping-declaration-version">version</xref>或者<xref linkend="mapping-declaration-timestamp">timestamp</xref>属性值。这和EJB3规范是一致的。但是，通过使用<literal>versioned update</literal>，你可以强制Hibernate正确的重置<literal>version</literal>或者<literal>timestamp</literal>属性值。这通过在<literal>UPDATE</literal>关键字后面增加<literal>VERSIONED</literal>关键字来实现的。
+        </para>
+<programlisting><![CDATA[Session session = sessionFactory.openSession();
+Transaction tx = session.beginTransaction();
+String hqlVersionedUpdate = "update versioned Customer set name = :newName where name = :oldName";
+int updatedEntities = s.createQuery( hqlUpdate )
+        .setString( "newName", newName )
+        .setString( "oldName", oldName )
+        .executeUpdate();
+tx.commit();
+session.close();]]></programlisting>
+
+        <para>
+            注意，自定义的版本类型(<literal>org.hibernate.usertype.UserVersionType</literal>)不允许和<literal>update versioned</literal>语句联用。
+        </para>
+
         <para>
             执行一个HQL <literal>DELETE</literal>，同样使用 <literal>Query.executeUpdate()</literal> 方法:
         </para>