This is an automated email from the ASF dual-hosted git repository.
tuichenchuxin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new b6440944649 Refactor ColumnDataTypeReviser (#24054)
b6440944649 is described below
commit b64409446499b0ff80e409d25e2f788afa3b9fd7
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Feb 8 10:53:24 2023 +0800
Refactor ColumnDataTypeReviser (#24054)
---
.../schema/decorator/reviser/column/ColumnDataTypeReviser.java | 7 ++++---
.../schema/decorator/reviser/column/ColumnReviseEngine.java | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/column/ColumnDataTypeReviser.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/column/ColumnDataTypeReviser.java
index 70060c2e0b3..5489b103057 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/column/ColumnDataTypeReviser.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/column/ColumnDataTypeReviser.java
@@ -26,19 +26,20 @@ import java.util.Optional;
/**
* Column data type reviser.
- *
+ *
* @param <T> type of rule
*/
public interface ColumnDataTypeReviser<T extends ShardingSphereRule> extends
TypedSPI {
/**
* Revise column data type.
- *
+ *
* @param originalName original name
+ * @param tableName table name
* @param rule rule
* @param databaseType database type
* @param dataSource data source
* @return revised data type
*/
- Optional<Integer> revise(String originalName, T rule, DatabaseType
databaseType, DataSource dataSource);
+ Optional<Integer> revise(String originalName, String tableName, T rule,
DatabaseType databaseType, DataSource dataSource);
}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/column/ColumnReviseEngine.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/column/ColumnReviseEngine.java
index 096a736ea0e..545283e55aa 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/column/ColumnReviseEngine.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/column/ColumnReviseEngine.java
@@ -65,7 +65,7 @@ public final class ColumnReviseEngine<T extends
ShardingSphereRule> {
continue;
}
@SuppressWarnings("unchecked")
- Optional<Integer> dataType = dataTypeReviser.isPresent() ?
dataTypeReviser.get().revise(each.getName(), rule, databaseType, dataSource) :
Optional.empty();
+ Optional<Integer> dataType = dataTypeReviser.isPresent() ?
dataTypeReviser.get().revise(each.getName(), tableName, rule, databaseType,
dataSource) : Optional.empty();
@SuppressWarnings("unchecked")
Optional<Boolean> generated = generatedReviser.map(optional ->
optional.revise(each, rule));
result.add(new ColumnMetaData(name.get(),