diff --git a/today-beans/src/main/java/infra/beans/FieldBeanProperty.java b/today-beans/src/main/java/infra/beans/FieldBeanProperty.java
index 82af2a5d22..b80885bdf6 100644
--- a/today-beans/src/main/java/infra/beans/FieldBeanProperty.java
+++ b/today-beans/src/main/java/infra/beans/FieldBeanProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,8 +37,11 @@ public final class FieldBeanProperty extends BeanProperty {
   @Serial
   private static final long serialVersionUID = 1L;
 
+  private final boolean writeable;
+
   FieldBeanProperty(Field field) {
     super(field);
+    this.writeable = !Modifier.isFinal(field.getModifiers());
   }
 
   @Override
@@ -68,7 +71,7 @@ public boolean isSynthetic() {
 
   @Override
   public boolean isReadOnly() {
-    return Modifier.isFinal(field.getModifiers());
+    return !writeable;
   }
 
   @Override
@@ -78,7 +81,7 @@ public boolean isReadable() {
 
   @Override
   public boolean isWriteable() {
-    return !isReadOnly();
+    return writeable;
   }
 
   @Override
diff --git a/today-jdbc/src/main/java/infra/jdbc/ObjectPropertySetter.java b/today-jdbc/src/main/java/infra/jdbc/ObjectPropertySetter.java
index d2bf4b3b20..c419183ee8 100644
--- a/today-jdbc/src/main/java/infra/jdbc/ObjectPropertySetter.java
+++ b/today-jdbc/src/main/java/infra/jdbc/ObjectPropertySetter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 import infra.beans.BeanProperty;
 import infra.core.conversion.ConversionException;
 import infra.core.conversion.ConversionService;
+import infra.jdbc.type.SmartTypeHandler;
 import infra.jdbc.type.TypeHandler;
 import infra.lang.Assert;
 import infra.lang.Nullable;
@@ -34,30 +35,28 @@
  * @see #setTo(Object, ResultSet, int)
  * @since 2021/1/7 22:49
  */
+
 public class ObjectPropertySetter {
 
   @Nullable
   private final PropertyPath propertyPath;
+
   private final BeanProperty beanProperty; // cache
 
   private final TypeHandler<?> typeHandler;
+
   private final ConversionService conversionService;
 
   @Nullable
   private final PrimitiveTypeNullHandler primitiveTypeNullHandler;
 
-  public ObjectPropertySetter(
-          @Nullable PropertyPath propertyPath, BeanProperty beanProperty, RepositoryManager manager) {
-    this(propertyPath, beanProperty,
-            manager.getConversionService(),
-            manager.getTypeHandler(beanProperty),
-            manager.getPrimitiveTypeNullHandler());
+  public ObjectPropertySetter(@Nullable PropertyPath propertyPath, BeanProperty beanProperty, RepositoryManager manager) {
+    this(propertyPath, beanProperty, manager.getConversionService(),
+            manager.getTypeHandler(beanProperty), manager.getPrimitiveTypeNullHandler());
   }
 
-  public ObjectPropertySetter(
-          @Nullable PropertyPath propertyPath, BeanProperty beanProperty,
-          ConversionService conversionService, TypeHandler<?> typeHandler,
-          @Nullable PrimitiveTypeNullHandler primitiveTypeNullHandler) {
+  public ObjectPropertySetter(@Nullable PropertyPath propertyPath, BeanProperty beanProperty,
+          ConversionService conversionService, TypeHandler<?> typeHandler, @Nullable PrimitiveTypeNullHandler primitiveTypeNullHandler) {
     Assert.notNull(typeHandler, "TypeHandler is required");
     Assert.notNull(beanProperty, "BeanProperty is required");
     Assert.notNull(conversionService, "ConversionService is required");
@@ -76,23 +75,34 @@ public ObjectPropertySetter(
    * @param columnIndex current column index
    * @throws SQLException when data fetch failed
    */
+  @SuppressWarnings({ "unchecked", "rawtypes" })
   public void setTo(Object obj, ResultSet resultSet, int columnIndex) throws SQLException {
-    Object result = getResult(resultSet, columnIndex);
-    if (result == null && beanProperty.isPrimitive()) {
-      if (primitiveTypeNullHandler != null) {
+    if (beanProperty.isWriteable()) {
+      Object result = getResult(resultSet, columnIndex);
+      if (result == null && beanProperty.isPrimitive()) {
+        if (primitiveTypeNullHandler != null) {
+          if (propertyPath != null) {
+            obj = propertyPath.getNestedObject(obj);
+          }
+          primitiveTypeNullHandler.handleNull(beanProperty, obj);
+        }
+      }
+      else {
         if (propertyPath != null) {
-          obj = propertyPath.getNestedObject(obj);
+          propertyPath.set(obj, result);
+        }
+        else {
+          beanProperty.setValue(obj, result);
         }
-        primitiveTypeNullHandler.handleNull(beanProperty, obj);
       }
     }
+    else if (typeHandler instanceof SmartTypeHandler handler) {
+      Object value = beanProperty.getValue(obj);
+      handler.applyResult(value, resultSet, columnIndex);
+    }
     else {
-      if (propertyPath != null) {
-        propertyPath.set(obj, result);
-      }
-      else {
-        beanProperty.setValue(obj, result);
-      }
+      throw new IllegalStateException("Entity property %s.%s is not writable"
+              .formatted(beanProperty.getDeclaringClass(), beanProperty.getName()));
     }
   }
 
diff --git a/today-jdbc/src/main/java/infra/jdbc/ResultSetIterator.java b/today-jdbc/src/main/java/infra/jdbc/ResultSetIterator.java
index 8f18ce0512..e63117c124 100644
--- a/today-jdbc/src/main/java/infra/jdbc/ResultSetIterator.java
+++ b/today-jdbc/src/main/java/infra/jdbc/ResultSetIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -374,6 +374,7 @@ protected RuntimeException handleReadError(SQLException ex) {
     return new PersistenceException("Database read error: " + ex.getMessage(), ex);
   }
 
+  @Nullable
   protected abstract T readNext(ResultSet resultSet) throws SQLException;
 
   static final class ResultSetValue<T> {
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/AnyTypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/AnyTypeHandler.java
index 862c2975b0..6e405b074e 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/AnyTypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/AnyTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,8 +39,8 @@ public AnyTypeHandler(Class<T> type) {
   }
 
   @Override
-  public void setParameter(PreparedStatement ps, int parameterIndex, @Nullable T parameter) throws SQLException {
-    ps.setObject(parameterIndex, parameter);
+  public void setParameter(PreparedStatement ps, int parameterIndex, @Nullable T arg) throws SQLException {
+    ps.setObject(parameterIndex, arg);
   }
 
   @Nullable
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/BaseTypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/BaseTypeHandler.java
index 57deb68d15..13d1deb6ea 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/BaseTypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/BaseTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,12 +40,12 @@
 public abstract class BaseTypeHandler<T> implements TypeHandler<T> {
 
   @Override
-  public void setParameter(PreparedStatement ps, int parameterIndex, @Nullable T parameter) throws SQLException {
-    if (parameter == null) {
+  public void setParameter(PreparedStatement ps, int parameterIndex, @Nullable T arg) throws SQLException {
+    if (arg == null) {
       setNullParameter(ps, parameterIndex);
     }
     else {
-      setNonNullParameter(ps, parameterIndex, parameter);
+      setNonNullParameter(ps, parameterIndex, arg);
     }
   }
 
@@ -53,8 +53,8 @@ public void setNullParameter(PreparedStatement ps, int parameterIndex) throws SQ
     ps.setObject(parameterIndex, null);
   }
 
-  public void setNonNullParameter(PreparedStatement ps, int parameterIndex, T parameter) throws SQLException {
-    ps.setObject(parameterIndex, parameter);
+  public void setNonNullParameter(PreparedStatement ps, int parameterIndex, T arg) throws SQLException {
+    ps.setObject(parameterIndex, arg);
   }
 
 }
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/BigDecimalTypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/BigDecimalTypeHandler.java
index e6a31756cf..2bd4b72fd8 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/BigDecimalTypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/BigDecimalTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,8 +31,8 @@
 public class BigDecimalTypeHandler extends BaseTypeHandler<BigDecimal> {
 
   @Override
-  public void setNonNullParameter(PreparedStatement ps, int i, BigDecimal parameter) throws SQLException {
-    ps.setBigDecimal(i, parameter);
+  public void setNonNullParameter(PreparedStatement ps, int i, BigDecimal arg) throws SQLException {
+    ps.setBigDecimal(i, arg);
   }
 
   @Override
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/BigIntegerTypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/BigIntegerTypeHandler.java
index 6bbe91da8f..4e66947f07 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/BigIntegerTypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/BigIntegerTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,8 +32,8 @@
 public class BigIntegerTypeHandler extends BaseTypeHandler<BigInteger> {
 
   @Override
-  public void setNonNullParameter(PreparedStatement ps, int i, BigInteger parameter) throws SQLException {
-    ps.setBigDecimal(i, new BigDecimal(parameter));
+  public void setNonNullParameter(PreparedStatement ps, int i, BigInteger arg) throws SQLException {
+    ps.setBigDecimal(i, new BigDecimal(arg));
   }
 
   @Override
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/BooleanTypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/BooleanTypeHandler.java
index 08dde45e6b..c89522f266 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/BooleanTypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/BooleanTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,8 +30,8 @@
 public class BooleanTypeHandler extends BaseTypeHandler<Boolean> {
 
   @Override
-  public void setNonNullParameter(PreparedStatement ps, int i, Boolean parameter) throws SQLException {
-    ps.setBoolean(i, parameter);
+  public void setNonNullParameter(PreparedStatement ps, int i, Boolean arg) throws SQLException {
+    ps.setBoolean(i, arg);
   }
 
   @Override
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/ByteArrayTypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/ByteArrayTypeHandler.java
index 0bd732aa5d..22c4795811 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/ByteArrayTypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/ByteArrayTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,8 +30,8 @@
 public class ByteArrayTypeHandler extends BaseTypeHandler<byte[]> {
 
   @Override
-  public void setNonNullParameter(PreparedStatement ps, int i, byte[] parameter) throws SQLException {
-    ps.setBytes(i, parameter);
+  public void setNonNullParameter(PreparedStatement ps, int i, byte[] arg) throws SQLException {
+    ps.setBytes(i, arg);
   }
 
   @Override
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/ByteTypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/ByteTypeHandler.java
index eed2b257e2..6d87fb291f 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/ByteTypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/ByteTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,8 +30,8 @@
 public class ByteTypeHandler extends BaseTypeHandler<Byte> {
 
   @Override
-  public void setNonNullParameter(PreparedStatement ps, int i, Byte parameter) throws SQLException {
-    ps.setByte(i, parameter);
+  public void setNonNullParameter(PreparedStatement ps, int i, Byte arg) throws SQLException {
+    ps.setByte(i, arg);
   }
 
   @Override
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/BytesInputStreamTypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/BytesInputStreamTypeHandler.java
index 99d4401fb9..de2a6b99af 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/BytesInputStreamTypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/BytesInputStreamTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,8 +31,8 @@
 public class BytesInputStreamTypeHandler extends BaseTypeHandler<InputStream> {
 
   @Override
-  public void setNonNullParameter(PreparedStatement ps, int parameterIndex, InputStream parameter) throws SQLException {
-    ps.setBinaryStream(parameterIndex, parameter);
+  public void setNonNullParameter(PreparedStatement ps, int parameterIndex, InputStream arg) throws SQLException {
+    ps.setBinaryStream(parameterIndex, arg);
   }
 
   @Override
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/CharacterTypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/CharacterTypeHandler.java
index b9fb99168d..ec11a0489b 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/CharacterTypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/CharacterTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,8 +32,8 @@
 public class CharacterTypeHandler extends BaseTypeHandler<Character> {
 
   @Override
-  public void setNonNullParameter(PreparedStatement ps, int i, Character parameter) throws SQLException {
-    ps.setString(i, parameter.toString());
+  public void setNonNullParameter(PreparedStatement ps, int i, Character arg) throws SQLException {
+    ps.setString(i, arg.toString());
   }
 
   @Override
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/DateTypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/DateTypeHandler.java
index 344384a781..30ebd8ce08 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/DateTypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/DateTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,8 +32,8 @@
 public class DateTypeHandler extends BaseTypeHandler<Date> {
 
   @Override
-  public void setNonNullParameter(PreparedStatement ps, int i, Date parameter) throws SQLException {
-    ps.setTimestamp(i, new Timestamp(parameter.getTime()));
+  public void setNonNullParameter(PreparedStatement ps, int i, Date arg) throws SQLException {
+    ps.setTimestamp(i, new Timestamp(arg.getTime()));
   }
 
   @Override
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/DoubleTypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/DoubleTypeHandler.java
index 2964b38f27..d398c37657 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/DoubleTypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/DoubleTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,8 +30,8 @@
 public class DoubleTypeHandler extends BaseTypeHandler<Double> {
 
   @Override
-  public void setNonNullParameter(PreparedStatement ps, int i, Double parameter) throws SQLException {
-    ps.setDouble(i, parameter);
+  public void setNonNullParameter(PreparedStatement ps, int i, Double arg) throws SQLException {
+    ps.setDouble(i, arg);
   }
 
   @Override
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/DurationTypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/DurationTypeHandler.java
index 155a3f5e2c..a1aab2f5cd 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/DurationTypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/DurationTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,8 +34,8 @@
 public class DurationTypeHandler extends BaseTypeHandler<Duration> {
 
   @Override
-  public void setNonNullParameter(PreparedStatement ps, int parameterIndex, Duration parameter) throws SQLException {
-    ps.setLong(parameterIndex, parameter.toNanos());
+  public void setNonNullParameter(PreparedStatement ps, int parameterIndex, Duration arg) throws SQLException {
+    ps.setLong(parameterIndex, arg.toNanos());
   }
 
   @Nullable
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/EnumOrdinalTypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/EnumOrdinalTypeHandler.java
index 625bb7acf4..4b8c7f3fac 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/EnumOrdinalTypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/EnumOrdinalTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,8 +47,8 @@ public EnumOrdinalTypeHandler(Class<E> type) {
   }
 
   @Override
-  public void setNonNullParameter(PreparedStatement ps, int i, E parameter) throws SQLException {
-    ps.setInt(i, parameter.ordinal());
+  public void setNonNullParameter(PreparedStatement ps, int i, E arg) throws SQLException {
+    ps.setInt(i, arg.ordinal());
   }
 
   @Override
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/EnumTypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/EnumTypeHandler.java
index 6d48972bb3..1bab508387 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/EnumTypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/EnumTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -43,8 +43,8 @@ public EnumTypeHandler(Class<E> type) {
   }
 
   @Override
-  public void setNonNullParameter(PreparedStatement ps, int i, E parameter) throws SQLException {
-    ps.setString(i, parameter.name());
+  public void setNonNullParameter(PreparedStatement ps, int i, E arg) throws SQLException {
+    ps.setString(i, arg.name());
   }
 
   @Override
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/EnumerableEnumTypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/EnumerableEnumTypeHandler.java
index eded3daa1f..e994bcc444 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/EnumerableEnumTypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/EnumerableEnumTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -68,12 +68,12 @@ static <V> Class<V> getValueType(Class<?> type) {
 
   @Override
   public void setParameter(PreparedStatement ps,
-          int parameterIndex, @Nullable Enumerable<V> parameter) throws SQLException {
-    if (parameter == null) {
+          int parameterIndex, @Nullable Enumerable<V> arg) throws SQLException {
+    if (arg == null) {
       delegate.setParameter(ps, parameterIndex, null);
     }
     else {
-      delegate.setParameter(ps, parameterIndex, parameter.getValue());
+      delegate.setParameter(ps, parameterIndex, arg.getValue());
     }
   }
 
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/EnumerationValueTypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/EnumerationValueTypeHandler.java
index 3f1254b57e..70d920882e 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/EnumerationValueTypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/EnumerationValueTypeHandler.java
@@ -85,9 +85,9 @@ static <T> BeanProperty getAnnotatedProperty(Class<T> type) {
   }
 
   @Override
-  public void setParameter(PreparedStatement ps, int parameterIndex, @Nullable T parameter) throws SQLException {
-    if (parameter != null) {
-      Object propertyValue = valueSupplier.apply(parameter);
+  public void setParameter(PreparedStatement ps, int parameterIndex, @Nullable T arg) throws SQLException {
+    if (arg != null) {
+      Object propertyValue = valueSupplier.apply(arg);
       delegate.setParameter(ps, parameterIndex, propertyValue);
     }
     else {
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/FloatTypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/FloatTypeHandler.java
index 0fb3c5c2be..427f0c2a04 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/FloatTypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/FloatTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,8 +28,8 @@
 public class FloatTypeHandler extends BaseTypeHandler<Float> {
 
   @Override
-  public void setNonNullParameter(PreparedStatement ps, int i, Float parameter) throws SQLException {
-    ps.setFloat(i, parameter);
+  public void setNonNullParameter(PreparedStatement ps, int i, Float arg) throws SQLException {
+    ps.setFloat(i, arg);
   }
 
   @Override
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/IntegerTypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/IntegerTypeHandler.java
index 0e2d3ea5a8..05701776c3 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/IntegerTypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/IntegerTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,8 +29,8 @@
 public class IntegerTypeHandler extends BaseTypeHandler<Integer> {
 
   @Override
-  public void setNonNullParameter(PreparedStatement ps, int i, Integer parameter) throws SQLException {
-    ps.setInt(i, parameter);
+  public void setNonNullParameter(PreparedStatement ps, int i, Integer arg) throws SQLException {
+    ps.setInt(i, arg);
   }
 
   @Override
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/LongTypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/LongTypeHandler.java
index 0d2f946e2d..066e9ed9a6 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/LongTypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/LongTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,8 +29,8 @@
 public class LongTypeHandler extends BaseTypeHandler<Long> {
 
   @Override
-  public void setNonNullParameter(PreparedStatement ps, int i, Long parameter) throws SQLException {
-    ps.setLong(i, parameter);
+  public void setNonNullParameter(PreparedStatement ps, int i, Long arg) throws SQLException {
+    ps.setLong(i, arg);
   }
 
   @Override
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/MonthTypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/MonthTypeHandler.java
index 2a561d00df..cef335dddd 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/MonthTypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/MonthTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,8 +31,8 @@
 public class MonthTypeHandler extends BaseTypeHandler<Month> {
 
   @Override
-  public void setNonNullParameter(PreparedStatement ps, int i, Month month) throws SQLException {
-    ps.setInt(i, month.getValue());
+  public void setNonNullParameter(PreparedStatement ps, int i, Month arg) throws SQLException {
+    ps.setInt(i, arg.getValue());
   }
 
   @Override
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/ShortTypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/ShortTypeHandler.java
index d045f48f22..71cc9c0c8e 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/ShortTypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/ShortTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,8 +30,8 @@
 public class ShortTypeHandler extends BaseTypeHandler<Short> {
 
   @Override
-  public void setNonNullParameter(PreparedStatement ps, int i, Short parameter) throws SQLException {
-    ps.setShort(i, parameter);
+  public void setNonNullParameter(PreparedStatement ps, int i, Short arg) throws SQLException {
+    ps.setShort(i, arg);
   }
 
   @Override
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/SmartTypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/SmartTypeHandler.java
index 8fb63fd208..3f616bb85f 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/SmartTypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/SmartTypeHandler.java
@@ -17,6 +17,9 @@
 
 package infra.jdbc.type;
 
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
 import infra.beans.BeanProperty;
 
 /**
@@ -25,6 +28,23 @@
  */
 public interface SmartTypeHandler<T> extends TypeHandler<T> {
 
+  /**
+   * Test this handler can handle input property
+   *
+   * @param property bean property
+   */
   boolean supportsProperty(BeanProperty property);
 
+  /**
+   * apply result to a wrapped object
+   *
+   * @param value a wrapped object
+   * @param rs database result set
+   * @param columnIndex idx
+   * @throws SQLException database read failed
+   */
+  default void applyResult(T value, ResultSet rs, int columnIndex) throws SQLException {
+    throw new UnsupportedOperationException();
+  }
+
 }
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/SqlDateTypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/SqlDateTypeHandler.java
index 89752f5ee1..935ab4aa06 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/SqlDateTypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/SqlDateTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,8 +31,8 @@
 public class SqlDateTypeHandler extends BaseTypeHandler<Date> {
 
   @Override
-  public void setNonNullParameter(PreparedStatement ps, int i, Date parameter) throws SQLException {
-    ps.setDate(i, parameter);
+  public void setNonNullParameter(PreparedStatement ps, int i, Date arg) throws SQLException {
+    ps.setDate(i, arg);
   }
 
   @Override
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/SqlTimeTypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/SqlTimeTypeHandler.java
index 1a9e977a5d..bcf19428f6 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/SqlTimeTypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/SqlTimeTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,8 +31,8 @@
 public class SqlTimeTypeHandler extends BaseTypeHandler<Time> {
 
   @Override
-  public void setNonNullParameter(PreparedStatement ps, int i, Time parameter) throws SQLException {
-    ps.setTime(i, parameter);
+  public void setNonNullParameter(PreparedStatement ps, int i, Time arg) throws SQLException {
+    ps.setTime(i, arg);
   }
 
   @Override
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/SqlTimestampTypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/SqlTimestampTypeHandler.java
index 1e53d87638..3c9eb32a69 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/SqlTimestampTypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/SqlTimestampTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,8 +31,8 @@
 public class SqlTimestampTypeHandler extends BaseTypeHandler<Timestamp> {
 
   @Override
-  public void setNonNullParameter(PreparedStatement ps, int i, Timestamp parameter) throws SQLException {
-    ps.setTimestamp(i, parameter);
+  public void setNonNullParameter(PreparedStatement ps, int i, Timestamp arg) throws SQLException {
+    ps.setTimestamp(i, arg);
   }
 
   @Override
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/StringTypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/StringTypeHandler.java
index 8725849a00..3c41f0c205 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/StringTypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/StringTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,8 +30,8 @@
 public class StringTypeHandler extends BaseTypeHandler<String> {
 
   @Override
-  public void setNonNullParameter(PreparedStatement ps, int i, String parameter) throws SQLException {
-    ps.setString(i, parameter);
+  public void setNonNullParameter(PreparedStatement ps, int i, String arg) throws SQLException {
+    ps.setString(i, arg);
   }
 
   @Override
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/TypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/TypeHandler.java
index 2badc8e1c1..f3148c0a77 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/TypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/TypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -62,13 +62,13 @@ public interface TypeHandler<T> {
    * object is of a class implementing more than one of the interfaces named above.
    *
    * @param parameterIndex the first parameter is 1, the second is 2, ...
-   * @param parameter the object containing the input parameter value
+   * @param arg the object containing the input parameter value
    * @throws SQLException if parameterIndex does not correspond to a parameter
    * marker in the SQL statement; if a database access error occurs;
    * this method is called on a closed {@code PreparedStatement}
    * or the type of the given object is ambiguous
    */
-  void setParameter(PreparedStatement ps, int parameterIndex, @Nullable T parameter)
+  void setParameter(PreparedStatement ps, int parameterIndex, @Nullable T arg)
           throws SQLException;
 
   /**
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/UUIDTypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/UUIDTypeHandler.java
index eed9a1a57e..22f3cb1626 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/UUIDTypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/UUIDTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,8 +33,8 @@
 public class UUIDTypeHandler extends BaseTypeHandler<UUID> {
 
   @Override
-  public void setNonNullParameter(PreparedStatement ps, int parameterIndex, UUID parameter) throws SQLException {
-    ps.setString(parameterIndex, parameter.toString());
+  public void setNonNullParameter(PreparedStatement ps, int parameterIndex, UUID arg) throws SQLException {
+    ps.setString(parameterIndex, arg.toString());
   }
 
   @Override
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/UnknownTypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/UnknownTypeHandler.java
index 96f8b4aff6..f014ddf3a1 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/UnknownTypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/UnknownTypeHandler.java
@@ -48,9 +48,9 @@ public UnknownTypeHandler(TypeHandlerManager typeHandlerManager) {
 
   @Override
   @SuppressWarnings({ "rawtypes", "unchecked" })
-  public void setNonNullParameter(PreparedStatement ps, int i, Object parameter) throws SQLException {
-    TypeHandler handler = resolveTypeHandler(parameter);
-    handler.setParameter(ps, i, parameter);
+  public void setNonNullParameter(PreparedStatement ps, int i, Object arg) throws SQLException {
+    TypeHandler handler = resolveTypeHandler(arg);
+    handler.setParameter(ps, i, arg);
   }
 
   @Override
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/YearMonthTypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/YearMonthTypeHandler.java
index 6792f9748f..d8c69feab4 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/YearMonthTypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/YearMonthTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,8 +37,8 @@
 public class YearMonthTypeHandler extends BaseTypeHandler<YearMonth> {
 
   @Override
-  public void setNonNullParameter(PreparedStatement ps, int i, YearMonth yearMonth) throws SQLException {
-    ps.setString(i, yearMonth.toString());
+  public void setNonNullParameter(PreparedStatement ps, int i, YearMonth arg) throws SQLException {
+    ps.setString(i, arg.toString());
   }
 
   @Override
diff --git a/today-jdbc/src/main/java/infra/jdbc/type/YearTypeHandler.java b/today-jdbc/src/main/java/infra/jdbc/type/YearTypeHandler.java
index 8bee31ac20..5204d0982c 100644
--- a/today-jdbc/src/main/java/infra/jdbc/type/YearTypeHandler.java
+++ b/today-jdbc/src/main/java/infra/jdbc/type/YearTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,8 +31,8 @@
 public class YearTypeHandler extends BaseTypeHandler<Year> {
 
   @Override
-  public void setNonNullParameter(PreparedStatement ps, int i, Year year) throws SQLException {
-    ps.setInt(i, year.getValue());
+  public void setNonNullParameter(PreparedStatement ps, int i, Year arg) throws SQLException {
+    ps.setInt(i, arg.getValue());
   }
 
   @Override
diff --git a/today-jdbc/src/main/java/infra/persistence/ConditionPropertyExtractor.java b/today-jdbc/src/main/java/infra/persistence/ConditionPropertyExtractor.java
new file mode 100644
index 0000000000..54b9c63359
--- /dev/null
+++ b/today-jdbc/src/main/java/infra/persistence/ConditionPropertyExtractor.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2017 - 2025 the original author or authors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see [https://www.gnu.org/licenses/]
+ */
+
+package infra.persistence;
+
+import infra.lang.Nullable;
+
+/**
+ * @author <a href="https://github.com/TAKETODAY">海子 Yang</a>
+ * @since 5.0 2025/1/25 22:51
+ */
+public interface ConditionPropertyExtractor<T> {
+
+  @Nullable
+  Object extract(Object entityOrExample, EntityProperty property, @Nullable Object value);
+
+  Object wrap(T extracted);
+
+}
diff --git a/today-jdbc/src/main/java/infra/persistence/DefaultEntityManager.java b/today-jdbc/src/main/java/infra/persistence/DefaultEntityManager.java
index fe2ea361e2..04e5779b17 100644
--- a/today-jdbc/src/main/java/infra/persistence/DefaultEntityManager.java
+++ b/today-jdbc/src/main/java/infra/persistence/DefaultEntityManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -75,13 +75,18 @@ public class DefaultEntityManager implements EntityManager {
 
   private EntityMetadataFactory entityMetadataFactory = new DefaultEntityMetadataFactory();
 
+  private final DataSource dataSource;
+
   private final RepositoryManager repositoryManager;
 
-  private int maxBatchRecords = 0;
+  @SuppressWarnings("rawtypes")
+  private final ArrayList<ConditionPropertyExtractor> propertyExtractors = new ArrayList<>();
 
   @Nullable
   private ArrayList<BatchPersistListener> batchPersistListeners;
 
+  private int maxBatchRecords = 0;
+
   /**
    * a flag indicating whether auto-generated keys should be returned;
    */
@@ -98,9 +103,7 @@ public class DefaultEntityManager implements EntityManager {
   @Nullable
   private TransactionDefinition transactionConfig = TransactionDefinition.withDefaults();
 
-  private QueryStatementFactories handlerFactories = new QueryStatementFactories(entityMetadataFactory);
-
-  private final DataSource dataSource;
+  private QueryStatementFactories handlerFactories = new QueryStatementFactories(entityMetadataFactory, propertyExtractors);
 
   public DefaultEntityManager(RepositoryManager repositoryManager) {
     this(repositoryManager, Platform.forClasspath());
@@ -127,9 +130,9 @@ public void setDefaultPageable(Pageable defaultPageable) {
   }
 
   public void setEntityMetadataFactory(EntityMetadataFactory entityMetadataFactory) {
-    Assert.notNull(entityMetadataFactory, "entityMetadataFactory is required");
+    Assert.notNull(entityMetadataFactory, "EntityMetadataFactory is required");
     this.entityMetadataFactory = entityMetadataFactory;
-    this.handlerFactories = new QueryStatementFactories(entityMetadataFactory);
+    this.handlerFactories = new QueryStatementFactories(entityMetadataFactory, propertyExtractors);
   }
 
   /**
@@ -210,6 +213,32 @@ public void setTransactionConfig(@Nullable TransactionDefinition definition) {
     this.transactionConfig = definition;
   }
 
+  /**
+   * Add ConditionPropertyExtractor
+   *
+   * @param extractor ConditionPropertyExtractor
+   * @since 5.0
+   */
+  @SuppressWarnings("rawtypes")
+  public void addConditionPropertyExtractor(ConditionPropertyExtractor extractor) {
+    Assert.notNull(extractor, "ConditionPropertyExtractor is required");
+    this.propertyExtractors.add(extractor);
+  }
+
+  /**
+   * Set ConditionPropertyExtractors
+   *
+   * @param extractors ConditionPropertyExtractor list
+   * @since 5.0
+   */
+  @SuppressWarnings("rawtypes")
+  public void setConditionPropertyExtractors(@Nullable List<ConditionPropertyExtractor> extractors) {
+    propertyExtractors.clear();
+    if (extractors != null) {
+      this.propertyExtractors.addAll(extractors);
+    }
+  }
+
   // ---------------------------------------------------------------------
   // Implementation of EntityManager
   // ---------------------------------------------------------------------
@@ -606,7 +635,7 @@ public int delete(Object entityOrExample) throws DataAccessException {
       sql.append("` = ? ");
     }
     else {
-      exampleQuery = new ExampleQuery(entityOrExample, metadata);
+      exampleQuery = new ExampleQuery(entityOrExample, metadata, propertyExtractors);
       exampleQuery.renderWhereClause(sql);
     }
 
diff --git a/today-jdbc/src/main/java/infra/persistence/DefaultQueryStatementFactory.java b/today-jdbc/src/main/java/infra/persistence/DefaultQueryStatementFactory.java
index c1a40eff34..68b98f7c87 100644
--- a/today-jdbc/src/main/java/infra/persistence/DefaultQueryStatementFactory.java
+++ b/today-jdbc/src/main/java/infra/persistence/DefaultQueryStatementFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,8 @@
 
 package infra.persistence;
 
+import java.util.List;
+
 /**
  * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
  * @since 4.0 2024/4/10 16:53
@@ -25,18 +27,21 @@ final class DefaultQueryStatementFactory implements QueryStatementFactory {
 
   private final EntityMetadataFactory factory;
 
-  public DefaultQueryStatementFactory(EntityMetadataFactory factory) {
+  private final List<ConditionPropertyExtractor> extractors;
+
+  public DefaultQueryStatementFactory(EntityMetadataFactory factory, List<ConditionPropertyExtractor> extractors) {
     this.factory = factory;
+    this.extractors = extractors;
   }
 
   @Override
   public QueryStatement createQuery(Object example) {
-    return new ExampleQuery(factory, example);
+    return new ExampleQuery(factory, example, extractors);
   }
 
   @Override
   public ConditionStatement createCondition(Object example) {
-    return new ExampleQuery(factory, example);
+    return new ExampleQuery(factory, example, extractors);
   }
 
 }
diff --git a/today-jdbc/src/main/java/infra/persistence/EntityProperty.java b/today-jdbc/src/main/java/infra/persistence/EntityProperty.java
index 8c0bf19766..c17e94ee8e 100644
--- a/today-jdbc/src/main/java/infra/persistence/EntityProperty.java
+++ b/today-jdbc/src/main/java/infra/persistence/EntityProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,6 +35,7 @@
  * @since 4.0 2022/9/7 22:46
  */
 public class EntityProperty {
+
   public final String columnName;
 
   public final boolean isIdProperty;
@@ -65,6 +66,12 @@ public Object getValue(Object entity) {
     return property.getValue(entity);
   }
 
+  /**
+   * Set the property value to entity
+   *
+   * @param entity entity instance
+   * @param propertyValue value
+   */
   public void setValue(Object entity, @Nullable Object propertyValue) {
     property.setDirectly(entity, propertyValue);
   }
@@ -116,14 +123,14 @@ public void setTo(PreparedStatement ps, int parameterIndex, Object entity) throw
    * object is of a class implementing more than one of the interfaces named above.
    *
    * @param parameterIndex the first parameter is 1, the second is 2, ...
-   * @param parameter the object containing the input parameter value
+   * @param arg the object containing the input parameter value
    * @throws SQLException if parameterIndex does not correspond to a parameter
    * marker in the SQL statement; if a database access error occurs;
    * this method is called on a closed {@code PreparedStatement}
    * or the type of the given object is ambiguous
    */
-  public void setParameter(PreparedStatement ps, int parameterIndex, @Nullable Object parameter) throws SQLException {
-    typeHandler.setParameter(ps, parameterIndex, parameter);
+  public void setParameter(PreparedStatement ps, int parameterIndex, @Nullable Object arg) throws SQLException {
+    typeHandler.setParameter(ps, parameterIndex, arg);
   }
 
   /**
@@ -137,8 +144,11 @@ public Object getResult(ResultSet rs, int columnIndex) throws SQLException {
     return typeHandler.getResult(rs, columnIndex);
   }
 
+  /**
+   * Set property
+   */
   public void setProperty(Object entity, ResultSet rs, int columnIndex) throws SQLException {
-    Object propertyValue = typeHandler.getResult(rs, columnIndex);
+    Object propertyValue = getResult(rs, columnIndex);
     property.setDirectly(entity, propertyValue);
   }
 
diff --git a/today-jdbc/src/main/java/infra/persistence/ExampleQuery.java b/today-jdbc/src/main/java/infra/persistence/ExampleQuery.java
index 8905467f0b..cb22d6fe5b 100644
--- a/today-jdbc/src/main/java/infra/persistence/ExampleQuery.java
+++ b/today-jdbc/src/main/java/infra/persistence/ExampleQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.function.Consumer;
 
 import infra.core.annotation.MergedAnnotation;
@@ -42,6 +43,7 @@
  * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
  * @since 4.0 2024/2/19 19:56
  */
+@SuppressWarnings("rawtypes")
 final class ExampleQuery extends SimpleSelectQueryStatement implements ConditionStatement, DebugDescriptive {
 
   static final List<PropertyConditionStrategy> strategies;
@@ -58,19 +60,23 @@ final class ExampleQuery extends SimpleSelectQueryStatement implements Condition
 
   private final EntityMetadata exampleMetadata;
 
+  private final List<ConditionPropertyExtractor> extractors;
+
   @Nullable
   private ArrayList<Condition> conditions;
 
   @Nullable
   private OrderByClause orderByClause;
 
-  ExampleQuery(Object example, EntityMetadata exampleMetadata) {
+  ExampleQuery(Object example, EntityMetadata exampleMetadata, List<ConditionPropertyExtractor> extractors) {
     this.example = example;
     this.exampleMetadata = exampleMetadata;
+    this.extractors = extractors;
   }
 
-  ExampleQuery(EntityMetadataFactory factory, Object example) {
+  ExampleQuery(EntityMetadataFactory factory, Object example, List<ConditionPropertyExtractor> extractors) {
     this.example = example;
+    this.extractors = extractors;
     this.exampleMetadata = factory.getEntityMetadata(example.getClass());
   }
 
@@ -121,6 +127,7 @@ public Object getDebugLogMessage() {
     return LogMessage.format("Query entity using example: {}", example);
   }
 
+  @SuppressWarnings("unchecked")
   private ArrayList<Condition> scan(@Nullable Consumer<Condition> consumer) {
     ArrayList<Condition> conditions = this.conditions;
     if (conditions == null) {
@@ -128,22 +135,44 @@ private ArrayList<Condition> scan(@Nullable Consumer<Condition> consumer) {
       // apply class level order by
       applyOrderByClause();
 
-      for (EntityProperty entityProperty : exampleMetadata.entityProperties) {
-        Object propertyValue = entityProperty.getValue(example);
+      for (EntityProperty property : exampleMetadata.entityProperties) {
+        Object propertyValue = property.getValue(example);
         if (propertyValue != null) {
-          for (var strategy : strategies) {
-            var condition = strategy.resolve(entityProperty, propertyValue);
-            if (condition != null) {
-              if (consumer != null) {
-                consumer.accept(condition);
-              }
-              conditions.add(condition);
+          Object extracted = propertyValue;
+          ConditionPropertyExtractor selected = null;
+          for (ConditionPropertyExtractor extractor : extractors) {
+            Object extract = extractor.extract(example, property, propertyValue);
+            if (extract != propertyValue) {
+              selected = extractor;
+              extracted = extract;
               break;
             }
           }
+
+          if (extracted != null) {
+            for (var strategy : strategies) {
+              var condition = strategy.resolve(property, extracted);
+              if (condition != null) {
+                if (selected != null) {
+                  if (Objects.equals(condition.value, extracted)) {
+                    condition = condition.withValue(propertyValue);
+                  }
+                  else {
+                    condition = condition.withValue(selected.wrap(extracted));
+                  }
+                }
+
+                if (consumer != null) {
+                  consumer.accept(condition);
+                }
+                conditions.add(condition);
+                break;
+              }
+            }
+          }
         }
 
-        applyOrderByClause(entityProperty);
+        applyOrderByClause(property);
       }
       this.conditions = conditions;
     }
diff --git a/today-jdbc/src/main/java/infra/persistence/PropertyConditionStrategy.java b/today-jdbc/src/main/java/infra/persistence/PropertyConditionStrategy.java
index 6eb52b1092..f0298655c7 100644
--- a/today-jdbc/src/main/java/infra/persistence/PropertyConditionStrategy.java
+++ b/today-jdbc/src/main/java/infra/persistence/PropertyConditionStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,24 +24,39 @@
 import infra.persistence.sql.Restriction;
 
 /**
+ * SQL where condition resolver
+ *
  * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
  * @since 4.0 2024/2/24 23:58
  */
 public interface PropertyConditionStrategy {
 
+  /**
+   * Resolve SQL where condition
+   *
+   * @param entityProperty metadata source
+   * @param value value maybe is type of {@code entityProperty} or
+   * a value from a wrapped value
+   * @return SQL where condition
+   */
   @Nullable
-  Condition resolve(EntityProperty entityProperty, Object propertyValue);
+  Condition resolve(EntityProperty entityProperty, Object value);
 
+  /**
+   * SQL where condition
+   *
+   * @since 4.0
+   */
   class Condition implements Restriction {
 
-    public final Object propertyValue;
+    public final Object value;
 
     public final Restriction restriction;
 
     public final EntityProperty entityProperty;
 
-    public Condition(Object propertyValue, Restriction restriction, EntityProperty entityProperty) {
-      this.propertyValue = propertyValue;
+    public Condition(Object value, Restriction restriction, EntityProperty entityProperty) {
+      this.value = value;
       this.restriction = restriction;
       this.entityProperty = entityProperty;
     }
@@ -54,6 +69,16 @@ public void render(StringBuilder sqlBuffer) {
       restriction.render(sqlBuffer);
     }
 
+    /**
+     * Creates a new Condition with new property value
+     *
+     * @param propertyValue a new value
+     * @since 5.0
+     */
+    public Condition withValue(Object propertyValue) {
+      return new Condition(propertyValue, restriction, entityProperty);
+    }
+
     /**
      * <p>Sets the value of the designated parameter using the given object.
      *
@@ -65,7 +90,7 @@ public void render(StringBuilder sqlBuffer) {
      * or the type of the given object is ambiguous
      */
     public int setParameter(PreparedStatement ps, int parameterIndex) throws SQLException {
-      entityProperty.setParameter(ps, parameterIndex++, propertyValue);
+      entityProperty.setParameter(ps, parameterIndex++, value);
       return parameterIndex;
     }
 
diff --git a/today-jdbc/src/main/java/infra/persistence/QueryStatementFactories.java b/today-jdbc/src/main/java/infra/persistence/QueryStatementFactories.java
index dc82bb6d80..e41cd3eb7a 100644
--- a/today-jdbc/src/main/java/infra/persistence/QueryStatementFactories.java
+++ b/today-jdbc/src/main/java/infra/persistence/QueryStatementFactories.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,10 +30,10 @@ final class QueryStatementFactories implements QueryStatementFactory {
 
   final List<QueryStatementFactory> factories;
 
-  QueryStatementFactories(EntityMetadataFactory entityMetadataFactory) {
+  QueryStatementFactories(EntityMetadataFactory entityMetadataFactory, List<ConditionPropertyExtractor> extractors) {
     List<QueryStatementFactory> list = TodayStrategies.find(QueryStatementFactory.class);
     list.add(new MapQueryStatementFactory());
-    list.add(new DefaultQueryStatementFactory(entityMetadataFactory));
+    list.add(new DefaultQueryStatementFactory(entityMetadataFactory, extractors));
     this.factories = List.copyOf(list);
   }
 
diff --git a/today-jdbc/src/main/java/infra/persistence/support/DefaultConditionStrategy.java b/today-jdbc/src/main/java/infra/persistence/support/DefaultConditionStrategy.java
index 589855540e..027e7f141b 100644
--- a/today-jdbc/src/main/java/infra/persistence/support/DefaultConditionStrategy.java
+++ b/today-jdbc/src/main/java/infra/persistence/support/DefaultConditionStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,11 +31,11 @@ public class DefaultConditionStrategy implements PropertyConditionStrategy {
 
   @Nullable
   @Override
-  public Condition resolve(EntityProperty entityProperty, Object propertyValue) {
-    if (propertyValue instanceof String string && StringUtils.isBlank(string)) {
+  public Condition resolve(EntityProperty entityProperty, Object value) {
+    if (value instanceof String string && StringUtils.isBlank(string)) {
       return null;
     }
-    return new Condition(propertyValue, Restriction.equal(entityProperty.columnName), entityProperty);
+    return new Condition(value, Restriction.equal(entityProperty.columnName), entityProperty);
   }
 
 }
diff --git a/today-jdbc/src/main/java/infra/persistence/support/FuzzyQueryConditionStrategy.java b/today-jdbc/src/main/java/infra/persistence/support/FuzzyQueryConditionStrategy.java
index 492c5ff2b6..d743dd70d8 100644
--- a/today-jdbc/src/main/java/infra/persistence/support/FuzzyQueryConditionStrategy.java
+++ b/today-jdbc/src/main/java/infra/persistence/support/FuzzyQueryConditionStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,12 +36,12 @@ public class FuzzyQueryConditionStrategy implements PropertyConditionStrategy {
 
   @Nullable
   @Override
-  public Condition resolve(EntityProperty entityProperty, Object propertyValue) {
+  public Condition resolve(EntityProperty entityProperty, Object value) {
     MergedAnnotation<Like> annotation = entityProperty.getAnnotation(Like.class);
     if (annotation.isPresent()) {
       // handle string
 
-      if (propertyValue instanceof String string) {
+      if (value instanceof String string) {
         // trim
         if (annotation.getBoolean("trim")) {
           string = string.trim();
@@ -63,8 +63,8 @@ else if (entityProperty.isPresent(SuffixLike.class)) {
             string = '%' + string + '%';
           }
 
-          propertyValue = string;
-          return new Condition(propertyValue, new LikeRestriction(column), entityProperty);
+          value = string;
+          return new Condition(value, new LikeRestriction(column), entityProperty);
         }
       }
     }
diff --git a/today-jdbc/src/main/java/infra/persistence/support/WhereAnnotationConditionStrategy.java b/today-jdbc/src/main/java/infra/persistence/support/WhereAnnotationConditionStrategy.java
index f951ee21b2..52a64f21da 100644
--- a/today-jdbc/src/main/java/infra/persistence/support/WhereAnnotationConditionStrategy.java
+++ b/today-jdbc/src/main/java/infra/persistence/support/WhereAnnotationConditionStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,9 +34,9 @@ public class WhereAnnotationConditionStrategy implements PropertyConditionStrate
 
   @Nullable
   @Override
-  public Condition resolve(EntityProperty entityProperty, Object propertyValue) {
-    if (propertyValue instanceof String string && entityProperty.isPresent(TrimWhere.class)) {
-      propertyValue = string.trim();
+  public Condition resolve(EntityProperty entityProperty, Object extracted) {
+    if (extracted instanceof String string && entityProperty.isPresent(TrimWhere.class)) {
+      extracted = string.trim();
     }
 
     // render where clause
@@ -44,12 +44,12 @@ public Condition resolve(EntityProperty entityProperty, Object propertyValue) {
     if (annotation.isPresent()) {
       String value = annotation.getStringValue();
       if (!Constant.DEFAULT_NONE.equals(value)) {
-        return new Condition(propertyValue, Restriction.plain(value), entityProperty);
+        return new Condition(extracted, Restriction.plain(value), entityProperty);
       }
       else {
         String condition = annotation.getString("condition");
         if (Constant.DEFAULT_NONE.equals(condition)) {
-          return new Condition(propertyValue, Restriction.equal(entityProperty.columnName), entityProperty);
+          return new Condition(extracted, Restriction.equal(entityProperty.columnName), entityProperty);
         }
       }
     }
diff --git a/today-jdbc/src/test/java/infra/jdbc/type/TypeHandlerManagerTests.java b/today-jdbc/src/test/java/infra/jdbc/type/TypeHandlerManagerTests.java
index c287da2995..737a16f4c7 100644
--- a/today-jdbc/src/test/java/infra/jdbc/type/TypeHandlerManagerTests.java
+++ b/today-jdbc/src/test/java/infra/jdbc/type/TypeHandlerManagerTests.java
@@ -99,7 +99,7 @@ public boolean supportsProperty(BeanProperty property) {
     }
 
     @Override
-    public void setParameter(PreparedStatement ps, int parameterIndex, @Nullable Integer parameter) throws SQLException {
+    public void setParameter(PreparedStatement ps, int parameterIndex, @Nullable Integer arg) throws SQLException {
 
     }
 
diff --git a/today-jdbc/src/test/java/infra/persistence/EntityManagerTests.java b/today-jdbc/src/test/java/infra/persistence/DefaultEntityManagerTests.java
similarity index 80%
rename from today-jdbc/src/test/java/infra/persistence/EntityManagerTests.java
rename to today-jdbc/src/test/java/infra/persistence/DefaultEntityManagerTests.java
index bef5cbdf73..a831c02009 100644
--- a/today-jdbc/src/test/java/infra/persistence/EntityManagerTests.java
+++ b/today-jdbc/src/test/java/infra/persistence/DefaultEntityManagerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,19 +20,28 @@
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.TestInstance;
 
+import java.io.Serializable;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
+import infra.beans.BeanProperty;
 import infra.dao.IncorrectResultSizeDataAccessException;
 import infra.dao.InvalidDataAccessApiUsageException;
 import infra.jdbc.NamedQuery;
 import infra.jdbc.RepositoryManager;
+import infra.jdbc.type.BaseTypeHandler;
+import infra.jdbc.type.SmartTypeHandler;
 import infra.lang.Nullable;
 import infra.persistence.model.Gender;
 import infra.persistence.model.NoIdModel;
@@ -41,7 +50,6 @@
 import infra.util.CollectionUtils;
 
 import static infra.persistence.PropertyUpdateStrategy.noneNull;
-import static infra.persistence.QueryCondition.between;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
@@ -50,7 +58,7 @@
  * @since 4.0 2022/8/16 22:48
  */
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class EntityManagerTests extends AbstractRepositoryManagerTests {
+class DefaultEntityManagerTests extends AbstractRepositoryManagerTests {
 
   @Override
   protected void prepareTestsData(DbType dbType, RepositoryManager repositoryManager) {
@@ -583,6 +591,64 @@ void truncate(RepositoryManager repositoryManager) {
     assertThat(entityManager.findById(UserModel.class, 1)).isNull();
   }
 
+  @ParameterizedRepositoryManagerTest
+  void addConditionPropertyExtractor(RepositoryManager repositoryManager) {
+    DefaultEntityManager entityManager = new DefaultEntityManager(repositoryManager);
+    try (NamedQuery query = repositoryManager.createNamedQuery("""
+            drop table if exists t_option;
+            create table t_option (
+                `name`  varchar(255) default null,
+                `value` varchar(255) default null
+            );
+            """)) {
+
+      query.executeUpdate();
+    }
+
+    assertThatThrownBy(() -> entityManager.addConditionPropertyExtractor(null))
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessage("ConditionPropertyExtractor is required");
+
+    entityManager.addConditionPropertyExtractor(new Base64ValueExtractor());
+    repositoryManager.getTypeHandlerManager().register(new Base64ValueHandler());
+
+    Option entity = Option.of("k", "v");
+    entityManager.persist(entity);
+
+    Option unique = entityManager.findUnique(Option.of("k", "v"));
+    assertThat(unique).isEqualTo(entity);
+
+    assertThat(entityManager.findUnique(Option.of("k", null))).isEqualTo(entity);
+    assertThat(entityManager.findUnique(Option.of("k1", null))).isNull();
+  }
+
+  @ParameterizedRepositoryManagerTest
+  void setConditionPropertyExtractors(RepositoryManager repositoryManager) {
+    DefaultEntityManager entityManager = new DefaultEntityManager(repositoryManager);
+    try (NamedQuery query = repositoryManager.createNamedQuery("""
+            drop table if exists t_option;
+            create table t_option (
+                `name`  varchar(255) default null,
+                `value` varchar(255) default null
+            );
+            """)) {
+
+      query.executeUpdate();
+    }
+
+    repositoryManager.getTypeHandlerManager().register(new Base64ValueHandler());
+
+    Option entity = Option.of("k", "v");
+    entityManager.persist(entity);
+
+    assertThat(entityManager.findUnique(Option.of("k", null))).isNull();
+
+    entityManager.setConditionPropertyExtractors(List.of(new Base64ValueExtractor()));
+
+    assertThat(entityManager.findUnique(Option.of("k", null))).isEqualTo(entity);
+    assertThat(entityManager.findUnique(Option.of("k1", null))).isNull();
+  }
+
   public static void createData(DefaultEntityManager entityManager) {
     UserModel userModel = UserModel.male("TODAY", 9);
 
@@ -639,6 +705,130 @@ public boolean shouldUpdate(Object entity, EntityProperty property) {
   static class UserFailed {
     String name;
   }
+
+  @Table("t_option")
+  static class Option {
+
+    public final Base64Value name = new Base64Value();
+
+    public final Base64Value value = new Base64Value();
+
+    static Option of(@Nullable String name, @Nullable String value) {
+      Option option = new Option();
+      option.name.set(name);
+      option.value.set(value);
+      return option;
+    }
+
+    @Override
+    public boolean equals(Object param) {
+      if (this == param)
+        return true;
+      if (!(param instanceof Option option))
+        return false;
+      return Objects.equals(name, option.name)
+              && Objects.equals(value, option.value);
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(name, value);
+    }
+
+  }
+
+  static class Base64Value implements Serializable {
+
+    @Nullable
+    private String value;
+
+    Base64Value() {
+
+    }
+
+    Base64Value(@Nullable String value) {
+      this.value = value;
+    }
+
+    public void set(@Nullable String value) {
+      this.value = value;
+    }
+
+    @Nullable
+    public String get() {
+      return value;
+    }
+
+    @Override
+    public boolean equals(Object param) {
+      if (this == param)
+        return true;
+      if (!(param instanceof Base64Value that))
+        return false;
+      return Objects.equals(value, that.value);
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hashCode(value);
+    }
+
+  }
+
+  static class Base64ValueExtractor implements ConditionPropertyExtractor<String> {
+
+    @Nullable
+    @Override
+    public Object extract(Object entityOrExample, EntityProperty property, @Nullable Object value) {
+      if (value instanceof Base64Value base64Value) {
+        return base64Value.value;
+      }
+      return value;
+    }
+
+    @Override
+    public Object wrap(String extracted) {
+      return new Base64Value(extracted);
+    }
+
+  }
+
+  static class Base64ValueHandler extends BaseTypeHandler<Base64Value> implements SmartTypeHandler<Base64Value> {
+
+    @Override
+    public boolean supportsProperty(BeanProperty property) {
+      return property.getTypeDescriptor().is(Base64Value.class);
+    }
+
+    @Override
+    public void applyResult(Base64Value value, ResultSet rs, int columnIndex) throws SQLException {
+      value.set(rs.getString(columnIndex));
+    }
+
+    @Override
+    public void setNonNullParameter(PreparedStatement ps, int parameterIndex, Base64Value arg) throws SQLException {
+      ps.setString(parameterIndex, arg.value);
+    }
+
+    @Nullable
+    @Override
+    public Base64Value getResult(ResultSet rs, String columnName) throws SQLException {
+      return new Base64Value(rs.getString(columnName));
+    }
+
+    @Nullable
+    @Override
+    public Base64Value getResult(ResultSet rs, int columnIndex) throws SQLException {
+      return new Base64Value(rs.getString(columnIndex));
+    }
+
+    @Nullable
+    @Override
+    public Base64Value getResult(CallableStatement cs, int columnIndex) throws SQLException {
+      return new Base64Value(cs.getString(columnIndex));
+    }
+
+  }
 }
 
 
diff --git a/today-jdbc/src/test/java/infra/persistence/support/DefaultConditionStrategyTests.java b/today-jdbc/src/test/java/infra/persistence/support/DefaultConditionStrategyTests.java
index 53c1e1c89f..3d3ba66159 100644
--- a/today-jdbc/src/test/java/infra/persistence/support/DefaultConditionStrategyTests.java
+++ b/today-jdbc/src/test/java/infra/persistence/support/DefaultConditionStrategyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -53,7 +53,7 @@ void blank() {
     assertThat(condition).isNotNull();
 
     assertThat(condition.entityProperty).isSameAs(name);
-    assertThat(condition.propertyValue).isEqualTo("name");
+    assertThat(condition.value).isEqualTo("name");
     assertThat(condition.restriction).isEqualTo(Restriction.equal("name"));
 
   }
@@ -71,7 +71,7 @@ void normal() {
     assertThat(condition).isNotNull();
 
     assertThat(condition.entityProperty).isSameAs(number);
-    assertThat(condition.propertyValue).isEqualTo(2);
+    assertThat(condition.value).isEqualTo(2);
     assertThat(condition.restriction).isEqualTo(Restriction.equal("number"));
   }
 
diff --git a/today-jdbc/src/test/java/infra/persistence/support/FuzzyQueryConditionStrategyTests.java b/today-jdbc/src/test/java/infra/persistence/support/FuzzyQueryConditionStrategyTests.java
index 74e1f8d93a..f80b4707de 100644
--- a/today-jdbc/src/test/java/infra/persistence/support/FuzzyQueryConditionStrategyTests.java
+++ b/today-jdbc/src/test/java/infra/persistence/support/FuzzyQueryConditionStrategyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2024 the original author or authors.
+ * Copyright 2017 - 2025 the original author or authors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -61,7 +61,7 @@ void trimLike() {
     var condition = strategy.resolve(trimLike, " \n f");
     assertThat(condition).isNotNull();
     assertThat(condition.entityProperty).isSameAs(trimLike);
-    assertThat(condition.propertyValue).isEqualTo("%f%");
+    assertThat(condition.value).isEqualTo("%f%");
     assertThat(condition.restriction).isInstanceOf(LikeRestriction.class);
 
     var likeRestriction = (LikeRestriction) condition.restriction;
@@ -80,7 +80,7 @@ void notTrimLike() {
     var condition = strategy.resolve(notTrimLike, " f ");
     assertThat(condition).isNotNull();
     assertThat(condition.entityProperty).isSameAs(notTrimLike);
-    assertThat(condition.propertyValue).isEqualTo("% f %");
+    assertThat(condition.value).isEqualTo("% f %");
     assertThat(condition.restriction).isInstanceOf(LikeRestriction.class);
 
     var likeRestriction = (LikeRestriction) condition.restriction;
@@ -97,7 +97,7 @@ void trimPrefixLike() {
     var condition = strategy.resolve(trimPrefixLike, " \n f");
     assertThat(condition).isNotNull();
     assertThat(condition.entityProperty).isSameAs(trimPrefixLike);
-    assertThat(condition.propertyValue).isEqualTo("f%");
+    assertThat(condition.value).isEqualTo("f%");
     assertThat(condition.restriction).isInstanceOf(LikeRestriction.class);
 
     var likeRestriction = (LikeRestriction) condition.restriction;
@@ -116,7 +116,7 @@ void notTrimPrefixLike() {
     var condition = strategy.resolve(notTrimPrefixLike, " f ");
     assertThat(condition).isNotNull();
     assertThat(condition.entityProperty).isSameAs(notTrimPrefixLike);
-    assertThat(condition.propertyValue).isEqualTo(" f %");
+    assertThat(condition.value).isEqualTo(" f %");
     assertThat(condition.restriction).isInstanceOf(LikeRestriction.class);
 
     var likeRestriction = (LikeRestriction) condition.restriction;
@@ -133,7 +133,7 @@ void trimSuffixLike() {
     var condition = strategy.resolve(trimSuffixLike, " \n f");
     assertThat(condition).isNotNull();
     assertThat(condition.entityProperty).isSameAs(trimSuffixLike);
-    assertThat(condition.propertyValue).isEqualTo("%f");
+    assertThat(condition.value).isEqualTo("%f");
     assertThat(condition.restriction).isInstanceOf(LikeRestriction.class);
 
     var likeRestriction = (LikeRestriction) condition.restriction;
@@ -152,7 +152,7 @@ void notTrimSuffixLike() {
     var condition = strategy.resolve(notTrimSuffixLike, " f ");
     assertThat(condition).isNotNull();
     assertThat(condition.entityProperty).isSameAs(notTrimSuffixLike);
-    assertThat(condition.propertyValue).isEqualTo("% f ");
+    assertThat(condition.value).isEqualTo("% f ");
     assertThat(condition.restriction).isInstanceOf(LikeRestriction.class);
 
     var likeRestriction = (LikeRestriction) condition.restriction;
@@ -173,7 +173,7 @@ void column() {
     assertThat(condition).isNotNull();
 
     assertThat(condition.entityProperty).isSameAs(column);
-    assertThat(condition.propertyValue).isEqualTo("%f%");
+    assertThat(condition.value).isEqualTo("%f%");
     assertThat(condition.restriction).isInstanceOf(LikeRestriction.class);
 
     var likeRestriction = (LikeRestriction) condition.restriction;