fix-TableBuilder-schema不自动创建的问题

ximatai · Sep 3, 2024 · 5d62c34 · 5d62c34
1 parent 80c0356
commit 5d62c34
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/my-boot/src/test/java/net/ximatai/muyun/platform/controller/TestController.java b/my-boot/src/test/java/net/ximatai/muyun/platform/controller/TestController.java
@@ -10,6 +10,11 @@
 @Path("/test")
 public class TestController extends Scaffold implements ICURDAbility, ITableCreateAbility {
 
+    @Override
+    public String getSchemaName() {
+        return "test";
+    }
+
     @Override
     public String getMainTable() {
         return "test_table";
@@ -18,7 +23,7 @@ public String getMainTable() {
     @Override
     public TableWrapper fitOutTable() {
         return TableWrapper.withName(getMainTable())
-            .setSchema("public")
+            .setSchema(getSchemaName())
             .setPrimaryKey(Column.ID_POSTGRES)
             .addColumn(Column.of("name").setType("varchar"))
             .addColumn(Column.of("t_create").setDefaultValue("now()"));

diff --git a/my-core/src/main/java/net/ximatai/muyun/ability/IMetadataAbility.java b/my-core/src/main/java/net/ximatai/muyun/ability/IMetadataAbility.java
@@ -6,6 +6,8 @@
 
 public interface IMetadataAbility {
 
+    String getSchemaName();
+
     String getMainTable();
 
     default String getPK() {
@@ -21,11 +23,11 @@ default List<OrderColumn> getOrderColumns() {
     }
 
     default String getSelectOneRowSql() {
-        return "select * from " + getMainTable() + " where " + getPK() + "=:id";
+        return "select * from %s.%s where %s =:id".formatted(getSchemaName(), getMainTable(), getPK());
     }
 
     default String getSelectSql() {
-        return "select * from " + getMainTable();
+        return "select * from %s.%s".formatted(getSchemaName(), getMainTable());
     }
 
 }
diff --git a/my-core/src/main/java/net/ximatai/muyun/ability/curd/std/ISelectAbility.java b/my-core/src/main/java/net/ximatai/muyun/ability/curd/std/ISelectAbility.java
@@ -26,8 +26,7 @@ public interface ISelectAbility extends IDatabaseAbility, IMetadataAbility {
     @GET
     @Path("/view")
     default PageResult view(@QueryParam("page") int page, @QueryParam("limit") int limit, @QueryParam("orderField") String orderField, @QueryParam("orderType") String orderType) {
-
-        DBTable dbTable = getDatabase().getDBInfo().getTables().get(getMainTable());
+        DBTable dbTable = getDatabase().getDBInfo().getSchema(getSchemaName()).getTables().get(getMainTable());
 
         List<OrderColumn> orderColumns = (orderField != null) ? List.of(new OrderColumn(orderField, orderType)) : getOrderColumns();
 

diff --git a/my-database/src/main/java/net/ximatai/muyun/database/metadata/DBInfo.java b/my-database/src/main/java/net/ximatai/muyun/database/metadata/DBInfo.java
@@ -23,7 +23,7 @@ public DBSchema getSchema(String schemaName) {
         return schemas.stream()
             .filter(schema -> schemaName.equals(schema.getName()))
             .findFirst()
-            .orElseThrow(() -> new IllegalArgumentException("Schema not found: " + schemaName));
+            .orElse(null);
     }
 
     public Map<String, DBTable> getTables() {

diff --git a/my-platform/src/main/java/net/ximatai/muyun/platform/controller/ModuleController.java b/my-platform/src/main/java/net/ximatai/muyun/platform/controller/ModuleController.java
@@ -11,6 +11,11 @@ public class ModuleController implements ICURDAbility {
     @Inject
     IDatabaseAccess databaseAccess;
 
+    @Override
+    public String getSchemaName() {
+        return "platform";
+    }
+
     @Override
     public String getMainTable() {
         return "app_module";