This is an automated email from the ASF dual-hosted git repository.

panjuan 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 b32f9602637 Rename constrains to constraints in TableMetaData (#25240)
b32f9602637 is described below

commit b32f9602637588098877098c13104d9f9cec2c66
Author: Zhengqiang Duan <[email protected]>
AuthorDate: Wed Apr 19 22:10:21 2023 +0800

    Rename constrains to constraints in TableMetaData (#25240)
---
 .../infra/metadata/database/schema/builder/GenericSchemaBuilder.java  | 2 +-
 .../infra/metadata/database/schema/loader/model/TableMetaData.java    | 2 +-
 .../database/schema/reviser/table/TableMetaDataReviseEngine.java      | 2 +-
 .../loader/metadata/dialect/PostgreSQLSchemaMetaDataLoaderTest.java   | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilder.java
 
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilder.java
index 3addcc1074b..ca171f9551d 100644
--- 
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilder.java
+++ 
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilder.java
@@ -140,7 +140,7 @@ public final class GenericSchemaBuilder {
         for (TableMetaData each : tableMetaDataList) {
             Collection<ShardingSphereColumn> columns = 
convertToColumns(each.getColumns());
             Collection<ShardingSphereIndex> indexes = 
convertToIndexes(each.getIndexes());
-            Collection<ShardingSphereConstraint> constraints = 
convertToConstraints(each.getConstrains());
+            Collection<ShardingSphereConstraint> constraints = 
convertToConstraints(each.getConstraints());
             result.put(each.getName(), new ShardingSphereTable(each.getName(), 
columns, indexes, constraints));
         }
         return result;
diff --git 
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/model/TableMetaData.java
 
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/model/TableMetaData.java
index 7806fd9c320..bada8a81c7d 100644
--- 
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/model/TableMetaData.java
+++ 
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/model/TableMetaData.java
@@ -39,5 +39,5 @@ public final class TableMetaData {
     
     private final Collection<IndexMetaData> indexes;
     
-    private final Collection<ConstraintMetaData> constrains;
+    private final Collection<ConstraintMetaData> constraints;
 }
diff --git 
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/table/TableMetaDataReviseEngine.java
 
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/table/TableMetaDataReviseEngine.java
index f71bab347f0..730f0fe265e 100644
--- 
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/table/TableMetaDataReviseEngine.java
+++ 
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/table/TableMetaDataReviseEngine.java
@@ -56,6 +56,6 @@ public final class TableMetaDataReviseEngine<T extends 
ShardingSphereRule> {
         String revisedTableName = tableNameReviser.map(optional -> 
optional.revise(originalMetaData.getName(), 
rule)).orElse(originalMetaData.getName());
         return new TableMetaData(revisedTableName, new 
ColumnReviseEngine<>(rule, databaseType, dataSource, 
reviseEntry).revise(originalMetaData.getName(), originalMetaData.getColumns()),
                 new IndexReviseEngine<>(rule, 
reviseEntry).revise(originalMetaData.getName(), originalMetaData.getIndexes()),
-                new ConstraintReviseEngine<>(rule, 
reviseEntry).revise(originalMetaData.getName(), 
originalMetaData.getConstrains()));
+                new ConstraintReviseEngine<>(rule, 
reviseEntry).revise(originalMetaData.getName(), 
originalMetaData.getConstraints()));
     }
 }
diff --git 
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/PostgreSQLSchemaMetaDataLoaderTest.java
 
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/PostgreSQLSchemaMetaDataLoaderTest.java
index bb249893309..23a2827c2a4 100644
--- 
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/PostgreSQLSchemaMetaDataLoaderTest.java
+++ 
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/PostgreSQLSchemaMetaDataLoaderTest.java
@@ -189,8 +189,8 @@ class PostgreSQLSchemaMetaDataLoaderTest {
         assertThat(actualTableMetaData.getIndexes().size(), is(1));
         Iterator<IndexMetaData> indexesIterator = 
actualTableMetaData.getIndexes().iterator();
         assertThat(indexesIterator.next(), is(new IndexMetaData("id")));
-        assertThat(actualTableMetaData.getConstrains().size(), is(1));
-        Iterator<ConstraintMetaData> constrainsIterator = 
actualTableMetaData.getConstrains().iterator();
+        assertThat(actualTableMetaData.getConstraints().size(), is(1));
+        Iterator<ConstraintMetaData> constrainsIterator = 
actualTableMetaData.getConstraints().iterator();
         assertThat(constrainsIterator.next(), is(new 
ConstraintMetaData("tbl_con", "refer_tbl")));
     }
 }

Reply via email to