Merge pull request #93 from domaframework/fix-domain-mapping-hint

nakamura-to · nakamura-to · commit 750b6c2f47ad · 2015-08-11T17:35:53.000+09:00
JdbcMappingHint#getDomainClass() がドメインクラスを返さない問題を修正
diff --git a/src/main/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java b/src/main/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java
@@ -34,7 +34,6 @@
 import org.seasar.doma.internal.expr.ExpressionParser;
 import org.seasar.doma.internal.expr.Value;
 import org.seasar.doma.internal.expr.node.ExpressionNode;
-import org.seasar.doma.internal.jdbc.command.JdbcMappable;
 import org.seasar.doma.internal.jdbc.scalar.Scalar;
 import org.seasar.doma.internal.jdbc.scalar.ScalarException;
 import org.seasar.doma.internal.jdbc.scalar.Scalars;
@@ -606,8 +605,8 @@ public void appendSql(String sql) {
             }
 
             @Override
-            public <BASIC> void appendParameter(JdbcMappable<BASIC> parameter) {
-                p.appendParameter(new BasicInParameter<>(parameter::getWrapper));
+            public <BASIC> void appendParameter(InParameter<BASIC> parameter) {
+                p.appendParameter(parameter);
             }
         });
         return null;
diff --git a/src/main/java/org/seasar/doma/internal/jdbc/sql/PreparedSqlBuilder.java b/src/main/java/org/seasar/doma/internal/jdbc/sql/PreparedSqlBuilder.java
@@ -21,7 +21,6 @@
 import java.util.List;
 import java.util.function.Function;
 
-import org.seasar.doma.internal.jdbc.command.JdbcMappable;
 import org.seasar.doma.jdbc.Config;
 import org.seasar.doma.jdbc.SqlKind;
 import org.seasar.doma.jdbc.SqlLogFormattingFunction;
@@ -30,7 +29,7 @@
 
 public class PreparedSqlBuilder implements SqlContext {
 
-    protected final List<BasicInParameter<?>> parameters = new ArrayList<>();
+    protected final List<InParameter<?>> parameters = new ArrayList<>();
 
     protected final StringBuilder rawSql = new StringBuilder(200);
 
@@ -62,12 +61,12 @@ public void cutBackSql(int length) {
         formattedSql.setLength(formattedSql.length() - length);
     }
 
-    public <BASIC> void appendParameter(JdbcMappable<BASIC> parameter) {
+    public <BASIC> void appendParameter(InParameter<BASIC> parameter) {
         rawSql.append("?");
         Wrapper<BASIC> wrapper = parameter.getWrapper();
         formattedSql.append(wrapper.accept(config.getDialect()
                 .getSqlLogFormattingVisitor(), formattingFunction, null));
-        parameters.add(new BasicInParameter<BASIC>(() -> wrapper));
+        parameters.add(parameter);
     }
 
     public PreparedSql build(Function<String, String> commenter) {
diff --git a/src/main/java/org/seasar/doma/internal/jdbc/sql/ScalarInOutParameter.java b/src/main/java/org/seasar/doma/internal/jdbc/sql/ScalarInOutParameter.java
@@ -55,7 +55,7 @@ public void updateReference() {
 
     @Override
     public Optional<Class<?>> getDomainClass() {
-        return Optional.empty();
+        return scalar.getDomainClass();
     }
 
     @Override
diff --git a/src/main/java/org/seasar/doma/internal/jdbc/sql/ScalarInParameter.java b/src/main/java/org/seasar/doma/internal/jdbc/sql/ScalarInParameter.java
@@ -58,7 +58,7 @@ public Wrapper<BASIC> getWrapper() {
 
     @Override
     public Optional<Class<?>> getDomainClass() {
-        return Optional.empty();
+        return scalar.getDomainClass();
     }
 
     @Override
diff --git a/src/main/java/org/seasar/doma/internal/jdbc/sql/SqlContext.java b/src/main/java/org/seasar/doma/internal/jdbc/sql/SqlContext.java
@@ -15,15 +15,14 @@
  */
 package org.seasar.doma.internal.jdbc.sql;
 
-import org.seasar.doma.internal.jdbc.command.JdbcMappable;
 
 /**
  * @author nakamura-to
  * @since 2.3.0
  */
 public interface SqlContext {
 
-    <BASIC> void appendParameter(JdbcMappable<BASIC> parameter);
+    <BASIC> void appendParameter(InParameter<BASIC> parameter);
 
     void appendSql(String sql);
 
diff --git a/src/main/java/org/seasar/doma/jdbc/JdbcMappingHint.java b/src/main/java/org/seasar/doma/jdbc/JdbcMappingHint.java
@@ -18,10 +18,24 @@
 import java.util.Optional;
 
 /**
+ * マッピングに関するヒント情報です。
+ * <p>
+ * {@link JdbcMappingVisitor} の実装クラスにおいて、次のマッピングのカスタマイズに利用できます。
+ * 
+ * <ul>
+ * <li>JavaのクラスからSQLの型へのマッピング（JavaからSQLのバインド変数へのマッピング）</li>
+ * <li>SQLの型からJavaのクラスへのマッピング（SQLの結果セットからJavaのマッピング）</li>
+ * </ul>
+ * 
  * @author nakamura-to
  * 
  */
 public interface JdbcMappingHint {
 
+    /**
+     * ドメインクラスにマッピングされている場合、そのドメインクラスを返します。
+     * 
+     * @return ドメインクラス
+     */
     Optional<Class<?>> getDomainClass();
 }
diff --git a/src/main/java/org/seasar/doma/jdbc/entity/DefaultPropertyType.java b/src/main/java/org/seasar/doma/jdbc/entity/DefaultPropertyType.java
@@ -35,6 +35,8 @@
 import org.seasar.doma.internal.jdbc.scalar.OptionalIntScalar;
 import org.seasar.doma.internal.jdbc.scalar.OptionalLongScalar;
 import org.seasar.doma.internal.jdbc.scalar.Scalar;
+import org.seasar.doma.internal.jdbc.sql.InParameter;
+import org.seasar.doma.internal.jdbc.sql.ScalarInParameter;
 import org.seasar.doma.internal.util.ClassUtil;
 import org.seasar.doma.internal.util.FieldUtil;
 import org.seasar.doma.jdbc.Naming;
@@ -370,6 +372,11 @@ public Property<ENTITY, BASIC> save(ENTITY entity) {
             return this;
         }
 
+        @Override
+        public InParameter<BASIC> asInParameter() {
+            return delegate.asInParameter();
+        }
+
         @Override
         public Wrapper<BASIC> getWrapper() {
             return delegate.getWrapper();
@@ -422,6 +429,11 @@ public Property<ENTITY, BASIC> save(ENTITY entity) {
             return this;
         }
 
+        @Override
+        public InParameter<BASIC> asInParameter() {
+            return new ScalarInParameter<>(scalar);
+        }
+
         @Override
         public Wrapper<BASIC> getWrapper() {
             return scalar.getWrapper();
diff --git a/src/main/java/org/seasar/doma/jdbc/entity/Property.java b/src/main/java/org/seasar/doma/jdbc/entity/Property.java
@@ -16,6 +16,7 @@
 package org.seasar.doma.jdbc.entity;
 
 import org.seasar.doma.internal.jdbc.command.JdbcMappable;
+import org.seasar.doma.internal.jdbc.sql.InParameter;
 
 /**
  * プロパティです。
@@ -55,4 +56,12 @@ public interface Property<ENTITY, BASIC> extends JdbcMappable<BASIC> {
      */
     Property<ENTITY, BASIC> save(ENTITY entity);
 
+    /**
+     * このプロパティを入力用パラメータとして返します。
+     * 
+     * @return 入力用パラメータ
+     * @since 2.4.0
+     */
+    InParameter<BASIC> asInParameter();
+
 }
diff --git a/src/main/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQuery.java b/src/main/java/org/seasar/doma/jdbc/query/AutoBatchDeleteQuery.java
@@ -109,7 +109,7 @@ protected void prepareSql() {
                 builder.appendSql(propertyType.getColumnName(naming::apply,
                         dialect::applyQuote));
                 builder.appendSql(" = ");
-                builder.appendParameter(property);
+                builder.appendParameter(property.asInParameter());
                 builder.appendSql(" and ");
             }
             builder.cutBackSql(5);
@@ -125,7 +125,7 @@ protected void prepareSql() {
             builder.appendSql(versionPropertyType.getColumnName(naming::apply,
                     dialect::applyQuote));
             builder.appendSql(" = ");
-            builder.appendParameter(property);
+            builder.appendParameter(property.asInParameter());
         }
         PreparedSql sql = builder.build(this::comment);
         sqls.add(sql);
diff --git a/src/main/java/org/seasar/doma/jdbc/query/AutoBatchInsertQuery.java b/src/main/java/org/seasar/doma/jdbc/query/AutoBatchInsertQuery.java
@@ -180,7 +180,7 @@ protected void prepareSql() {
         for (EntityPropertyType<ENTITY, ?> propertyType : targetPropertyTypes) {
             Property<ENTITY, ?> property = propertyType.createProperty();
             property.load(currentEntity);
-            builder.appendParameter(property);
+            builder.appendParameter(property.asInParameter());
             builder.appendSql(", ");
         }
         builder.cutBackSql(2);
diff --git a/src/main/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQuery.java b/src/main/java/org/seasar/doma/jdbc/query/AutoBatchUpdateQuery.java
@@ -126,7 +126,7 @@ protected void prepareSql() {
                 builder.appendSql(propertyType.getColumnName(naming::apply,
                         dialect::applyQuote));
                 builder.appendSql(" = ");
-                builder.appendParameter(property);
+                builder.appendParameter(property.asInParameter());
                 builder.appendSql(" and ");
             }
             builder.cutBackSql(5);
@@ -142,7 +142,7 @@ protected void prepareSql() {
             builder.appendSql(versionPropertyType.getColumnName(naming::apply,
                     dialect::applyQuote));
             builder.appendSql(" = ");
-            builder.appendParameter(property);
+            builder.appendParameter(property.asInParameter());
         }
         PreparedSql sql = builder.build(this::comment);
         sqls.add(sql);
diff --git a/src/main/java/org/seasar/doma/jdbc/query/AutoDeleteQuery.java b/src/main/java/org/seasar/doma/jdbc/query/AutoDeleteQuery.java
@@ -93,7 +93,7 @@ protected void prepareSql() {
                 builder.appendSql(propertyType.getColumnName(naming::apply,
                         dialect::applyQuote));
                 builder.appendSql(" = ");
-                builder.appendParameter(property);
+                builder.appendParameter(property.asInParameter());
                 builder.appendSql(" and ");
             }
             builder.cutBackSql(5);
@@ -109,7 +109,7 @@ protected void prepareSql() {
             builder.appendSql(versionPropertyType.getColumnName(naming::apply,
                     dialect::applyQuote));
             builder.appendSql(" = ");
-            builder.appendParameter(property);
+            builder.appendParameter(property.asInParameter());
         }
         sql = builder.build(this::comment);
     }
diff --git a/src/main/java/org/seasar/doma/jdbc/query/AutoInsertQuery.java b/src/main/java/org/seasar/doma/jdbc/query/AutoInsertQuery.java
@@ -163,7 +163,7 @@ protected void prepareSql() {
         for (EntityPropertyType<ENTITY, ?> propertyType : targetPropertyTypes) {
             Property<ENTITY, ?> property = propertyType.createProperty();
             property.load(entity);
-            builder.appendParameter(property);
+            builder.appendParameter(property.asInParameter());
             builder.appendSql(", ");
         }
         builder.cutBackSql(2);
diff --git a/src/main/java/org/seasar/doma/jdbc/query/AutoUpdateQuery.java b/src/main/java/org/seasar/doma/jdbc/query/AutoUpdateQuery.java
@@ -123,7 +123,7 @@ protected void prepareSql() {
                 builder.appendSql(propertyType.getColumnName(naming::apply,
                         dialect::applyQuote));
                 builder.appendSql(" = ");
-                builder.appendParameter(property);
+                builder.appendParameter(property.asInParameter());
                 builder.appendSql(" and ");
             }
             builder.cutBackSql(5);
@@ -139,7 +139,7 @@ protected void prepareSql() {
             builder.appendSql(versionPropertyType.getColumnName(naming::apply,
                     dialect::applyQuote));
             builder.appendSql(" = ");
-            builder.appendParameter(property);
+            builder.appendParameter(property.asInParameter());
         }
         sql = builder.build(this::comment);
     }
diff --git a/src/main/java/org/seasar/doma/jdbc/query/BatchUpdateQueryHelper.java b/src/main/java/org/seasar/doma/jdbc/query/BatchUpdateQueryHelper.java
@@ -113,7 +113,7 @@ public void populateValues(E entity,
             context.appendSql(propertyType.getColumnName(naming::apply,
                     dialect::applyQuote));
             context.appendSql(" = ");
-            context.appendParameter(property);
+            context.appendParameter(property.asInParameter());
             if (propertyType.isVersion() && !versionIgnored) {
                 context.appendSql(" + 1");
             }
diff --git a/src/main/java/org/seasar/doma/jdbc/query/UpdateQueryHelper.java b/src/main/java/org/seasar/doma/jdbc/query/UpdateQueryHelper.java
@@ -145,7 +145,7 @@ public void populateValues(E entity,
             context.appendSql(propertyType.getColumnName(naming::apply,
                     dialect::applyQuote));
             context.appendSql(" = ");
-            context.appendParameter(property);
+            context.appendParameter(property.asInParameter());
             context.appendSql(", ");
         }
         if (!versionIgnored && versionPropertyType != null) {
@@ -154,7 +154,7 @@ public void populateValues(E entity,
             context.appendSql(versionPropertyType.getColumnName(naming::apply,
                     dialect::applyQuote));
             context.appendSql(" = ");
-            context.appendParameter(property);
+            context.appendParameter(property.asInParameter());
             context.appendSql(" + 1");
         } else {
             context.cutBackSql(2);
diff --git a/src/test/java/org/seasar/doma/internal/jdbc/sql/PreparedSqlBuilderTest.java b/src/test/java/org/seasar/doma/internal/jdbc/sql/PreparedSqlBuilderTest.java
@@ -21,13 +21,17 @@
 import junit.framework.TestCase;
 
 import org.seasar.doma.internal.jdbc.mock.MockConfig;
-import org.seasar.doma.internal.jdbc.scalar.BasicScalar;
+import org.seasar.doma.jdbc.ClassHelper;
 import org.seasar.doma.jdbc.SqlKind;
 import org.seasar.doma.jdbc.SqlLogType;
+import org.seasar.doma.jdbc.domain.DomainType;
+import org.seasar.doma.jdbc.domain.DomainTypeFactory;
 import org.seasar.doma.wrapper.BigDecimalWrapper;
 import org.seasar.doma.wrapper.StringWrapper;
 import org.seasar.doma.wrapper.Wrapper;
 
+import example.domain.PhoneNumber;
+
 /**
  * @author taedium
  * 
@@ -41,19 +45,33 @@ public void testAppend() throws Exception {
                 SqlKind.SELECT, SqlLogType.FORMATTED);
         builder.appendSql("select * from aaa where name = ");
         Wrapper<String> stringWrapper = new StringWrapper("hoge");
-        builder.appendParameter(new BasicScalar<String>(() -> stringWrapper,
-                false));
+        builder.appendParameter(new BasicInParameter<String>(
+                () -> stringWrapper));
 
         builder.appendSql(" and salary = ");
         Wrapper<BigDecimal> bigDecimalWrapper = new BigDecimalWrapper(
                 new BigDecimal(100));
-        builder.appendParameter(new BasicScalar<BigDecimal>(
-                () -> bigDecimalWrapper, false));
+        builder.appendParameter(new BasicInParameter<BigDecimal>(
+                () -> bigDecimalWrapper));
         PreparedSql sql = builder.build(Function.identity());
         assertEquals("select * from aaa where name = ? and salary = ?",
                 sql.toString());
     }
 
+    public void testAppendParameter_domain() throws Exception {
+        PreparedSqlBuilder builder = new PreparedSqlBuilder(config,
+                SqlKind.SELECT, SqlLogType.FORMATTED);
+        builder.appendSql("select * from aaa where phoneNumber = ");
+        DomainType<String, PhoneNumber> phoneNumberType = DomainTypeFactory
+                .getDomainType(PhoneNumber.class, new ClassHelper() {
+                });
+        PhoneNumber phoneNumber = new PhoneNumber("03-1234-5678");
+        builder.appendParameter(new DomainInParameter<String, PhoneNumber>(
+                phoneNumberType, phoneNumber));
+        PreparedSql sql = builder.build(Function.identity());
+        assertEquals("select * from aaa where phoneNumber = ?", sql.toString());
+    }
+
     public void testCutBackSql() {
         PreparedSqlBuilder builder = new PreparedSqlBuilder(config,
                 SqlKind.SELECT, SqlLogType.FORMATTED);
diff --git a/src/test/java/org/seasar/doma/internal/jdbc/sql/ScalarInOutParameterTest.java b/src/test/java/org/seasar/doma/internal/jdbc/sql/ScalarInOutParameterTest.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2004-2010 the Seasar Foundation and the Others.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.seasar.doma.internal.jdbc.sql;
+
+import java.util.Optional;
+
+import junit.framework.TestCase;
+
+import org.seasar.doma.internal.jdbc.scalar.Scalar;
+import org.seasar.doma.jdbc.ClassHelper;
+import org.seasar.doma.jdbc.Reference;
+import org.seasar.doma.jdbc.domain.DomainType;
+import org.seasar.doma.jdbc.domain.DomainTypeFactory;
+
+import example.domain.PhoneNumber;
+
+/**
+ * @author nakamura-to
+ *
+ */
+public class ScalarInOutParameterTest extends TestCase {
+
+    public void testGetDomainClass() throws Exception {
+        DomainType<String, PhoneNumber> domainType = DomainTypeFactory
+                .getDomainType(PhoneNumber.class, new ClassHelper() {
+                });
+        Scalar<String, PhoneNumber> scalar = domainType.createScalar();
+        Reference<PhoneNumber> ref = new Reference<>();
+        ScalarInOutParameter<String, PhoneNumber> parameter = new ScalarInOutParameter<>(
+                scalar, ref);
+        Optional<Class<?>> optional = parameter.getDomainClass();
+        assertEquals(PhoneNumber.class, optional.get());
+    }
+
+    public void testGetDomainClass_optional() throws Exception {
+        DomainType<String, PhoneNumber> domainType = DomainTypeFactory
+                .getDomainType(PhoneNumber.class, new ClassHelper() {
+                });
+        Scalar<String, Optional<PhoneNumber>> scalar = domainType
+                .createOptionalScalar();
+        Reference<Optional<PhoneNumber>> ref = new Reference<>();
+        ScalarInOutParameter<String, Optional<PhoneNumber>> parameter = new ScalarInOutParameter<>(
+                scalar, ref);
+        Optional<Class<?>> optional = parameter.getDomainClass();
+        assertEquals(PhoneNumber.class, optional.get());
+    }
+}
diff --git a/src/test/java/org/seasar/doma/internal/jdbc/sql/ScalarInParameterTest.java b/src/test/java/org/seasar/doma/internal/jdbc/sql/ScalarInParameterTest.java

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public void updateReference() {`
`55`	`55`
`56`	`56`	`@Override`
`57`	`57`	`public Optional<Class<?>> getDomainClass() {`
`58`		`- return Optional.empty();`
	`58`	`+ return scalar.getDomainClass();`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public Wrapper<BASIC> getWrapper() {`
`58`	`58`
`59`	`59`	`@Override`
`60`	`60`	`public Optional<Class<?>> getDomainClass() {`
`61`		`- return Optional.empty();`
	`61`	`+ return scalar.getDomainClass();`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ protected void prepareSql() {`
`180`	`180`	`for (EntityPropertyType<ENTITY, ?> propertyType : targetPropertyTypes) {`
`181`	`181`	`Property<ENTITY, ?> property = propertyType.createProperty();`
`182`	`182`	`property.load(currentEntity);`
`183`		`- builder.appendParameter(property);`
	`183`	`+ builder.appendParameter(property.asInParameter());`
`184`	`184`	`builder.appendSql(", ");`
`185`	`185`	`}`
`186`	`186`	`builder.cutBackSql(2);`