Skip to content

Commit

Permalink
[Gradle Release Plugin] - pre tag commit: '2.38.0'.
Browse files Browse the repository at this point in the history
  • Loading branch information
nakamura-to committed Jul 11, 2020
2 parents c0dcc49 + 02b76b1 commit 3a60c0c
Show file tree
Hide file tree
Showing 19 changed files with 628 additions and 196 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@
.idea
out
.factorypath
.sdkmanrc
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ Build with Gradle

```groovy
dependencies {
implementation "org.seasar.doma:doma-core:2.37.0"
annotationProcessor "org.seasar.doma:doma-processor:2.37.0"
implementation "org.seasar.doma:doma-core:2.38.0"
annotationProcessor "org.seasar.doma:doma-processor:2.38.0"
}
```

Expand All @@ -71,6 +71,7 @@ Related projects
---------------------

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

Expand Down
4 changes: 2 additions & 2 deletions docs/build.rst
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ Write your build.gradle as follows:
.. code-block:: groovy
dependencies {
implementation "org.seasar.doma:doma-core:2.37.0"
annotationProcessor "org.seasar.doma:doma-processor:2.37.0"
implementation "org.seasar.doma:doma-core:2.38.0"
annotationProcessor "org.seasar.doma:doma-processor:2.38.0"
}
To simplify your build.script, we recommend that you use the `Doma Compile Plugin`_.
Expand Down
15 changes: 11 additions & 4 deletions docs/criteria-api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -494,9 +494,16 @@ We support the following operators and predicates:

.. note::

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

.. _WhereDeclaration: https://www.javadoc.io/doc/org.seasar.doma/doma-core/latest/org/seasar/doma/jdbc/criteria/declaration/WhereDeclaration.html
.. _HavingDeclaration: https://www.javadoc.io/doc/org.seasar.doma/doma-core/latest/org/seasar/doma/jdbc/criteria/declaration/HavingDeclaration.html

We also support the following utility operators:

* eqOrIsNull - ("=" or "is null")
* neOrIsNotNull - ("<>" or "is not null")

We also support the following logical operators:

Expand Down Expand Up @@ -579,13 +586,13 @@ For example, suppose that a where expression contains a conditional expression a
.where(
c -> {
c.eq(e.departmentId, 1);
if (name != null) {
if (enableNameCondition) {
c.like(e.employeeName, name);
}
})
.fetch();
In the case that the ``name`` variable is ``null``, the ``like`` expression is ignored.
In the case that the ``enableNameCondition`` variable is ``false``, the ``like`` expression is ignored.
The above query issues the following SQL statement:

.. code-block:: sql
Expand Down
4 changes: 2 additions & 2 deletions docs/kotlin-support.rst
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ Add the dependencies using the `kapt` and `implementation` configuration in your
.. code-block:: groovy
dependencies {
implementation "org.seasar.doma:doma-core:2.37.0"
kapt "org.seasar.doma:doma-processor:2.37.0"
implementation "org.seasar.doma:doma-core:2.38.0"
kapt "org.seasar.doma:doma-processor:2.38.0"
}
To simplify your build.script, we recommend you use
Expand Down
10 changes: 10 additions & 0 deletions docs/release-notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@
Release notes
=============

v2.38.0: 2020-07-11
======================

* `GH454 <https://github.com/domaframework/doma/pull/454>`_
Change the semantics of condition operators
* `GH453 <https://github.com/domaframework/doma/pull/453>`_
Accept a CharSequence value as a LIKE predicate operand
* `GH452 <https://github.com/domaframework/doma/pull/452>`_
Use Gradle 6.5

v2.37.0: 2020-06-14
======================

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public final class Artifact {

private static final String NAME = "Doma";

private static final String VERSION = "2.37.0";
private static final String VERSION = "2.38.0";

public static String getName() {
return NAME;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,10 @@ public void accept(Visitor visitor) {

class Like implements Criterion {
public final Operand.Prop left;
public final Operand right;
public final CharSequence right;
public final LikeOption option;

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

class NotLike implements Criterion {
public final Operand.Prop left;
public final Operand right;
public final CharSequence right;
public final LikeOption option;

public NotLike(Operand.Prop left, Operand right, LikeOption option) {
public NotLike(Operand.Prop left, CharSequence right, LikeOption option) {
this.left = Objects.requireNonNull(left);
this.right = Objects.requireNonNull(right);
this.option = Objects.requireNonNull(option);
Expand Down
Loading

0 comments on commit 3a60c0c

Please sign in to comment.