From 7f068874bbc0dc071e3c982650beca92d0900479 Mon Sep 17 00:00:00 2001
From: ShenFeng312 <ShenFeng197@gmail.com>
Date: Fri, 14 Mar 2025 10:15:40 +0800
Subject: [PATCH 1/2] Use force-quoting in R2dbcMappingContext by default

---
 .../r2dbc/convert/MappingR2dbcConverter.java  |  13 ++-
 .../DefaultReactiveDataAccessStrategy.java    |   4 +-
 .../r2dbc/core/DefaultStatementMapper.java    |  24 +++--
 .../data/r2dbc/core/R2dbcEntityTemplate.java  |  16 ++-
 .../data/r2dbc/core/StatementMapper.java      |   3 +
 .../r2dbc/mapping/R2dbcMappingContext.java    |   2 -
 .../data/r2dbc/query/QueryMapper.java         |  22 +++-
 .../data/r2dbc/query/UpdateMapper.java        |   2 +-
 .../repository/query/R2dbcQueryCreator.java   |  16 ++-
 .../core/R2dbcEntityTemplateUnitTests.java    |   4 +-
 ...ReactiveDataAccessStrategyTestSupport.java |   1 +
 .../ReactiveDeleteOperationUnitTests.java     |   6 +-
 .../ReactiveInsertOperationUnitTests.java     |   4 +-
 .../ReactiveSelectOperationUnitTests.java     |  16 +--
 .../ReactiveUpdateOperationUnitTests.java     |   8 +-
 .../r2dbc/core/StatementMapperUnitTests.java  |   2 +-
 .../query/PartTreeR2dbcQueryUnitTests.java    | 100 +++++++++---------
 .../query/R2dbcQueryMethodUnitTests.java      |   2 +-
 ...SqlInspectingR2dbcRepositoryUnitTests.java |   2 +-
 .../core/mapping/DerivedSqlIdentifier.java    |   1 +
 20 files changed, 157 insertions(+), 91 deletions(-)

diff --git a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/convert/MappingR2dbcConverter.java b/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/convert/MappingR2dbcConverter.java
index bf5f82b789..64fd17832a 100644
--- a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/convert/MappingR2dbcConverter.java
+++ b/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/convert/MappingR2dbcConverter.java
@@ -44,6 +44,7 @@
 import org.springframework.data.relational.core.mapping.RelationalMappingContext;
 import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
 import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;
+import org.springframework.data.relational.core.sql.SqlIdentifier;
 import org.springframework.data.relational.domain.RowDocument;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.lang.Nullable;
@@ -225,7 +226,10 @@ private void writeSimpleInternal(OutboundRow sink, Object value, boolean isNew,
 
 		Object result = getPotentiallyConvertedSimpleWrite(value);
 
-		sink.put(property.getColumnName(),
+		SqlIdentifier columnName = property.getColumnName();
+
+		sink.put(SqlIdentifier.unquoted(columnName.getReference()),
+//		sink.put(property.getColumnName(),
 				Parameter.fromOrEmpty(result, getPotentiallyConvertedSimpleNullType(property.getType())));
 	}
 
@@ -244,7 +248,10 @@ private void writePropertyInternal(OutboundRow sink, Object value, boolean isNew
 			}
 
 			List<Object> collectionInternal = createCollection(asCollection(value), property);
-			sink.put(property.getColumnName(), Parameter.from(collectionInternal));
+//			sink.put(property.getColumnName(), Parameter.from(collectionInternal));
+			SqlIdentifier columnName = property.getColumnName();
+//
+			sink.put(SqlIdentifier.unquoted(columnName.getReference()), Parameter.from(collectionInternal));
 			return;
 		}
 
@@ -301,7 +308,7 @@ private List<Object> writeCollectionInternal(Collection<?> source, @Nullable Typ
 
 	private void writeNullInternal(OutboundRow sink, RelationalPersistentProperty property) {
 
-		sink.put(property.getColumnName(), Parameter.empty(getPotentiallyConvertedSimpleNullType(property.getType())));
+		sink.put(property.getColumnName().getReference(), Parameter.empty(getPotentiallyConvertedSimpleNullType(property.getType())));
 	}
 
 	private Class<?> getPotentiallyConvertedSimpleNullType(Class<?> type) {
diff --git a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/core/DefaultReactiveDataAccessStrategy.java b/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/core/DefaultReactiveDataAccessStrategy.java
index d655464e82..a2eacbfd15 100644
--- a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/core/DefaultReactiveDataAccessStrategy.java
+++ b/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/core/DefaultReactiveDataAccessStrategy.java
@@ -181,11 +181,11 @@ public OutboundRow getOutboundRow(Object object) {
 
 		for (RelationalPersistentProperty property : entity) {
 
-			Parameter value = row.get(property.getColumnName());
+			Parameter value = row.get(property.getColumnName().getReference());
 			if (value != null && shouldConvertArrayValue(property, value)) {
 
 				Parameter writeValue = getArrayValue(value, property);
-				row.put(property.getColumnName(), writeValue);
+				row.put(property.getColumnName().getReference(), writeValue);
 			}
 		}
 
diff --git a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/core/DefaultStatementMapper.java b/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/core/DefaultStatementMapper.java
index a7fcf2a13e..cbdc288ae8 100644
--- a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/core/DefaultStatementMapper.java
+++ b/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/core/DefaultStatementMapper.java
@@ -18,6 +18,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.jetbrains.annotations.NotNull;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.r2dbc.convert.R2dbcConverter;
 import org.springframework.data.r2dbc.dialect.R2dbcDialect;
@@ -25,6 +26,7 @@
 import org.springframework.data.r2dbc.query.BoundCondition;
 import org.springframework.data.r2dbc.query.UpdateMapper;
 import org.springframework.data.relational.core.dialect.RenderContextFactory;
+import org.springframework.data.relational.core.mapping.RelationalMappingContext;
 import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
 import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;
 import org.springframework.data.relational.core.query.CriteriaDefinition;
@@ -53,7 +55,7 @@ class DefaultStatementMapper implements StatementMapper {
 	private final RenderContext renderContext;
 	private final UpdateMapper updateMapper;
 	private final MappingContext<? extends RelationalPersistentEntity<?>, ? extends RelationalPersistentProperty> mappingContext;
-
+	private boolean forceQuote;
 	DefaultStatementMapper(R2dbcDialect dialect, R2dbcConverter converter) {
 
 		RenderContextFactory factory = new RenderContextFactory(dialect);
@@ -62,6 +64,9 @@ class DefaultStatementMapper implements StatementMapper {
 		this.renderContext = factory.createRenderContext();
 		this.updateMapper = new UpdateMapper(dialect, converter);
 		this.mappingContext = converter.getMappingContext();
+		if(mappingContext instanceof RelationalMappingContext relationalMappingContext){
+			 forceQuote = relationalMappingContext.isForceQuote();
+		}
 	}
 
 	DefaultStatementMapper(R2dbcDialect dialect, RenderContext renderContext, UpdateMapper updateMapper,
@@ -70,6 +75,9 @@ class DefaultStatementMapper implements StatementMapper {
 		this.renderContext = renderContext;
 		this.updateMapper = updateMapper;
 		this.mappingContext = mappingContext;
+		if(mappingContext instanceof RelationalMappingContext relationalMappingContext){
+			forceQuote = relationalMappingContext.isForceQuote();
+		}
 	}
 
 	@Override
@@ -90,7 +98,8 @@ public PreparedOperation<?> getMappedObject(SelectSpec selectSpec) {
 	private PreparedOperation<Select> getMappedObject(SelectSpec selectSpec,
 			@Nullable RelationalPersistentEntity<?> entity) {
 
-		Table table = selectSpec.getTable();
+		String tableName = selectSpec.getTable().getName().getReference();
+		Table table = getTable(tableName);
 		SelectBuilder.SelectAndFrom selectAndFrom = StatementBuilder.select(getSelectList(selectSpec, entity));
 
 		if (selectSpec.isDistinct()) {
@@ -158,7 +167,7 @@ private PreparedOperation<Insert> getMappedObject(InsertSpec insertSpec,
 			@Nullable RelationalPersistentEntity<?> entity) {
 
 		BindMarkers bindMarkers = this.dialect.getBindMarkersFactory().create();
-		Table table = Table.create(toSql(insertSpec.getTable()));
+		Table table = getTable(insertSpec.getTable().getReference());
 
 		BoundAssignments boundAssignments = this.updateMapper.getMappedObject(bindMarkers, insertSpec.getAssignments(),
 				table, entity);
@@ -191,7 +200,7 @@ private PreparedOperation<Update> getMappedObject(UpdateSpec updateSpec,
 			@Nullable RelationalPersistentEntity<?> entity) {
 
 		BindMarkers bindMarkers = this.dialect.getBindMarkersFactory().create();
-		Table table = Table.create(toSql(updateSpec.getTable()));
+		Table table = getTable(updateSpec.getTable().getReference());
 
 		if (updateSpec.getUpdate() == null || updateSpec.getUpdate().getAssignments().isEmpty()) {
 			throw new IllegalArgumentException("UPDATE contains no assignments");
@@ -210,7 +219,6 @@ private PreparedOperation<Update> getMappedObject(UpdateSpec updateSpec,
 
 		CriteriaDefinition criteria = updateSpec.getCriteria();
 		if (criteria != null && !criteria.isEmpty()) {
-
 			BoundCondition boundCondition = this.updateMapper.getMappedObject(bindMarkers, criteria, table, entity);
 
 			bindings = bindings.and(boundCondition.getBindings());
@@ -222,6 +230,10 @@ private PreparedOperation<Update> getMappedObject(UpdateSpec updateSpec,
 		return new DefaultPreparedOperation<>(update, this.renderContext, bindings);
 	}
 
+	private Table getTable(String tableName) {
+		return forceQuote ? Table.create(SqlIdentifier.quoted(tableName)) : Table.create(SqlIdentifier.unquoted(tableName));
+	}
+
 	@Override
 	public PreparedOperation<Delete> getMappedObject(DeleteSpec deleteSpec) {
 		return getMappedObject(deleteSpec, null);
@@ -236,7 +248,7 @@ private PreparedOperation<Delete> getMappedObject(DeleteSpec deleteSpec,
 			@Nullable RelationalPersistentEntity<?> entity) {
 
 		BindMarkers bindMarkers = this.dialect.getBindMarkersFactory().create();
-		Table table = Table.create(toSql(deleteSpec.getTable()));
+		Table table = getTable(deleteSpec.getTable().getReference());
 
 		DeleteBuilder.DeleteWhere deleteBuilder = StatementBuilder.delete(table);
 
diff --git a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java b/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java
index 7ec6c70cef..8b2fcb4df7 100644
--- a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java
+++ b/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java
@@ -19,6 +19,8 @@
 import io.r2dbc.spi.Row;
 import io.r2dbc.spi.RowMetadata;
 import io.r2dbc.spi.Statement;
+import org.springframework.data.r2dbc.mapping.R2dbcMappingContext;
+import org.springframework.data.relational.core.mapping.RelationalMappingContext;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -354,6 +356,11 @@ private <T> RowsFetchSpec<T> doSelect(Query query, Class<?> entityType, SqlIdent
 			Class<T> returnType, Function<? super Statement, ? extends Statement> filterFunction) {
 
 		StatementMapper statementMapper = dataAccessStrategy.getStatementMapper().forType(entityType);
+		boolean forceQuote = false;
+		if(this.mappingContext instanceof RelationalMappingContext relationalMappingContext){
+			 forceQuote = relationalMappingContext.isForceQuote();
+		}
+		tableName = forceQuote ? SqlIdentifier.quoted(tableName.getReference()): SqlIdentifier.unquoted(tableName.getReference());
 
 		StatementMapper.SelectSpec selectSpec = statementMapper //
 				.createSelect(tableName) //
@@ -548,9 +555,16 @@ private <T> Mono<T> doInsert(T entity, SqlIdentifier tableName, OutboundRow outb
 		StatementMapper.InsertSpec insert = mapper.createInsert(tableName);
 
 		for (SqlIdentifier column : outboundRow.keySet()) {
+
 			Parameter settableValue = outboundRow.get(column);
 			if (settableValue.hasValue()) {
-				insert = insert.withColumn(column, settableValue);
+				boolean forceQuote = false;
+				if(this.mappingContext instanceof R2dbcMappingContext r2dbcMappingContext){
+					 forceQuote = r2dbcMappingContext.isForceQuote();
+				}
+
+
+				insert = insert.withColumn(forceQuote? SqlIdentifier.quoted(column.getReference()): column, settableValue);
 			}
 		}
 
diff --git a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/core/StatementMapper.java b/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/core/StatementMapper.java
index 88729b49cc..39458c7510 100644
--- a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/core/StatementMapper.java
+++ b/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/core/StatementMapper.java
@@ -26,6 +26,7 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
+import org.jetbrains.annotations.TestOnly;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.r2dbc.convert.R2dbcConverter;
@@ -128,6 +129,7 @@ interface TypedStatementMapper<T> extends StatementMapper {}
 	 * @param table
 	 * @return the {@link SelectSpec}.
 	 */
+	@TestOnly
 	default SelectSpec createSelect(String table) {
 		return SelectSpec.create(table);
 	}
@@ -250,6 +252,7 @@ protected SelectSpec(Table table, List<String> projectedFields, List<Expression>
 		 * @param table
 		 * @return the {@link SelectSpec}.
 		 */
+		@TestOnly
 		public static SelectSpec create(String table) {
 			return create(SqlIdentifier.unquoted(table));
 		}
diff --git a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/mapping/R2dbcMappingContext.java b/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/mapping/R2dbcMappingContext.java
index 5053291be6..f9d30165a4 100644
--- a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/mapping/R2dbcMappingContext.java
+++ b/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/mapping/R2dbcMappingContext.java
@@ -32,7 +32,6 @@ public class R2dbcMappingContext extends RelationalMappingContext {
 	 * Create a new {@link R2dbcMappingContext}.
 	 */
 	public R2dbcMappingContext() {
-		setForceQuote(false);
 	}
 
 	/**
@@ -42,7 +41,6 @@ public R2dbcMappingContext() {
 	 */
 	public R2dbcMappingContext(NamingStrategy namingStrategy) {
 		super(namingStrategy);
-		setForceQuote(false);
 	}
 
 	@Override
diff --git a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/query/QueryMapper.java b/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/query/QueryMapper.java
index f6ee60dd02..8b6419f43c 100644
--- a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/query/QueryMapper.java
+++ b/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/query/QueryMapper.java
@@ -22,6 +22,7 @@
 import java.util.Map;
 import java.util.regex.Pattern;
 
+import org.jetbrains.annotations.NotNull;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mapping.MappingException;
 import org.springframework.data.mapping.PersistentPropertyPath;
@@ -31,6 +32,7 @@
 import org.springframework.data.r2dbc.convert.R2dbcConverter;
 import org.springframework.data.r2dbc.dialect.R2dbcDialect;
 import org.springframework.data.relational.core.dialect.Escaper;
+import org.springframework.data.relational.core.mapping.RelationalMappingContext;
 import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
 import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;
 import org.springframework.data.relational.core.query.CriteriaDefinition;
@@ -64,6 +66,7 @@ public class QueryMapper {
 	private final R2dbcConverter converter;
 	private final R2dbcDialect dialect;
 	private final MappingContext<? extends RelationalPersistentEntity<?>, RelationalPersistentProperty> mappingContext;
+	private final boolean forceQuote;
 
 	/**
 	 * Creates a new {@link QueryMapper} with the given {@link R2dbcConverter}.
@@ -80,6 +83,11 @@ public QueryMapper(R2dbcDialect dialect, R2dbcConverter converter) {
 		this.converter = converter;
 		this.dialect = dialect;
 		this.mappingContext = (MappingContext) converter.getMappingContext();
+		if(mappingContext instanceof RelationalMappingContext relationalMappingContext){
+			forceQuote = relationalMappingContext.isForceQuote();
+		}else {
+			forceQuote= false;
+		}
 	}
 
 	/**
@@ -107,7 +115,7 @@ public String toSql(SqlIdentifier identifier) {
 	public List<OrderByField> getMappedSort(Table table, Sort sort, @Nullable RelationalPersistentEntity<?> entity) {
 
 		List<OrderByField> mappedOrder = new ArrayList<>();
-
+		table = getTable(table);
 		for (Sort.Order order : sort) {
 
 			SqlSort.validate(order);
@@ -120,13 +128,23 @@ public List<OrderByField> getMappedSort(Table table, Sort sort, @Nullable Relati
 		return mappedOrder;
 	}
 
+	 Table getTable(Table table) {
+		String tableName = table.getName().getReference();
+		table = Table.create(forceQuote? SqlIdentifier.quoted(tableName):SqlIdentifier.unquoted(tableName));
+		return table;
+	}
+
 	private OrderByField createSimpleOrderByField(Table table, RelationalPersistentEntity<?> entity, Sort.Order order) {
 
 		if (order instanceof SqlSort.SqlOrder sqlOrder && sqlOrder.isUnsafe()) {
 			return OrderByField.from(Expressions.just(sqlOrder.getProperty()));
 		}
+		boolean forceQuote = false;
+		if(this.mappingContext instanceof RelationalMappingContext relationalMappingContext){
+			forceQuote = relationalMappingContext.isForceQuote();
+		}
 
-		Field field = createPropertyField(entity, SqlIdentifier.unquoted(order.getProperty()), this.mappingContext);
+		Field field = createPropertyField(entity, forceQuote ? SqlIdentifier.quoted(order.getProperty()) : SqlIdentifier.unquoted(order.getProperty()), this.mappingContext);
 		return OrderByField.from(table.column(field.getMappedColumnName()));
 	}
 
diff --git a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/query/UpdateMapper.java b/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/query/UpdateMapper.java
index d770e10800..e1f9895f27 100644
--- a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/query/UpdateMapper.java
+++ b/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/query/UpdateMapper.java
@@ -94,7 +94,7 @@ public BoundAssignments getMappedObject(BindMarkers markers, Map<SqlIdentifier,
 		List<Assignment> result = new ArrayList<>();
 
 		assignments.forEach((column, value) -> {
-			Assignment assignment = getAssignment(column, value, bindings, table, entity);
+			Assignment assignment = getAssignment(column, value, bindings, getTable(table), entity);
 			result.add(assignment);
 		});
 
diff --git a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryCreator.java b/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryCreator.java
index a4b6b04f5a..0668706c89 100644
--- a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryCreator.java
+++ b/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryCreator.java
@@ -25,6 +25,7 @@
 import org.springframework.data.domain.Sort;
 import org.springframework.data.r2dbc.core.ReactiveDataAccessStrategy;
 import org.springframework.data.r2dbc.core.StatementMapper;
+import org.springframework.data.relational.core.mapping.RelationalMappingContext;
 import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
 import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;
 import org.springframework.data.relational.core.query.Criteria;
@@ -163,9 +164,18 @@ private Expression[] getSelectProjection() {
 			for (String projectedProperty : projectedProperties) {
 
 				RelationalPersistentProperty property = entity.getPersistentProperty(projectedProperty);
-				Column column = table.column(property != null //
-						? property.getColumnName() //
-						: SqlIdentifier.unquoted(projectedProperty));
+				Column column;
+				if (property != null) {
+					column = table.column(property.getColumnName());
+				} else {
+					boolean forceQuote = false;
+					if (this.dataAccessStrategy.getConverter().getMappingContext() instanceof RelationalMappingContext relationalMappingContext) {
+						forceQuote = relationalMappingContext.isForceQuote();
+					}
+					column = table.column(forceQuote
+							? SqlIdentifier.quoted(projectedProperty)
+							: SqlIdentifier.unquoted(projectedProperty));
+				}
 				expressions.add(column);
 			}
 
diff --git a/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplateUnitTests.java b/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplateUnitTests.java
index 77707d4dda..d18bcf617e 100644
--- a/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplateUnitTests.java
+++ b/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplateUnitTests.java
@@ -95,8 +95,10 @@ void before() {
 		R2dbcCustomConversions conversions = R2dbcCustomConversions.of(PostgresDialect.INSTANCE, new MoneyConverter(),
 				new RowConverter(), new RowDocumentConverter(), new PkConverter());
 
+		R2dbcMappingContext context = new R2dbcMappingContext();
+		context.setForceQuote(false);
 		entityTemplate = new R2dbcEntityTemplate(client, PostgresDialect.INSTANCE,
-				new MappingR2dbcConverter(new R2dbcMappingContext(), conversions));
+				new MappingR2dbcConverter(context, conversions));
 	}
 
 	@Test // GH-220
diff --git a/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/ReactiveDataAccessStrategyTestSupport.java b/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/ReactiveDataAccessStrategyTestSupport.java
index 77b855b6bf..f8b44fe787 100644
--- a/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/ReactiveDataAccessStrategyTestSupport.java
+++ b/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/ReactiveDataAccessStrategyTestSupport.java
@@ -38,6 +38,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.data.annotation.ReadOnlyProperty;
 import org.springframework.data.r2dbc.dialect.R2dbcDialect;
+import org.springframework.data.r2dbc.mapping.OutboundRow;
 import org.springframework.data.relational.core.sql.SqlIdentifier;
 import org.springframework.r2dbc.core.Parameter;
 
diff --git a/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/ReactiveDeleteOperationUnitTests.java b/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/ReactiveDeleteOperationUnitTests.java
index 5462eeb600..f1b166c376 100644
--- a/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/ReactiveDeleteOperationUnitTests.java
+++ b/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/ReactiveDeleteOperationUnitTests.java
@@ -67,7 +67,7 @@ void shouldDelete() {
 
 		StatementRecorder.RecordedStatement statement = recorder.getCreatedStatement(s -> s.startsWith("DELETE"));
 
-		assertThat(statement.getSql()).isEqualTo("DELETE FROM person");
+		assertThat(statement.getSql()).isEqualTo("DELETE FROM \"person\"");
 	}
 
 	@Test // gh-410
@@ -104,7 +104,7 @@ void shouldDeleteWithQuery() {
 
 		StatementRecorder.RecordedStatement statement = recorder.getCreatedStatement(s -> s.startsWith("DELETE"));
 
-		assertThat(statement.getSql()).isEqualTo("DELETE FROM person WHERE person.THE_NAME = $1");
+		assertThat(statement.getSql()).isEqualTo("DELETE FROM \"person\" WHERE \"person\".\"THE_NAME\" = $1");
 		assertThat(statement.getBindings()).hasSize(1).containsEntry(0, Parameter.from("Walter"));
 	}
 
@@ -125,7 +125,7 @@ void shouldDeleteInTable() {
 
 		StatementRecorder.RecordedStatement statement = recorder.getCreatedStatement(s -> s.startsWith("DELETE"));
 
-		assertThat(statement.getSql()).isEqualTo("DELETE FROM other_table WHERE other_table.THE_NAME = $1");
+		assertThat(statement.getSql()).isEqualTo("DELETE FROM other_table WHERE other_table.\"THE_NAME\" = $1");
 	}
 
 	static class Person {
diff --git a/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/ReactiveInsertOperationUnitTests.java b/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/ReactiveInsertOperationUnitTests.java
index 1b2afe6b4f..22d1c9bc3f 100644
--- a/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/ReactiveInsertOperationUnitTests.java
+++ b/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/ReactiveInsertOperationUnitTests.java
@@ -79,7 +79,7 @@ void shouldInsert() {
 
 		StatementRecorder.RecordedStatement statement = recorder.getCreatedStatement(s -> s.startsWith("INSERT"));
 
-		assertThat(statement.getSql()).isEqualTo("INSERT INTO person (THE_NAME) VALUES ($1)");
+		assertThat(statement.getSql()).isEqualTo("INSERT INTO \"person\" (\"THE_NAME\") VALUES ($1)");
 		assertThat(statement.getBindings()).hasSize(1).containsEntry(0, Parameter.from("Walter"));
 	}
 
@@ -109,7 +109,7 @@ void shouldUpdateInTable() {
 
 		StatementRecorder.RecordedStatement statement = recorder.getCreatedStatement(s -> s.startsWith("INSERT"));
 
-		assertThat(statement.getSql()).isEqualTo("INSERT INTO the_table (THE_NAME) VALUES ($1)");
+		assertThat(statement.getSql()).isEqualTo("INSERT INTO the_table (\"THE_NAME\") VALUES ($1)");
 	}
 
 	static class Person {
diff --git a/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/ReactiveSelectOperationUnitTests.java b/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/ReactiveSelectOperationUnitTests.java
index e0ec5d4d0a..b661c40461 100644
--- a/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/ReactiveSelectOperationUnitTests.java
+++ b/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/ReactiveSelectOperationUnitTests.java
@@ -77,7 +77,7 @@ void shouldSelectAll() {
 		StatementRecorder.RecordedStatement statement = recorder.getCreatedStatement(s -> s.startsWith("SELECT"));
 
 		assertThat(statement.getSql())
-				.isEqualTo("SELECT person.* FROM person WHERE person.THE_NAME = $1 LIMIT 10 OFFSET 20");
+				.isEqualTo("SELECT \"person\".* FROM \"person\" WHERE \"person\".\"THE_NAME\" = $1 LIMIT 10 OFFSET 20");
 	}
 
 	@Test // GH-220
@@ -101,7 +101,7 @@ void shouldSelectAs() {
 
 		StatementRecorder.RecordedStatement statement = recorder.getCreatedStatement(s -> s.startsWith("SELECT"));
 
-		assertThat(statement.getSql()).isEqualTo("SELECT person.THE_NAME FROM person WHERE person.THE_NAME = $1");
+		assertThat(statement.getSql()).isEqualTo("SELECT \"person\".\"THE_NAME\" FROM \"person\" WHERE \"person\".\"THE_NAME\" = $1");
 	}
 
 	@Test // GH-220, GH-1690
@@ -125,7 +125,7 @@ void shouldSelectAsWithColumnName() {
 
 		StatementRecorder.RecordedStatement statement = recorder.getCreatedStatement(s -> s.startsWith("SELECT"));
 
-		assertThat(statement.getSql()).isEqualTo("SELECT person.id, person.a_different_name FROM person WHERE person.THE_NAME = $1");
+		assertThat(statement.getSql()).isEqualTo("SELECT \"person\".\"id\", \"person\".\"a_different_name\" FROM \"person\" WHERE \"person\".\"THE_NAME\" = $1");
 	}
 
 	@Test // GH-220
@@ -149,7 +149,7 @@ void shouldSelectFromTable() {
 
 		StatementRecorder.RecordedStatement statement = recorder.getCreatedStatement(s -> s.startsWith("SELECT"));
 
-		assertThat(statement.getSql()).isEqualTo("SELECT the_table.* FROM the_table WHERE the_table.THE_NAME = $1");
+		assertThat(statement.getSql()).isEqualTo("SELECT \"the_table\".* FROM \"the_table\" WHERE \"the_table\".\"THE_NAME\" = $1");
 	}
 
 	@Test // GH-220
@@ -172,7 +172,7 @@ void shouldSelectFirst() {
 
 		StatementRecorder.RecordedStatement statement = recorder.getCreatedStatement(s -> s.startsWith("SELECT"));
 
-		assertThat(statement.getSql()).isEqualTo("SELECT person.* FROM person WHERE person.THE_NAME = $1 LIMIT 1");
+		assertThat(statement.getSql()).isEqualTo("SELECT \"person\".* FROM \"person\" WHERE \"person\".\"THE_NAME\" = $1 LIMIT 1");
 	}
 
 	@Test // GH-220
@@ -195,7 +195,7 @@ void shouldSelectOne() {
 
 		StatementRecorder.RecordedStatement statement = recorder.getCreatedStatement(s -> s.startsWith("SELECT"));
 
-		assertThat(statement.getSql()).isEqualTo("SELECT person.* FROM person WHERE person.THE_NAME = $1 LIMIT 2");
+		assertThat(statement.getSql()).isEqualTo("SELECT \"person\".* FROM \"person\" WHERE \"person\".\"THE_NAME\" = $1 LIMIT 2");
 	}
 
 	@Test // GH-220
@@ -218,7 +218,7 @@ void shouldSelectExists() {
 
 		StatementRecorder.RecordedStatement statement = recorder.getCreatedStatement(s -> s.startsWith("SELECT"));
 
-		assertThat(statement.getSql()).isEqualTo("SELECT 1 FROM person WHERE person.THE_NAME = $1 LIMIT 1");
+		assertThat(statement.getSql()).isEqualTo("SELECT 1 FROM \"person\" WHERE \"person\".\"THE_NAME\" = $1 LIMIT 1");
 	}
 
 	@Test // GH-220
@@ -241,7 +241,7 @@ void shouldSelectCount() {
 
 		StatementRecorder.RecordedStatement statement = recorder.getCreatedStatement(s -> s.startsWith("SELECT"));
 
-		assertThat(statement.getSql()).isEqualTo("SELECT COUNT(*) FROM person WHERE person.THE_NAME = $1");
+		assertThat(statement.getSql()).isEqualTo("SELECT COUNT(*) FROM \"person\" WHERE \"person\".\"THE_NAME\" = $1");
 	}
 
 	@Test // GH-1652
diff --git a/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/ReactiveUpdateOperationUnitTests.java b/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/ReactiveUpdateOperationUnitTests.java
index 91106b342c..ffa80d8317 100644
--- a/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/ReactiveUpdateOperationUnitTests.java
+++ b/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/ReactiveUpdateOperationUnitTests.java
@@ -68,7 +68,7 @@ void shouldUpdate() {
 
 		StatementRecorder.RecordedStatement statement = recorder.getCreatedStatement(s -> s.startsWith("UPDATE"));
 
-		assertThat(statement.getSql()).isEqualTo("UPDATE person SET THE_NAME = $1");
+		assertThat(statement.getSql()).isEqualTo("UPDATE \"person\" SET \"THE_NAME\" = $1");
 		assertThat(statement.getBindings()).hasSize(1).containsEntry(0, Parameter.from("Heisenberg"));
 	}
 
@@ -87,7 +87,7 @@ void shouldUpdateWithTable() {
 
 		StatementRecorder.RecordedStatement statement = recorder.getCreatedStatement(s -> s.startsWith("UPDATE"));
 
-		assertThat(statement.getSql()).isEqualTo("UPDATE table SET THE_NAME = $1");
+		assertThat(statement.getSql()).isEqualTo("UPDATE table SET \"THE_NAME\" = $1");
 		assertThat(statement.getBindings()).hasSize(1).containsEntry(0, Parameter.from("Heisenberg"));
 	}
 
@@ -107,7 +107,7 @@ void shouldUpdateWithQuery() {
 
 		StatementRecorder.RecordedStatement statement = recorder.getCreatedStatement(s -> s.startsWith("UPDATE"));
 
-		assertThat(statement.getSql()).isEqualTo("UPDATE person SET THE_NAME = $1 WHERE person.THE_NAME = $2");
+		assertThat(statement.getSql()).isEqualTo("UPDATE \"person\" SET \"THE_NAME\" = $1 WHERE \"person\".\"THE_NAME\" = $2");
 		assertThat(statement.getBindings()).hasSize(2).containsEntry(0, Parameter.from("Heisenberg")).containsEntry(1,
 				Parameter.from("Walter"));
 	}
@@ -129,7 +129,7 @@ void shouldUpdateInTable() {
 
 		StatementRecorder.RecordedStatement statement = recorder.getCreatedStatement(s -> s.startsWith("UPDATE"));
 
-		assertThat(statement.getSql()).isEqualTo("UPDATE the_table SET THE_NAME = $1 WHERE the_table.THE_NAME = $2");
+		assertThat(statement.getSql()).isEqualTo("UPDATE the_table SET \"THE_NAME\" = $1 WHERE the_table.\"THE_NAME\" = $2");
 	}
 
 	static class Person {
diff --git a/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/StatementMapperUnitTests.java b/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/StatementMapperUnitTests.java
index 4773e61979..c7486639bb 100644
--- a/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/StatementMapperUnitTests.java
+++ b/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/StatementMapperUnitTests.java
@@ -80,7 +80,7 @@ void shouldMapSelectWithPage() {
 		PreparedOperation<?> preparedOperation = mapper.getMappedObject(selectSpec);
 
 		assertThat(preparedOperation.toQuery())
-				.isEqualTo("SELECT table.* FROM table ORDER BY table.id DESC LIMIT 2 OFFSET 2");
+				.isEqualTo("SELECT table.* FROM table ORDER BY table.\"id\" DESC LIMIT 2 OFFSET 2");
 	}
 
 	@Test // gh-1041
diff --git a/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/repository/query/PartTreeR2dbcQueryUnitTests.java b/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/repository/query/PartTreeR2dbcQueryUnitTests.java
index d631130d17..2a8fba86f3 100644
--- a/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/repository/query/PartTreeR2dbcQueryUnitTests.java
+++ b/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/repository/query/PartTreeR2dbcQueryUnitTests.java
@@ -77,9 +77,9 @@
 @MockitoSettings(strictness = Strictness.LENIENT)
 class PartTreeR2dbcQueryUnitTests {
 
-	private static final String TABLE = "users";
-	private static final String[] ALL_FIELDS_ARRAY = new String[] { ".id", ".first_name", ".last_name", ".date_of_birth",
-			".age", ".active" };
+	private static final String TABLE = "\"users\"";
+	private static final String[] ALL_FIELDS_ARRAY = new String[] { ".\"id\"", ".\"first_name\"", ".\"last_name\"", ".\"date_of_birth\"",
+			".\"age\"", ".\"active\"" };
 	private static final String[] ALL_FIELDS_ARRAY_PREFIXED = Arrays.stream(ALL_FIELDS_ARRAY).map(f -> TABLE + f)
 			.toArray(String[]::new);
 	private static final String ALL_FIELDS = String.join(", ", ALL_FIELDS_ARRAY_PREFIXED);
@@ -121,7 +121,7 @@ void createsQueryToFindAllEntitiesByStringAttribute() throws Exception {
 		PreparedOperationAssert.assertThat(preparedOperation) //
 				.selects(ALL_FIELDS_ARRAY_PREFIXED) //
 				.from(TABLE) //
-				.where(TABLE + ".first_name = $1");
+				.where(TABLE + ".\"first_name\" = $1");
 	}
 
 	@Test // GH-282
@@ -134,7 +134,7 @@ void createsQueryWithIsNullCondition() throws Exception {
 		PreparedOperationAssert.assertThat(preparedOperation) //
 				.selects(ALL_FIELDS_ARRAY_PREFIXED) //
 				.from(TABLE) //
-				.where(TABLE + ".first_name IS NULL");
+				.where(TABLE + ".\"first_name\" IS NULL");
 	}
 
 	@Test // GH-282
@@ -145,9 +145,9 @@ void createsQueryWithLimitForExistsProjection() throws Exception {
 		PreparedOperation<?> query = createQuery(queryMethod, r2dbcQuery, "John");
 
 		PreparedOperationAssert.assertThat(query) //
-				.selects(TABLE + ".id") //
+				.selects(TABLE + ".\"id\"") //
 				.from(TABLE) //
-				.where(TABLE + ".first_name = $1 LIMIT 1");
+				.where(TABLE + ".\"first_name\" = $1 LIMIT 1");
 	}
 
 	@Test // GH-282
@@ -161,7 +161,7 @@ void createsQueryToFindAllEntitiesByTwoStringAttributes() throws Exception {
 		PreparedOperationAssert.assertThat(preparedOperation) //
 				.selects(ALL_FIELDS_ARRAY_PREFIXED) //
 				.from(TABLE) //
-				.where(TABLE + ".last_name = $1 AND (" + TABLE + ".first_name = $2)");
+				.where(TABLE + ".\"last_name\" = $1 AND (" + TABLE + ".\"first_name\" = $2)");
 	}
 
 	@Test // GH-282
@@ -175,7 +175,7 @@ void createsQueryToFindAllEntitiesByOneOfTwoStringAttributes() throws Exception
 		PreparedOperationAssert.assertThat(preparedOperation) //
 				.selects(ALL_FIELDS_ARRAY_PREFIXED) //
 				.from(TABLE) //
-				.where(TABLE + ".last_name = $1 OR (" + TABLE + ".first_name = $2)");
+				.where(TABLE + ".\"last_name\" = $1 OR (" + TABLE + ".\"first_name\" = $2)");
 	}
 
 	@Test // GH-282, GH-349
@@ -191,7 +191,7 @@ void createsQueryToFindAllEntitiesByDateAttributeBetween() throws Exception {
 		PreparedOperationAssert.assertThat(preparedOperation) //
 				.selects(ALL_FIELDS_ARRAY_PREFIXED) //
 				.from(TABLE) //
-				.where(TABLE + ".date_of_birth BETWEEN $1 AND $2");
+				.where(TABLE + ".\"date_of_birth\" BETWEEN $1 AND $2");
 
 		BindTarget bindTarget = mock(BindTarget.class);
 		preparedOperation.bindTo(bindTarget);
@@ -211,7 +211,7 @@ void createsQueryToFindAllEntitiesByIntegerAttributeLessThan() throws Exception
 		PreparedOperationAssert.assertThat(preparedOperation) //
 				.selects(ALL_FIELDS_ARRAY_PREFIXED) //
 				.from(TABLE) //
-				.where(TABLE + ".age < $1");
+				.where(TABLE + ".\"age\" < $1");
 	}
 
 	@Test // GH-282
@@ -225,7 +225,7 @@ void createsQueryToFindAllEntitiesByIntegerAttributeLessThanEqual() throws Excep
 		PreparedOperationAssert.assertThat(preparedOperation) //
 				.selects(ALL_FIELDS_ARRAY_PREFIXED) //
 				.from(TABLE) //
-				.where(TABLE + ".age <= $1");
+				.where(TABLE + ".\"age\" <= $1");
 	}
 
 	@Test // GH-282
@@ -239,7 +239,7 @@ void createsQueryToFindAllEntitiesByIntegerAttributeGreaterThan() throws Excepti
 		PreparedOperationAssert.assertThat(preparedOperation) //
 				.selects(ALL_FIELDS_ARRAY_PREFIXED) //
 				.from(TABLE) //
-				.where(TABLE + ".age > $1");
+				.where(TABLE + ".\"age\" > $1");
 	}
 
 	@Test // GH-282
@@ -253,7 +253,7 @@ void createsQueryToFindAllEntitiesByIntegerAttributeGreaterThanEqual() throws Ex
 		PreparedOperationAssert.assertThat(preparedOperation) //
 				.selects(ALL_FIELDS_ARRAY_PREFIXED) //
 				.from(TABLE) //
-				.where(TABLE + ".age >= $1");
+				.where(TABLE + ".\"age\" >= $1");
 	}
 
 	@Test // GH-282
@@ -267,7 +267,7 @@ void createsQueryToFindAllEntitiesByDateAttributeAfter() throws Exception {
 		PreparedOperationAssert.assertThat(preparedOperation) //
 				.selects(ALL_FIELDS_ARRAY_PREFIXED) //
 				.from(TABLE) //
-				.where(TABLE + ".date_of_birth > $1");
+				.where(TABLE + ".\"date_of_birth\" > $1");
 	}
 
 	@Test // GH-282
@@ -280,7 +280,7 @@ void createsQueryToFindAllEntitiesByDateAttributeBefore() throws Exception {
 		PreparedOperationAssert.assertThat(preparedOperation) //
 				.selects(ALL_FIELDS_ARRAY_PREFIXED) //
 				.from(TABLE) //
-				.where(TABLE + ".date_of_birth < $1");
+				.where(TABLE + ".\"date_of_birth\" < $1");
 	}
 
 	@Test // GH-282
@@ -294,7 +294,7 @@ void createsQueryToFindAllEntitiesByIntegerAttributeIsNull() throws Exception {
 		PreparedOperationAssert.assertThat(preparedOperation) //
 				.selects(ALL_FIELDS_ARRAY_PREFIXED) //
 				.from(TABLE) //
-				.where(TABLE + ".age IS NULL");
+				.where(TABLE + ".\"age\" IS NULL");
 	}
 
 	@Test // GH-282
@@ -308,7 +308,7 @@ void createsQueryToFindAllEntitiesByIntegerAttributeIsNotNull() throws Exception
 		PreparedOperationAssert.assertThat(preparedOperation) //
 				.selects(ALL_FIELDS_ARRAY_PREFIXED) //
 				.from(TABLE) //
-				.where(TABLE + ".age IS NOT NULL");
+				.where(TABLE + ".\"age\" IS NOT NULL");
 	}
 
 	@Test // GH-282
@@ -322,7 +322,7 @@ void createsQueryToFindAllEntitiesByStringAttributeLike() throws Exception {
 		PreparedOperationAssert.assertThat(preparedOperation) //
 				.selects(ALL_FIELDS_ARRAY_PREFIXED) //
 				.from(TABLE) //
-				.where(TABLE + ".first_name LIKE $1");
+				.where(TABLE + ".\"first_name\" LIKE $1");
 	}
 
 	@Test // GH-282
@@ -336,7 +336,7 @@ void createsQueryToFindAllEntitiesByStringAttributeNotLike() throws Exception {
 		PreparedOperationAssert.assertThat(preparedOperation) //
 				.selects(ALL_FIELDS_ARRAY_PREFIXED) //
 				.from(TABLE) //
-				.where(TABLE + ".first_name NOT LIKE $1");
+				.where(TABLE + ".\"first_name\" NOT LIKE $1");
 	}
 
 	@Test // GH-282
@@ -350,7 +350,7 @@ void createsQueryToFindAllEntitiesByStringAttributeStartingWith() throws Excepti
 		PreparedOperationAssert.assertThat(preparedOperation) //
 				.selects(ALL_FIELDS_ARRAY_PREFIXED) //
 				.from(TABLE) //
-				.where(TABLE + ".first_name LIKE $1");
+				.where(TABLE + ".\"first_name\" LIKE $1");
 	}
 
 	@Test // GH-282
@@ -377,7 +377,7 @@ void createsQueryToFindAllEntitiesByStringAttributeEndingWith() throws Exception
 		PreparedOperationAssert.assertThat(preparedOperation) //
 				.selects(ALL_FIELDS_ARRAY_PREFIXED) //
 				.from(TABLE) //
-				.where(TABLE + ".first_name LIKE $1");
+				.where(TABLE + ".\"first_name\" LIKE $1");
 	}
 
 	@Test // GH-282
@@ -404,7 +404,7 @@ void createsQueryToFindAllEntitiesByStringAttributeContaining() throws Exception
 		PreparedOperationAssert.assertThat(preparedOperation) //
 				.selects(ALL_FIELDS_ARRAY_PREFIXED) //
 				.from(TABLE) //
-				.where(TABLE + ".first_name LIKE $1");
+				.where(TABLE + ".\"first_name\" LIKE $1");
 	}
 
 	@Test // GH-282
@@ -431,7 +431,7 @@ void createsQueryToFindAllEntitiesByStringAttributeNotContaining() throws Except
 		PreparedOperationAssert.assertThat(preparedOperation) //
 				.selects(ALL_FIELDS_ARRAY_PREFIXED) //
 				.from(TABLE) //
-				.where(TABLE + ".first_name NOT LIKE $1");
+				.where(TABLE + ".\"first_name\" NOT LIKE $1");
 	}
 
 	@Test // GH-282
@@ -457,8 +457,8 @@ void createsQueryToFindAllEntitiesByIntegerAttributeWithDescendingOrderingByStri
 		PreparedOperationAssert.assertThat(preparedOperation) //
 				.selects(ALL_FIELDS_ARRAY_PREFIXED) //
 				.from(TABLE) //
-				.where(TABLE + ".age = $1") //
-				.orderBy("users.last_name DESC");
+				.where(TABLE + ".\"age\" = $1") //
+				.orderBy("\"users\".\"last_name\" DESC");
 	}
 
 	@Test // GH-282
@@ -472,8 +472,8 @@ void createsQueryToFindAllEntitiesByIntegerAttributeWithAscendingOrderingByStrin
 		PreparedOperationAssert.assertThat(preparedOperation) //
 				.selects(ALL_FIELDS_ARRAY_PREFIXED) //
 				.from(TABLE) //
-				.where(TABLE + ".age = $1") //
-				.orderBy("users.last_name ASC");
+				.where(TABLE + ".\"age\" = $1") //
+				.orderBy("\"users\".\"last_name\" ASC");
 	}
 
 	@Test // GH-282
@@ -487,7 +487,7 @@ void createsQueryToFindAllEntitiesByStringAttributeNot() throws Exception {
 		PreparedOperationAssert.assertThat(preparedOperation) //
 				.selects(ALL_FIELDS_ARRAY_PREFIXED) //
 				.from(TABLE) //
-				.where(TABLE + ".last_name != $1");
+				.where(TABLE + ".\"last_name\" != $1");
 	}
 
 	@Test // GH-282
@@ -502,7 +502,7 @@ void createsQueryToFindAllEntitiesByIntegerAttributeIn() throws Exception {
 		PreparedOperationAssert.assertThat(preparedOperation) //
 				.selects(ALL_FIELDS_ARRAY_PREFIXED) //
 				.from(TABLE) //
-				.where(TABLE + ".age IN ($1)");
+				.where(TABLE + ".\"age\" IN ($1)");
 	}
 
 	@Test // GH-282
@@ -517,7 +517,7 @@ void createsQueryToFindAllEntitiesByIntegerAttributeNotIn() throws Exception {
 		PreparedOperationAssert.assertThat(preparedOperation) //
 				.selects(ALL_FIELDS_ARRAY_PREFIXED) //
 				.from(TABLE) //
-				.where(TABLE + ".age NOT IN ($1)");
+				.where(TABLE + ".\"age\" NOT IN ($1)");
 	}
 
 	@Test // GH-282, GH-698
@@ -531,7 +531,7 @@ void createsQueryToFindAllEntitiesByBooleanAttributeTrue() throws Exception {
 		PreparedOperationAssert.assertThat(preparedOperation) //
 				.selects(ALL_FIELDS_ARRAY_PREFIXED) //
 				.from(TABLE) //
-				.where(TABLE + ".active = $1");
+				.where(TABLE + ".\"active\" = $1");
 	}
 
 	@Test // GH-282, GH-698
@@ -545,7 +545,7 @@ void createsQueryToFindAllEntitiesByBooleanAttributeFalse() throws Exception {
 		PreparedOperationAssert.assertThat(preparedOperation) //
 				.selects(ALL_FIELDS_ARRAY_PREFIXED) //
 				.from(TABLE) //
-				.where(TABLE + ".active = $1");
+				.where(TABLE + ".\"active\" = $1");
 	}
 
 	@Test // GH-282
@@ -559,7 +559,7 @@ void createsQueryToFindAllEntitiesByStringAttributeIgnoringCase() throws Excepti
 		PreparedOperationAssert.assertThat(preparedOperation) //
 				.selects(ALL_FIELDS_ARRAY_PREFIXED) //
 				.from(TABLE) //
-				.where("UPPER(" + TABLE + ".first_name) = UPPER($1)");
+				.where("UPPER(" + TABLE + ".\"first_name\") = UPPER($1)");
 	}
 
 	@Test // GH-282
@@ -600,7 +600,7 @@ void throwsExceptionWhenConditionKeywordIsUnsupported() throws Exception {
 				.isThrownBy(() -> createQuery(r2dbcQuery, getAccessor(queryMethod, new Object[0])));
 	}
 
-	@Test // GH-1548
+	@Test // GH-1548r2dbcConverter
 	void allowsSortingByNonDomainProperties() throws Exception {
 
 		R2dbcQueryMethod queryMethod = getQueryMethod("findAllByFirstName", String.class, Sort.class);
@@ -608,7 +608,7 @@ void allowsSortingByNonDomainProperties() throws Exception {
 
 		PreparedOperation<?> preparedOperation = createQuery(queryMethod, r2dbcQuery, "foo", Sort.by("foobar"));
 		PreparedOperationAssert.assertThat(preparedOperation) //
-				.orderBy("users.foobar ASC");
+				.orderBy("\"users\".\"foobar\" ASC");
 
 		preparedOperation = createQuery(queryMethod, r2dbcQuery, "foo", SqlSort.unsafe(Direction.ASC, "sum(foobar)"));
 		PreparedOperationAssert.assertThat(preparedOperation) //
@@ -636,7 +636,7 @@ void createsQueryWithLimitToFindEntitiesByStringAttribute() throws Exception {
 		PreparedOperationAssert.assertThat(preparedOperation) //
 				.selects(ALL_FIELDS_ARRAY_PREFIXED) //
 				.from(TABLE) //
-				.where(TABLE + ".first_name = $1 LIMIT 3");
+				.where(TABLE + ".\"first_name\" = $1 LIMIT 3");
 	}
 
 	@Test // GH-282
@@ -650,7 +650,7 @@ void createsQueryToFindFirstEntityByStringAttribute() throws Exception {
 		PreparedOperationAssert.assertThat(preparedOperation) //
 				.selects(ALL_FIELDS_ARRAY_PREFIXED) //
 				.from(TABLE) //
-				.where(TABLE + ".first_name = $1 LIMIT 1");
+				.where(TABLE + ".\"first_name\" = $1 LIMIT 1");
 	}
 
 	@Test // GH-341
@@ -664,7 +664,7 @@ void createsQueryToDeleteByFirstName() throws Exception {
 		PreparedOperationAssert.assertThat(preparedOperation) //
 				.deletes() //
 				.from(TABLE) //
-				.where(TABLE + ".first_name = $1");
+				.where(TABLE + ".\"first_name\" = $1");
 	}
 
 	@Test // GH-344
@@ -675,7 +675,7 @@ void createsQueryToFindAllEntitiesByStringAttributeWithDistinct() throws Excepti
 		PreparedOperation<?> preparedOperation = createQuery(queryMethod, r2dbcQuery, "John");
 
 		PreparedOperationAssert.assertThat(preparedOperation) //
-				.selectsDistinct(TABLE + ".first_name", TABLE + ".foo") //
+				.selectsDistinct(TABLE + ".\"first_name\"", TABLE + ".\"foo\"") //
 				.from(TABLE);
 
 	}
@@ -688,7 +688,7 @@ void createsQueryToFindByOpenProjection() throws Exception {
 		PreparedOperation<?> preparedOperation = createQuery(queryMethod, r2dbcQuery);
 
 		PreparedOperationAssert.assertThat(preparedOperation) //
-				.selects("users.id", "users.first_name", "users.last_name", "users.date_of_birth", "users.age", "users.active") //
+				.selects("\"users\".\"id\"", "\"users\".\"first_name\"", "\"users\".\"last_name\"", "\"users\".\"date_of_birth\"", "\"users\".\"age\"", "\"users\".\"active\"") //
 				.from(TABLE);
 	}
 
@@ -701,7 +701,7 @@ void createsDtoProjectionQuery() throws Exception {
 		PreparedOperation<?> preparedOperation = createQuery(queryMethod, r2dbcQuery, 42);
 
 		PreparedOperationAssert.assertThat(preparedOperation) //
-				.selects("users.id", "users.first_name", "users.last_name", "users.date_of_birth", "users.age", "users.active") //
+				.selects("\"users\".\"id\"", "\"users\".\"first_name\"", "\"users\".\"last_name\"", "\"users\".\"date_of_birth\"", "\"users\".\"age\"", "\"users\".\"active\"") //
 				.from(TABLE);
 	}
 
@@ -713,9 +713,9 @@ void createsQueryForCountProjection() throws Exception {
 		PreparedOperation<?> query = createQuery(queryMethod, r2dbcQuery, "John");
 
 		PreparedOperationAssert.assertThat(query) //
-				.selects("COUNT(users.id)") //
+				.selects("COUNT(\"users\".\"id\")") //
 				.from(TABLE) //
-				.where(TABLE + ".first_name = $1");
+				.where(TABLE + ".\"first_name\" = $1");
 	}
 
 	@Test // GH-1041
@@ -730,9 +730,9 @@ void createQueryWithPessimisticWriteLock() throws Exception {
 		PreparedOperation<?> query = createQuery(queryMethod, r2dbcQuery, firstname, lastname);
 
 		PreparedOperationAssert.assertThat(query) //
-				.selects("users.id", "users.first_name", "users.last_name", "users.date_of_birth", "users.age", "users.active") //
+				.selects("\"users\".\"id\"", "\"users\".\"first_name\"", "\"users\".\"last_name\"", "\"users\".\"date_of_birth\"", "\"users\".\"age\"", "\"users\".\"active\"") //
 				.from(TABLE) //
-				.where("users.first_name = $1 AND (users.last_name = $2) FOR UPDATE OF users");
+				.where("\"users\".\"first_name\" = $1 AND (\"users\".\"last_name\" = $2) FOR UPDATE OF \"users\"");
 	}
 
 	@Test // GH-1041
@@ -747,9 +747,9 @@ void createQueryWithPessimisticReadLock() throws Exception {
 		PreparedOperation<?> query = createQuery(queryMethod, r2dbcQuery, firstname, age);
 
 		PreparedOperationAssert.assertThat(query) //
-				.selects("users.id", "users.first_name", "users.last_name", "users.date_of_birth", "users.age", "users.active") //
+				.selects("\"users\".\"id\"", "\"users\".\"first_name\"", "\"users\".\"last_name\"", "\"users\".\"date_of_birth\"", "\"users\".\"age\"", "\"users\".\"active\"") //
 				.from(TABLE) //
-				.where("users.first_name = $1 AND (users.age = $2) FOR SHARE OF users");
+				.where("\"users\".\"first_name\" = $1 AND (\"users\".\"age\" = $2) FOR SHARE OF \"users\"");
 	}
 
 	@Test // GH-1285
@@ -776,7 +776,7 @@ void createsQueryWithoutIdForCountProjection() throws Exception {
 		PreparedOperationAssert.assertThat(query) //
 				.selects("COUNT(1)") //
 				.from(TABLE) //
-				.where(TABLE + ".first_name = $1");
+				.where(TABLE + ".\"first_name\" = $1");
 	}
 
 	@Test // GH-1310
@@ -789,7 +789,7 @@ void createsQueryWithoutIdForExistsProjection() throws Exception {
 		PreparedOperationAssert.assertThat(query) //
 				.selects("1") //
 				.from(TABLE) //
-				.where(TABLE + ".first_name = $1 LIMIT 1");
+				.where(TABLE + ".\"first_name\" = $1 LIMIT 1");
 	}
 
 	private PreparedOperation<?> createQuery(R2dbcQueryMethod queryMethod, PartTreeR2dbcQuery r2dbcQuery,
diff --git a/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryMethodUnitTests.java b/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryMethodUnitTests.java
index b15c9b8d36..1f85e77e28 100644
--- a/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryMethodUnitTests.java
+++ b/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryMethodUnitTests.java
@@ -67,7 +67,7 @@ void detectsCollectionFromReturnTypeIfReturnTypeAssignable() throws Exception {
 		RelationalEntityMetadata<?> metadata = queryMethod.getEntityInformation();
 
 		assertThat(metadata.getJavaType()).isAssignableFrom(Contact.class);
-		assertThat(metadata.getTableName()).isEqualTo(SqlIdentifier.unquoted("contact"));
+		assertThat(metadata.getTableName()).isEqualTo(SqlIdentifier.unquoted("\"CONTACT\""));
 	}
 
 	@Test // gh-235
diff --git a/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/repository/support/SqlInspectingR2dbcRepositoryUnitTests.java b/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/repository/support/SqlInspectingR2dbcRepositoryUnitTests.java
index 4e2a430e9f..bafc56dbb0 100644
--- a/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/repository/support/SqlInspectingR2dbcRepositoryUnitTests.java
+++ b/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/repository/support/SqlInspectingR2dbcRepositoryUnitTests.java
@@ -77,7 +77,7 @@ public void replacesSpelExpressionInQuery() {
 
 		StatementRecorder.RecordedStatement statement = recorder.getCreatedStatement(SqlInspectingR2dbcRepositoryUnitTests::isSelect);
 
-		assertThat(statement.getSql()).isEqualTo("select * from PERSONx");
+		assertThat(statement.getSql()).isEqualTo("select * from \"PERSON\"x");
 	}
 
 	private static boolean isSelect(String sql) {
diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/DerivedSqlIdentifier.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/DerivedSqlIdentifier.java
index 945793f8fa..477c962a46 100644
--- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/DerivedSqlIdentifier.java
+++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/DerivedSqlIdentifier.java
@@ -45,6 +45,7 @@ class DerivedSqlIdentifier implements SqlIdentifier {
 		this.name = name;
 		this.quoted = quoted;
 		this.toString = quoted ? toSql(IdentifierProcessing.ANSI) : this.name;
+		this.sqlName = null;
 	}
 
 	@Override

From 3f4fb62536d627caf01e514460b7f28724f2bfb8 Mon Sep 17 00:00:00 2001
From: shenfeng <shenfeng197@gmail.com>
Date: Wed, 30 Apr 2025 13:07:19 +0800
Subject: [PATCH 2/2] fix test

---
 .../data/r2dbc/core/ReactiveInsertOperationUnitTests.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/ReactiveInsertOperationUnitTests.java b/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/ReactiveInsertOperationUnitTests.java
index 22d1c9bc3f..1e3abff795 100644
--- a/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/ReactiveInsertOperationUnitTests.java
+++ b/spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/ReactiveInsertOperationUnitTests.java
@@ -109,7 +109,7 @@ void shouldUpdateInTable() {
 
 		StatementRecorder.RecordedStatement statement = recorder.getCreatedStatement(s -> s.startsWith("INSERT"));
 
-		assertThat(statement.getSql()).isEqualTo("INSERT INTO the_table (\"THE_NAME\") VALUES ($1)");
+		assertThat(statement.getSql()).isEqualTo("INSERT INTO \"the_table\" (\"THE_NAME\") VALUES ($1)");
 	}
 
 	static class Person {