diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/TableServiceImpl.java b/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/TableServiceImpl.java
index 5f953295..d5ba425e 100644
--- a/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/TableServiceImpl.java
+++ b/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/TableServiceImpl.java
@@ -86,7 +86,7 @@ public class TableServiceImpl implements TableService {
 
     @Override
     public ListResult<Sql> buildSql(Table oldTable, Table newTable) {
-        SqlBuilder sqlBuilder = Chat2DBContext.getSqlBuilder(oldTable.getDbType());
+        SqlBuilder sqlBuilder = Chat2DBContext.getSqlBuilder();
         List<Sql> sqls = new ArrayList<>();
         if (oldTable == null) {
             sqls.add(Sql.builder().sql(sqlBuilder.buildCreateTableSql(newTable)).build());
diff --git a/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/sql/Chat2DBContext.java b/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/sql/Chat2DBContext.java
index 41638d0c..de609d45 100644
--- a/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/sql/Chat2DBContext.java
+++ b/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/sql/Chat2DBContext.java
@@ -43,8 +43,8 @@ public class Chat2DBContext {
         return PLUGIN_MAP.get(dbType).getDBConfig().getDefaultDriverConfig();
     }
 
-    public static SqlBuilder getSqlBuilder(String dbType) {
-        return PLUGIN_MAP.get(dbType).getMetaData().getSqlBuilder();
+    public static SqlBuilder getSqlBuilder() {
+        return PLUGIN_MAP.get(getConnectInfo().getDbType()).getMetaData().getSqlBuilder();
     }
 
     /**