v1.3.6: fix bug

mizuki1412 · Apr 2, 2022 · 84cac73 · 84cac73
1 parent bf9d09f
commit 84cac73
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/service/sqlkit/pghelper/common_sql.go b/service/sqlkit/pghelper/common_sql.go
@@ -9,7 +9,6 @@ import (
 
 func CheckSchemaExist(schema string) bool {
 	dao := &sqlkit.Dao[any]{}
-	dao.NewHelper("")
 	rows := dao.Query(fmt.Sprintf("SELECT EXISTS(SELECT 1 FROM pg_namespace WHERE nspname = '%s')", schema))
 	defer rows.Close()
 	for rows.Next() {

diff --git a/service/sqlkit/sql.go b/service/sqlkit/sql.go
@@ -398,8 +398,10 @@ func (dao *Dao[T]) ScanList(sql string, args []any) []*T {
 		}
 		list = append(list, m)
 	}
-	for i := range list {
-		dao.Cascade(list[i])
+	if dao.Cascade != nil {
+		for i := range list {
+			dao.Cascade(list[i])
+		}
 	}
 	return list
 }
@@ -413,7 +415,9 @@ func (dao *Dao[T]) ScanOne(sql string, args []any) *T {
 		if err != nil {
 			panic(exception.New(err.Error()))
 		}
-		dao.Cascade(m)
+		if dao.Cascade != nil {
+			dao.Cascade(m)
+		}
 		return m
 	}
 	return nil