Skip to content

Commit 3a60c0c

Browse files
committed
[Gradle Release Plugin] - pre tag commit: '2.38.0'.
2 parents c0dcc49 + 02b76b1 commit 3a60c0c

File tree

19 files changed

+628
-196
lines changed

19 files changed

+628
-196
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@
99
.idea
1010
out
1111
.factorypath
12+
.sdkmanrc

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ Build with Gradle
5555

5656
```groovy
5757
dependencies {
58-
implementation "org.seasar.doma:doma-core:2.37.0"
59-
annotationProcessor "org.seasar.doma:doma-processor:2.37.0"
58+
implementation "org.seasar.doma:doma-core:2.38.0"
59+
annotationProcessor "org.seasar.doma:doma-processor:2.38.0"
6060
}
6161
```
6262

@@ -71,6 +71,7 @@ Related projects
7171
---------------------
7272

7373
- [doma-spring-boot](https://github.com/domaframework/doma-spring-boot) : Supports integration with Spring Boot
74+
- [doma-quarkus](https://github.com/domaframework/doma-quarkus) : Supports integration with Quarkus
7475
- [doma-compile-plugin](https://github.com/domaframework/doma-compile-plugin) : Makes compilation easy
7576
- [doma-codegen-plugin](https://github.com/domaframework/doma-codegen-plugin) : Generates Java and SQL files
7677

docs/build.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ Write your build.gradle as follows:
3535
.. code-block:: groovy
3636
3737
dependencies {
38-
implementation "org.seasar.doma:doma-core:2.37.0"
39-
annotationProcessor "org.seasar.doma:doma-processor:2.37.0"
38+
implementation "org.seasar.doma:doma-core:2.38.0"
39+
annotationProcessor "org.seasar.doma:doma-processor:2.38.0"
4040
}
4141
4242
To simplify your build.script, we recommend that you use the `Doma Compile Plugin`_.

docs/criteria-api.rst

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -494,9 +494,16 @@ We support the following operators and predicates:
494494

495495
.. note::
496496

497-
The ``eq`` operator generates the ``is null`` predicate if the second operand is ``null``.
498-
Also, the ``ne`` operator generates the ``is not null`` predicate if the second operand is ``null``.
497+
If the right hand operand is ``null``, the WHERE or the HAVING clause doesn't include the operator.
498+
See WhereDeclaration_ and HavingDeclaration_ javadoc for more details.
499499

500+
.. _WhereDeclaration: https://www.javadoc.io/doc/org.seasar.doma/doma-core/latest/org/seasar/doma/jdbc/criteria/declaration/WhereDeclaration.html
501+
.. _HavingDeclaration: https://www.javadoc.io/doc/org.seasar.doma/doma-core/latest/org/seasar/doma/jdbc/criteria/declaration/HavingDeclaration.html
502+
503+
We also support the following utility operators:
504+
505+
* eqOrIsNull - ("=" or "is null")
506+
* neOrIsNotNull - ("<>" or "is not null")
500507

501508
We also support the following logical operators:
502509

@@ -579,13 +586,13 @@ For example, suppose that a where expression contains a conditional expression a
579586
.where(
580587
c -> {
581588
c.eq(e.departmentId, 1);
582-
if (name != null) {
589+
if (enableNameCondition) {
583590
c.like(e.employeeName, name);
584591
}
585592
})
586593
.fetch();
587594
588-
In the case that the ``name`` variable is ``null``, the ``like`` expression is ignored.
595+
In the case that the ``enableNameCondition`` variable is ``false``, the ``like`` expression is ignored.
589596
The above query issues the following SQL statement:
590597

591598
.. code-block:: sql

docs/kotlin-support.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ Add the dependencies using the `kapt` and `implementation` configuration in your
9999
.. code-block:: groovy
100100
101101
dependencies {
102-
implementation "org.seasar.doma:doma-core:2.37.0"
103-
kapt "org.seasar.doma:doma-processor:2.37.0"
102+
implementation "org.seasar.doma:doma-core:2.38.0"
103+
kapt "org.seasar.doma:doma-processor:2.38.0"
104104
}
105105
106106
To simplify your build.script, we recommend you use

docs/release-notes.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22
Release notes
33
=============
44

5+
v2.38.0: 2020-07-11
6+
======================
7+
8+
* `GH454 <https://github.com/domaframework/doma/pull/454>`_
9+
Change the semantics of condition operators
10+
* `GH453 <https://github.com/domaframework/doma/pull/453>`_
11+
Accept a CharSequence value as a LIKE predicate operand
12+
* `GH452 <https://github.com/domaframework/doma/pull/452>`_
13+
Use Gradle 6.5
14+
515
v2.37.0: 2020-06-14
616
======================
717

doma-core/src/main/java/org/seasar/doma/internal/Artifact.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public final class Artifact {
77

88
private static final String NAME = "Doma";
99

10-
private static final String VERSION = "2.37.0";
10+
private static final String VERSION = "2.38.0";
1111

1212
public static String getName() {
1313
return NAME;

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/Criterion.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ public void accept(Visitor visitor) {
127127

128128
class Like implements Criterion {
129129
public final Operand.Prop left;
130-
public final Operand right;
130+
public final CharSequence right;
131131
public final LikeOption option;
132132

133-
public Like(Operand.Prop left, Operand right, LikeOption option) {
133+
public Like(Operand.Prop left, CharSequence right, LikeOption option) {
134134
this.left = Objects.requireNonNull(left);
135135
this.right = Objects.requireNonNull(right);
136136
this.option = Objects.requireNonNull(option);
@@ -144,10 +144,10 @@ public void accept(Visitor visitor) {
144144

145145
class NotLike implements Criterion {
146146
public final Operand.Prop left;
147-
public final Operand right;
147+
public final CharSequence right;
148148
public final LikeOption option;
149149

150-
public NotLike(Operand.Prop left, Operand right, LikeOption option) {
150+
public NotLike(Operand.Prop left, CharSequence right, LikeOption option) {
151151
this.left = Objects.requireNonNull(left);
152152
this.right = Objects.requireNonNull(right);
153153
this.option = Objects.requireNonNull(option);

0 commit comments

Comments
 (0)