diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/SqlGenerator.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/SqlGenerator.java
index f5c7241f..e789e53b 100644
--- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/SqlGenerator.java
+++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/SqlGenerator.java
@@ -659,17 +659,19 @@ class SqlGenerator {
 	}
 
 	private List<OrderByField> extractOrderByFields(Sort sort) {
-		return sort.stream()
-				.map(order -> {
-					Column column = Column.create(
-						this.entity.getRequiredPersistentProperty(order.getProperty()).getColumnName(),
-						this.getTable()
-					);
-					return OrderByField.from(column, order.getDirection());
-				})
+
+		return sort.stream() //
+				.map(this::orderToOrderByField) //
 				.collect(Collectors.toList());
 	}
 
+	private OrderByField orderToOrderByField(Sort.Order order) {
+
+		SqlIdentifier columnName = this.entity.getRequiredPersistentProperty(order.getProperty()).getColumnName();
+		Column column = Column.create(columnName, this.getTable());
+		return OrderByField.from(column, order.getDirection());
+	}
+
 	/**
 	 * Value object representing a {@code JOIN} association.
 	 */