From 3501225503754583511a6d41ae254e70e078336b Mon Sep 17 00:00:00 2001
From: inrgihc <inrgihc@126.com>
Date: Wed, 31 Jul 2024 21:57:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=AE=80=E5=8D=95=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dbswitch/common/type/CaseConvertEnum.java | 30 ++++---------------
 .../PostgresMetadataQueryProvider.java        |  7 ++---
 2 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/dbswitch-common/src/main/java/com/gitee/dbswitch/common/type/CaseConvertEnum.java b/dbswitch-common/src/main/java/com/gitee/dbswitch/common/type/CaseConvertEnum.java
index 5ecc933e..188867b5 100644
--- a/dbswitch-common/src/main/java/com/gitee/dbswitch/common/type/CaseConvertEnum.java
+++ b/dbswitch-common/src/main/java/com/gitee/dbswitch/common/type/CaseConvertEnum.java
@@ -9,8 +9,10 @@
 /////////////////////////////////////////////////////////////
 package com.gitee.dbswitch.common.type;
 
+import cn.hutool.core.util.StrUtil;
+
 /**
- * 处理大小写转换的枚举类
+ * 处理名称转换的枚举类
  *
  * @author tang
  */
@@ -30,33 +32,11 @@ public enum CaseConvertEnum {
   /**
    * 驼峰转下划线
    */
-  SNAKE(s -> {
-    StringBuilder snakeCaseString = new StringBuilder(s);
-    for (int i = 1; i < snakeCaseString.length(); i++) {
-      if (Character.isUpperCase(snakeCaseString.charAt(i))) {
-        snakeCaseString.insert(i, '_');
-        i++;
-      }
-    }
-    return snakeCaseString.toString().toLowerCase();
-  }),
+  SNAKE(StrUtil::toUnderlineCase),
   /**
    * 下划线转驼峰
    */
-  CAMEL(s -> {
-    String[] parts = s.split("_");
-    StringBuilder camelCaseString = new StringBuilder();
-    for (int i = 0; i < parts.length; i++) {
-      String part = parts[i];
-      if (i == 0) {
-        camelCaseString.append(part.toLowerCase());  // 第一个单词保持全小写
-      } else {
-        camelCaseString.append(Character.toUpperCase(part.charAt(0)));  // 其他单词首字母大写
-        camelCaseString.append(part.substring(1).toLowerCase());  // 其他部分小写
-      }
-    }
-    return camelCaseString.toString();
-  });
+  CAMEL(StrUtil::toCamelCase);
 
   private Converter function;
 
diff --git a/dbswitch-product/dbswitch-product-postgresql/src/main/java/com/gitee/dbswitch/product/postgresql/PostgresMetadataQueryProvider.java b/dbswitch-product/dbswitch-product-postgresql/src/main/java/com/gitee/dbswitch/product/postgresql/PostgresMetadataQueryProvider.java
index 9c5d55c2..6212c337 100644
--- a/dbswitch-product/dbswitch-product-postgresql/src/main/java/com/gitee/dbswitch/product/postgresql/PostgresMetadataQueryProvider.java
+++ b/dbswitch-product/dbswitch-product-postgresql/src/main/java/com/gitee/dbswitch/product/postgresql/PostgresMetadataQueryProvider.java
@@ -69,8 +69,7 @@ public class PostgresMetadataQueryProvider extends AbstractMetadataProvider {
   @Override
   public List<TableDescription> queryTableList(Connection connection, String schemaName) {
     List<TableDescription> tableList = super.queryTableList(connection, schemaName);
-    Set<String> partitionedTable = getPartitionedTable(connection, schemaName,
-        SHOW_SUB_PARTITIONED_TABLE);
+    Set<String> partitionedTable = getPartitionedTable(connection, schemaName);
     return tableList.stream().filter(t -> !partitionedTable.contains(t.getTableName()))
         .collect(Collectors.toList());
   }
@@ -277,8 +276,8 @@ public class PostgresMetadataQueryProvider extends AbstractMetadataProvider {
     return results;
   }
 
-  protected Set<String> getPartitionedTable(Connection connection, String schemaName, String sql) {
-    String query = String.format(sql, schemaName);
+  protected Set<String> getPartitionedTable(Connection connection, String schemaName) {
+    String query = String.format(SHOW_SUB_PARTITIONED_TABLE, schemaName);
     Set<String> partitionedTable = new HashSet<>();
     try (Statement st = connection.createStatement()) {
       ResultSet resultSet = st.executeQuery(query);