Skip to content

Commit 93e0358

Browse files
authored
Merge pull request #343 from lusingander/fix/doc
Fix some mistakes in document
2 parents 5ecebe3 + a12b305 commit 93e0358

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed

docs/kotlin-support.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Dao interfaces
7676
fun selectById(id: Int): Person
7777
7878
@Insert
79-
Result<Person> insert(Person person);
79+
fun insert(Person person): Result<Person>
8080
}
8181
8282
* Use `Destructuring Declarations <https://kotlinlang.org/docs/reference/multi-declarations.html>`_

docs/query/batch-delete.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Batch delete
55
.. contents::
66
:depth: 3
77

8-
Annotate with ``@BatchDelete`` to Dao method for execute batch insert.
8+
Annotate with ``@BatchDelete`` to Dao method for execute batch delete.
99

1010
.. code-block:: java
1111
@@ -25,7 +25,9 @@ Also the ``postDelete`` method of entity listener method is called each entity w
2525
Return value
2626
==============
2727

28-
Return value must be ``int[]`` that is represented each deleting process's updated count.
28+
Return value must be ``org.seasar.doma.jdbc.BatchResult`` that has entity class as an element if parameter ``Iterable`` subtype element is immutable entity class.
29+
30+
Return value must be ``int[]`` that is represented each deleting process's updated count if the above conditions are not satisfied.
2931

3032
Batch delete by auto generated SQL
3133
====================================

docs/query/delete.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ Also the ``postDelete`` method of entity listener is called when after executing
2424
Return value
2525
============
2626

27-
Return value must be ``int`` that represent update count.
27+
Return value must be ``org.seasar.doma.jdbc.Result`` that make the entity class an element if parameter is immutable entity class.
28+
29+
Return value must be ``int`` that is represented updated count if the above conditions are not satisfied.
2830

2931
Delete by auto generated SQL
3032
=============================

docs/query/insert.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Also entity listener ``postInsert`` method is called when after executing insert
2727
Return value
2828
============
2929

30-
Return value must be ``org.seasar.doma.jdbc.Result`` that make the entity class an element if parameter is immutable entity class.
30+
Return value must be ``org.seasar.doma.jdbc.Result`` that make the entity class an element if parameter is immutable entity class.
3131

3232
Return value must be ``int`` that is represented updated count if the above conditions are not satisfied.
3333

docs/query/select.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,9 +372,9 @@ Part or all of pessimistic concurrency control method can not used according to
372372
+------------------+-----------------------------------------------------------------------------+
373373
| H2Dialect | You can use forUpdate(). |
374374
+------------------+-----------------------------------------------------------------------------+
375-
| HsqldbDialect | You can useforUpdate(). |
375+
| HsqldbDialect | You can use forUpdate(). |
376376
+------------------+-----------------------------------------------------------------------------+
377-
| Mssql2008Dialect | You can use forUpdate() and forUpdateNoWait(). |
377+
| Mssql2008Dialect | You can use forUpdate() and forUpdateNowait(). |
378378
| | However, FROM clauses in original SQL must consist single table. |
379379
+------------------+-----------------------------------------------------------------------------+
380380
| MysqlDialect | You can use forUpdate() |

0 commit comments

Comments
 (0)