(shardingsphere) branch master updated: Refactor PostgreSQLColumnPropertiesAppender (#37124)

[zhangliang]

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

zhangliang 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 9549be32489 Refactor PostgreSQLColumnPropertiesAppender (#37124)
9549be32489 is described below

commit 9549be32489b6ff29bc9dc5296ed532f49eb42a7
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Mon Nov 17 00:33:15 2025 +0800

    Refactor PostgreSQLColumnPropertiesAppender (#37124)
    
    * Add PostgreSQLColumnPropertiesAppenderTest
    
    * Add PostgreSQLColumnPropertiesAppenderTest
    
    * Add PostgreSQLColumnPropertiesAppenderTest
    
    * Add PostgreSQLColumnPropertiesAppenderTest
    
    * Add PostgreSQLColumnPropertiesAppenderTest
    
    * Add PostgreSQLColumnPropertiesAppenderTest
    
    * Add PostgreSQLColumnPropertiesAppenderTest
    
    * Add PostgreSQLColumnPropertiesAppenderTest
    
    * Add PostgreSQLColumnPropertiesAppenderTest
    
    * Add PostgreSQLColumnPropertiesAppenderTest
    
    * Add PostgreSQLColumnPropertiesAppenderTest
    
    * Rename MetaDataPersistFacadeTest
---
 .../column/PostgreSQLColumnPropertiesAppender.java | 22 +++++++---------------
 ...iceTest.java => MetaDataPersistFacadeTest.java} |  2 +-
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git 
a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/ddl/column/PostgreSQLColumnPropertiesAppender.java
 
b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/ddl/column/PostgreSQLColumnPropertiesAppender.java
index 3aee9a8bc5d..2b7e74688f6 100644
--- 
a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/ddl/column/PostgreSQLColumnPropertiesAppender.java
+++ 
b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/ddl/column/PostgreSQLColumnPropertiesAppender.java
@@ -117,14 +117,9 @@ public final class PostgreSQLColumnPropertiesAppender {
         return result;
     }
     
-    @SuppressWarnings("unchecked")
     private String getInheritedFromTableOrType(final Map<String, Object> 
context) {
         String result = "inheritedfrom";
-        if (null != context.get("typoid")) {
-            result += "type";
-        } else if (null != context.get("coll_inherits") && 
!((Collection<String>) context.get("coll_inherits")).isEmpty()) {
-            result += "table";
-        }
+        result += null == context.get("typoid") ? "table" : "type";
         return result;
     }
     
@@ -308,16 +303,13 @@ public final class PostgreSQLColumnPropertiesAppender {
         if (idx > 0 && result.endsWith(")")) {
             result = result.substring(0, idx);
         } else if (idx > 0 && result.startsWith("time")) {
-            int endIdx = result.indexOf(')');
-            if (1 != endIdx) {
-                Matcher matcher = BRACKETS_PATTERN.matcher(result);
-                StringBuffer buffer = new StringBuffer();
-                while (matcher.find()) {
-                    matcher.appendReplacement(buffer, "");
-                }
-                matcher.appendTail(buffer);
-                result = buffer.toString();
+            Matcher matcher = BRACKETS_PATTERN.matcher(result);
+            StringBuffer buffer = new StringBuffer();
+            while (matcher.find()) {
+                matcher.appendReplacement(buffer, "");
             }
+            matcher.appendTail(buffer);
+            result = buffer.toString();
         } else if (result.startsWith("interval")) {
             result = "interval";
         }
diff --git 
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
 
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistFacadeTest.java
similarity index 99%
rename from 
mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
rename to 
mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistFacadeTest.java
index 3f204e3f092..f509dcd08f0 100644
--- 
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
+++ 
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistFacadeTest.java
@@ -59,7 +59,7 @@ import static org.mockito.Mockito.when;
 
 @ExtendWith(AutoMockExtension.class)
 @StaticMockSettings({TypedSPILoader.class, 
DataSourcePoolPropertiesCreator.class, GenericSchemaManager.class})
-class MetaDataPersistServiceTest {
+class MetaDataPersistFacadeTest {
     
     @Mock
     private DataSourceUnitPersistService dataSourceUnitService;