Merge pull request #1574 from rikiel/master

Change in documentation

Author: harawata

src/site/es/xdoc/dynamic-sql.xml

@@ -157,6 +157,20 @@ AND title like ‘someTitle’]]></source>
   <p><span class="label important">NOTA</span> You can pass any Iterable object (for example List, Set, etc.), as well as any Map or Array object to foreach as collection parameter. When using an Iterable or Array, index will be the number of current iteration and value item will be the element retrieved in this iteration. When using a Map (or Collection of Map.Entry objects), index will be the key object and item will be the value object.</p>
   <p>Esto finaliza la discusión sobre la configuración XML y los ficheros de mapeo XML. En la sección siguiente hablaremos del API Java en detalle, de forma que puedas obtener el máximo rendimiento de los mapeos que has creado.</p>
   </subsection>
+  <subsection name="script">
+  <p>For using dynamic SQL in annotated mapper class, <em>script</em> element can be used. For example:</p>
+  <source><![CDATA[@Update(
+    "<script>update Author",
+    "  <set>",
+    "    <if test="username != null">username=#{username},</if>",
+    "    <if test="password != null">password=#{password},</if>",
+    "    <if test="email != null">email=#{email},</if>",
+    "    <if test="bio != null">bio=#{bio}</if>",
+    "  </set>",
+    "where id=#{id}",
+    "</script>")
+    void updateAuthorValues(Author author);]]></source>
+  </subsection>
   <subsection name="bind">
   <p>El elemento <code>bind</code> te permite crear una variable a partir de una expresion OGNL y asociarla al contexto. Por ejemplo:</p>
   <source><![CDATA[

src/site/es/xdoc/java-api.xml

@@ -526,8 +526,8 @@ User getUserById(Integer id);
 
 @Results(id = "companyResults")
 @ConstructorArgs({
-  @Arg(property = "id", column = "cid", id = <strong>true</strong>),
-  @Arg(property = "name", column = "name")
+  @Arg(column = "cid", javaType = Integer.class, id = <strong>true</strong>),
+  @Arg(column = "name", javaType = String.class)
 })
 @Select("select * from company where id = #{id}")
 Company getCompanyById(Integer id);</source>

src/site/ja/xdoc/dynamic-sql.xml

@@ -163,6 +163,20 @@ AND title like ‘someTitle’]]></source>
   <p><span class="label important">NOTE</span> collection には Iterable を実装したオブジェクト（List や Set など）の他に Map や Array を指定することもできます。collection に Iterable または Array を指定した場合、 index で指定した変数にはインデックスの数値、 item で指定した変数にはコレクション、配列の要素が格納されます。Map あるいは Map.Entry のコレクションを指定した場合は index にマップのキー、item にマップの値が格納されます。</p>
   <p>XML 設定ファイルと XML Mapper ファイルについての説明はここまでになります。次の章では、Java API について詳しく見ていきます。</p>
   </subsection>
+  <subsection name="script">
+  <p>For using dynamic SQL in annotated mapper class, <em>script</em> element can be used. For example:</p>
+  <source><![CDATA[@Update(
+    "<script>update Author",
+    "  <set>",
+    "    <if test="username != null">username=#{username},</if>",
+    "    <if test="password != null">password=#{password},</if>",
+    "    <if test="email != null">email=#{email},</if>",
+    "    <if test="bio != null">bio=#{bio}</if>",
+    "  </set>",
+    "where id=#{id}",
+    "</script>")
+    void updateAuthorValues(Author author);]]></source>
+  </subsection>
   <subsection name="bind">
   <p><code>bind</code> 要素を使うと、OGNL 式の結果を変数に格納し、その変数を SQL 文中で使用することができます。</p>
   <source><![CDATA[

src/site/ja/xdoc/java-api.xml

@@ -533,8 +533,8 @@ User getUserById(Integer id);
 
 @Results(id = "companyResults")
 @ConstructorArgs({
-  @Arg(property = "id", column = "cid", id = <strong>true</strong>),
-  @Arg(property = "name", column = "name")
+  @Arg(column = "cid", javaType = Integer.class, id = <strong>true</strong>),
+  @Arg(column = "name", javaType = String.class)
 })
 @Select("select * from company where id = #{id}")
 Company getCompanyById(Integer id);</source>

src/site/ko/xdoc/dynamic-sql.xml

@@ -188,6 +188,20 @@ AND title like ‘someTitle’]]></source>
         <p><span class="label important">참고</span> 컬렉션 파라미터로 Map이나 배열객체와 더불어 List, Set등과 같은 반복가능한 객체를 전달할 수 있다. 반복가능하거나 배열을 사용할때 index값은 현재 몇번째 반복인지를 나타내고 value항목은 반복과정에서 가져오는 요소를 나타낸다. Map을 사용할때 index는 key객체가 되고 항목은 value객체가 된다. </p>
         <p>XML설정 파일과 XML 매핑 파일에 대해서는 이 정도에서 정리하고 다음 섹션에서는 Java API 에 대해 좀더 상세하게 살펴볼 것이다.</p>
       </subsection>
+  <subsection name="script">
+  <p>For using dynamic SQL in annotated mapper class, <em>script</em> element can be used. For example:</p>
+  <source><![CDATA[@Update(
+    "<script>update Author",
+    "  <set>",
+    "    <if test="username != null">username=#{username},</if>",
+    "    <if test="password != null">password=#{password},</if>",
+    "    <if test="email != null">email=#{email},</if>",
+    "    <if test="bio != null">bio=#{bio}</if>",
+    "  </set>",
+    "where id=#{id}",
+    "</script>")
+    void updateAuthorValues(Author author);]]></source>
+  </subsection>
   <subsection name="bind">
   <p><code>bind</code> 엘리먼트는 OGNL표현을 사용해서 변수를 만든 뒤 컨텍스트에 바인딩한다.
   예를들면 </p>

src/site/ko/xdoc/java-api.xml

@@ -674,8 +674,8 @@ User getUserById(Integer id);
 
 @Results(id = "companyResults")
 @ConstructorArgs({
-  @Arg(property = "id", column = "cid", id = <strong>true</strong>),
-  @Arg(property = "name", column = "name")
+  @Arg(column = "cid", javaType = Integer.class, id = <strong>true</strong>),
+  @Arg(column = "name", javaType = String.class)
 })
 @Select("select * from company where id = #{id}")
 Company getCompanyById(Integer id);</source>

src/site/xdoc/dynamic-sql.xml

@@ -156,6 +156,20 @@ AND title like ‘someTitle’]]></source>
   <p><span class="label important">NOTE</span> You can pass any Iterable object (for example List, Set, etc.), as well as any Map or Array object to foreach as collection parameter. When using an Iterable or Array, index will be the number of current iteration and value item will be the element retrieved in this iteration. When using a Map (or Collection of Map.Entry objects), index will be the key object and item will be the value object.</p>
   <p>This wraps up the discussion regarding the XML configuration file and XML mapping files. The next section will discuss the Java API in detail, so that you can get the most out of the mappings that you’ve created.</p>
   </subsection>
+  <subsection name="script">
+  <p>For using dynamic SQL in annotated mapper class, <em>script</em> element can be used. For example:</p>
+  <source><![CDATA[@Update(
+    "<script>update Author",
+    "  <set>",
+    "    <if test="username != null">username=#{username},</if>",
+    "    <if test="password != null">password=#{password},</if>",
+    "    <if test="email != null">email=#{email},</if>",
+    "    <if test="bio != null">bio=#{bio}</if>",
+    "  </set>",
+    "where id=#{id}",
+    "</script>")
+    void updateAuthorValues(Author author);]]></source>
+  </subsection>
   <subsection name="bind">
   <p>The <code>bind</code> element lets you create a variable out of an OGNL expression and bind it to the context. For example:</p>
   <source><![CDATA[

src/site/xdoc/java-api.xml

@@ -589,8 +589,8 @@ User getUserById(Integer id);
 
 @Results(id = "companyResults")
 @ConstructorArgs({
-  @Arg(property = "id", column = "cid", id = <strong>true</strong>),
-  @Arg(property = "name", column = "name")
+  @Arg(column = "cid", javaType = Integer.class, id = <strong>true</strong>),
+  @Arg(column = "name", javaType = String.class)
 })
 @Select("select * from company where id = #{id}")
 Company getCompanyById(Integer id);</source>

src/site/zh/xdoc/dynamic-sql.xml

@@ -160,6 +160,20 @@ AND title like ‘someTitle’]]></source>
         <p><span class="label important">注意</span> 你可以将任何可迭代对象（如 List、Set 等）、Map 对象或者数组对象传递给 <em>foreach</em> 作为集合参数。当使用可迭代对象或者数组时，index 是当前迭代的次数，item 的值是本次迭代获取的元素。当使用 Map 对象（或者 Map.Entry 对象的集合）时，index 是键，item 是值。</p>
         <p>到此我们已经完成了涉及 XML 配置文件和 XML 映射文件的讨论。下一章将详细探讨 Java API，这样就能提高已创建的映射文件的利用效率。</p>
       </subsection>
+  <subsection name="script">
+  <p>For using dynamic SQL in annotated mapper class, <em>script</em> element can be used. For example:</p>
+  <source><![CDATA[@Update(
+    "<script>update Author",
+    "  <set>",
+    "    <if test="username != null">username=#{username},</if>",
+    "    <if test="password != null">password=#{password},</if>",
+    "    <if test="email != null">email=#{email},</if>",
+    "    <if test="bio != null">bio=#{bio}</if>",
+    "  </set>",
+    "where id=#{id}",
+    "</script>")
+    void updateAuthorValues(Author author);]]></source>
+  </subsection>
       <subsection name="bind">
         <p><code>bind</code> 元素可以从 OGNL 表达式中创建一个变量并将其绑定到上下文。比如：</p>
         <source><![CDATA[

src/site/zh/xdoc/java-api.xml

@@ -522,8 +522,8 @@ User getUserById(Integer id);
 
 @Results(id = "companyResults")
 @ConstructorArgs({
-  @Arg(property = "id", column = "cid", id = <strong>true</strong>),
-  @Arg(property = "name", column = "name")
+  @Arg(column = "cid", javaType = Integer.class, id = <strong>true</strong>),
+  @Arg(column = "name", javaType = String.class)
 })
 @Select("select * from company where id = #{id}")
 Company getCompanyById(Integer id);</source>