Add SpEL support for @Table(schema=…).

Add SpEL support for schema property in `@Table` annotation See #1325 Original pull request: #1461
spring-projects · May 31, 2023 · a73be5a · a73be5a
1 parent 549b807
commit a73be5a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/...ava/org/springframework/data/relational/core/mapping/BasicRelationalPersistentEntity.java b/...ava/org/springframework/data/relational/core/mapping/BasicRelationalPersistentEntity.java
@@ -47,6 +47,7 @@ class BasicRelationalPersistentEntity<T> extends BasicPersistentEntity<T, Relati
 	private final @Nullable Expression tableNameExpression;
 
 	private final Lazy<Optional<SqlIdentifier>> schemaName;
+	private final @Nullable Expression schemaNameExpression;
 	private final ExpressionEvaluator expressionEvaluator;
 	private boolean forceQuote = true;
 
@@ -77,12 +78,14 @@ class BasicRelationalPersistentEntity<T> extends BasicPersistentEntity<T, Relati
 			this.schemaName = StringUtils.hasText(table.schema())
 					? Lazy.of(() -> Optional.of(createSqlIdentifier(table.schema())))
 					: defaultSchema;
+			this.schemaNameExpression = detectExpression(table.schema());
 
 		} else {
 
 			this.tableName = Lazy.of(() -> createDerivedSqlIdentifier(namingStrategy.getTableName(getType())));
 			this.tableNameExpression = null;
 			this.schemaName = defaultSchema;
+			this.schemaNameExpression = null;
 		}
 	}
 
@@ -144,6 +147,10 @@ public SqlIdentifier getQualifiedTableName() {
 			return getTableName();
 		}
 
+		if (schemaNameExpression != null) {
+			schema = createSqlIdentifier(expressionEvaluator.evaluate(schemaNameExpression));
+		}
+
 		return SqlIdentifier.from(schema, getTableName());
 	}
 

diff --git a/...pringframework/data/relational/core/mapping/BasicRelationalPersistentEntityUnitTests.java b/...pringframework/data/relational/core/mapping/BasicRelationalPersistentEntityUnitTests.java
@@ -126,7 +126,7 @@ void testRelationalPersistentEntitySpelExpression_Sanitized() {
 		RelationalPersistentEntity<?> entity = mappingContext.getRequiredPersistentEntity(LittleBobbyTables.class);
 
 		SqlIdentifier simpleExpected = quoted("RobertDROPTABLEstudents");
-		SqlIdentifier expected = SqlIdentifier.from(quoted("LITTLE_BOBBY_TABLES"), simpleExpected);
+		SqlIdentifier expected = SqlIdentifier.from(quoted("RandomSQLToExecute"), simpleExpected);
 		assertThat(entity.getQualifiedTableName()).isEqualTo(expected);
 		assertThat(entity.getTableName()).isEqualTo(simpleExpected);
 	}
@@ -175,18 +175,24 @@ private static class EntityWithSchemaAndName {
 		@Id private Long id;
 	}
 
-	@Table(schema = "HELP_ME_OBI_WON", name = "#{T(org.springframework.data.relational.core.mapping."
-			+ "BasicRelationalPersistentEntityUnitTests$EntityWithSchemaAndTableSpelExpression" + ").desiredTableName}")
+	@Table(schema = "#{T(org.springframework.data.relational.core.mapping."
+			+ "BasicRelationalPersistentEntityUnitTests$EntityWithSchemaAndTableSpelExpression).desiredSchemaName}",
+			name = "#{T(org.springframework.data.relational.core.mapping."
+					+ "BasicRelationalPersistentEntityUnitTests$EntityWithSchemaAndTableSpelExpression).desiredTableName}")
 	private static class EntityWithSchemaAndTableSpelExpression {
 		@Id private Long id;
 		public static String desiredTableName = "USE_THE_FORCE";
+		public static String desiredSchemaName = "HELP_ME_OBI_WON";
 	}
 
-	@Table(schema = "LITTLE_BOBBY_TABLES", name = "#{T(org.springframework.data.relational.core.mapping."
-			+ "BasicRelationalPersistentEntityUnitTests$LittleBobbyTables" + ").desiredTableName}")
+	@Table(schema = "#{T(org.springframework.data.relational.core.mapping."
+			+ "BasicRelationalPersistentEntityUnitTests$LittleBobbyTables).desiredSchemaName}",
+			name = "#{T(org.springframework.data.relational.core.mapping."
+			+ "BasicRelationalPersistentEntityUnitTests$LittleBobbyTables).desiredTableName}")
 	private static class LittleBobbyTables {
 		@Id private Long id;
 		public static String desiredTableName = "Robert'); DROP TABLE students;--";
+		public static String desiredSchemaName = "Random SQL To Execute;";
 	}
 
 	@Table("dummy_sub_entity")