Fix invalid update statement. (#538)

Close #537

Author: nakamura-to

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/query/BuilderSupport.java

@@ -2,6 +2,7 @@
 
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import org.seasar.doma.DomaException;
@@ -76,6 +77,20 @@ public void column(PropertyMetamodel<?> propertyMetamodel) {
     propertyMetamodel.accept(propertyMetamodelVisitor);
   }
 
+  public void columnWithoutAlias(Operand.Prop prop) {
+    columnWithoutAlias(prop.value);
+  }
+
+  public void columnWithoutAlias(PropertyMetamodel<?> propertyMetamodel) {
+    propertyMetamodel.accept(
+        new PropertyMetamodelVisitor() {
+          @Override
+          protected Optional<String> getAlias(PropertyMetamodel<?> propertyMetamodel) {
+            return Optional.empty();
+          }
+        });
+  }
+
   public void param(Operand.Param param) {
     InParameter<?> parameter = param.createInParameter(config);
     param(parameter);
@@ -442,15 +457,23 @@ class PropertyMetamodelVisitor
 
     @Override
     public void visit(PropertyMetamodel<?> propertyMetamodel) {
+      Optional<String> alias = getAlias(propertyMetamodel);
+      alias.ifPresent(
+          it -> {
+            buf.appendSql(it);
+            buf.appendSql(".");
+          });
+      EntityPropertyType<?, ?> propertyType = propertyMetamodel.asType();
+      buf.appendSql(
+          propertyType.getColumnName(config.getNaming()::apply, config.getDialect()::applyQuote));
+    }
+
+    protected Optional<String> getAlias(PropertyMetamodel<?> propertyMetamodel) {
       String alias = aliasManager.getAlias(propertyMetamodel);
       if (alias == null) {
         throw new DomaException(Message.DOMA6004, propertyMetamodel.getName());
       }
-      buf.appendSql(alias);
-      buf.appendSql(".");
-      EntityPropertyType<?, ?> propertyType = propertyMetamodel.asType();
-      buf.appendSql(
-          propertyType.getColumnName(config.getNaming()::apply, config.getDialect()::applyQuote));
+      return Optional.of(alias);
     }
 
     @Override

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/query/UpdateBuilder.java

@@ -83,7 +83,7 @@ private void operand(Operand operand) {
   }
 
   private void column(Operand.Prop prop) {
-    support.column(prop);
+    support.columnWithoutAlias(prop);
   }
 
   private void visitCriterion(int index, Criterion criterion) {

doma-core/src/test/java/org/seasar/doma/jdbc/criteria/NativeSqlUpdateTest.java

@@ -26,7 +26,7 @@ void set() {
                 });
 
     Sql<?> sql = stmt.asSql();
-    assertEquals("update EMP t0_ set t0_.NAME = 'bbb', t0_.SALARY = null", sql.getFormattedSql());
+    assertEquals("update EMP t0_ set NAME = 'bbb', SALARY = null", sql.getFormattedSql());
   }
 
   @Test
@@ -44,7 +44,6 @@ void where() {
 
     Sql<?> sql = stmt.asSql();
     assertEquals(
-        "update EMP t0_ set t0_.NAME = 'bbb', t0_.SALARY = 1000 where t0_.ID = 1",
-        sql.getFormattedSql());
+        "update EMP t0_ set NAME = 'bbb', SALARY = 1000 where t0_.ID = 1", sql.getFormattedSql());
   }
 }