From 725162b0f5d0f538b83340918f642d83d4f22af7 Mon Sep 17 00:00:00 2001
From: Max <shadow.iqka@qq.com>
Date: Thu, 2 Feb 2023 10:05:50 +0800
Subject: [PATCH] [add] migrate model

---
 model/README.md     |  1 -
 model/model.go      |  5 ++++-
 model/model_test.go | 23 ++++++++++++++---------
 3 files changed, 18 insertions(+), 11 deletions(-)
 delete mode 100644 model/README.md

diff --git a/model/README.md b/model/README.md
deleted file mode 100644
index 50d91a62..00000000
--- a/model/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# Model
diff --git a/model/model.go b/model/model.go
index 4faaa683..f0e481b8 100644
--- a/model/model.go
+++ b/model/model.go
@@ -10,7 +10,10 @@ import (
 // Load 加载数据模型
 func Load(cfg config.Config) error {
 	exts := []string{"*.mod.yao", "*.mod.json", "*.mod.jsonc"}
-	return application.App.Walk("apis", func(root, file string, isdir bool) error {
+	return application.App.Walk("models", func(root, file string, isdir bool) error {
+		if isdir {
+			return nil
+		}
 		_, err := model.Load(file, share.ID(root, file))
 		return err
 	}, exts...)
diff --git a/model/model_test.go b/model/model_test.go
index 6ab87283..1f30ddc4 100644
--- a/model/model_test.go
+++ b/model/model_test.go
@@ -7,23 +7,28 @@ import (
 
 	"github.com/yaoapp/gou/model"
 	"github.com/yaoapp/yao/config"
-	"github.com/yaoapp/yao/share"
+	"github.com/yaoapp/yao/test"
 )
 
 func TestLoad(t *testing.T) {
-	share.DBConnect(config.Conf.DB)
+	test.Prepare(t)
+	defer test.Clean()
+
 	Load(config.Conf)
 	check(t)
 }
 
 func check(t *testing.T) {
-	keys := []string{}
-	for key := range model.Models {
-		keys = append(keys, key)
+	ids := map[string]bool{}
+	for id := range model.Models {
+		ids[id] = true
 	}
-	assert.Equal(t, 11, len(keys))
 
-	demo := model.Select("demo")
-	assert.Equal(t, demo.MetaData.Name, "::Demo")
-	assert.Equal(t, demo.Columns["action"].Label, "::Action")
+	assert.True(t, ids["user"])
+	assert.True(t, ids["category"])
+	assert.True(t, ids["tag"])
+	assert.True(t, ids["pet"])
+	assert.True(t, ids["pet.tag"])
+	assert.True(t, ids["user.pet"])
+	assert.True(t, ids["tests.user"])
 }