table use ptr

Author: folospace

README.md

@@ -8,7 +8,6 @@ import (
 )
 
 
-
 //connect mysql db
 var db, _ = orm.OpenMysql("user:password@tcp(127.0.0.1:3306)/mydb?parseTime=true&charset=utf8mb4&loc=Asia%2FShanghai")
 
@@ -20,17 +19,17 @@ type User struct {
     Name string `json:"name"`
 }
 
-func (User) Connections() []*sql.DB {
+func (*User) Connections() []*sql.DB {
     return []*sql.DB{db}
 }
-func (User) DatabaseName() string {
+func (*User) DatabaseName() string {
     return "mydb"
 }
-func (User) TableName() string {
+func (*User) TableName() string {
     return "user"
 }
-func (u *User) Query() *orm.Query[User] {
-    return orm.NewQuery(u)
+func (u *User) Query() *orm.Query[*User] {
+    return orm.NewQuery(UserTable).WherePrimaryIfNotZero(u.Id)
 }
 
 func main() {
@@ -40,27 +39,33 @@ func main() {
     //create struct from db table
     UserTable.Query().CreateStruct() 
 
-    //select * from user where id in (1,2,3)
-    users, query = UserTable.Query().Gets(1, 2, 3)
+    //insert one user
+    UserTable.Query().Insert(&User{Name:"john"})
+    
+    //get user id = 1
+    user, _ := UserTable.Query().Get(1)
+    
+    //update user name
+    user.Query().Update(&UserTable.Name, "john 2")
 }
 ```
 
 ## select
 
 ```go
-    //get first user (name='join') as struct
-    user, query := UserTable.Query().Where(&UserTable.Name, "john").Get()
+    //get users where name='join'
+    users, _ := UserTable.Query().Where(&UserTable.Name, "john").Gets()
 
     //get users count(*)
-    count, query := UserTable.Query().GetCount()
+    count, _ := UserTable.Query().GetCount()
 
     //get user names map key by id
     var userNameKeyById map[int]string
     UserTable.Query().Select(&UserTable.Id, &UserTable.Name).GetTo(&userNameKeyById)
 
     //get users map key by name
     //useful when find has-many relations
-    var usersMapkeyByName map[string][]User
+    var usersMapkeyByName map[string][]*User
     UserTable.Query().Select(&UserTable.Name, UserTable).GetTo(&usersMapkeyByName)
 
 ```
@@ -69,21 +74,21 @@ func main() {
 
 ```go
     //update user set name="hello" where id = 1
-    UserTable.Query().WherePrimary(1).Update(&UserTable.Name, "hello")
+    UserTable.Query().WherePrimary(1).Update(&UserTable.Name, "john 2")
 
     //query delete
     UserTable.Query().Delete(1, 2, 3)
 
     //query insert
-    _ = UserTable.Query().Insert(User{Name: "han"}).LastInsertId //insert one row and get id
+    _ = UserTable.Query().Insert(&User{Name: "han"}).LastInsertId //insert one row and get id
 
 ```
 
 ### join
 
 ```go
     //query join 
-    UserTable.Query().Join(OrderTable, func (query *orm.Query[User]) *orm.Query[User] {
+    UserTable.Query().Join(OrderTable, func (query *orm.Query[*User]) *orm.Query[*User] {
             return query.Where(&UserTable.Id, &OrderTable.UserId)
     }).Select(UserTable).Gets()
 ```
@@ -92,8 +97,8 @@ func main() {
 
 ```go
     //transaction
-    _ = UserTable.Query().Transaction(func (query *orm.Query[User]) error {
-        newId := query.Insert(User{Name: "john"}).LastInsertId //insert
+    _ = UserTable.Query().Transaction(func (query *orm.Query[*User]) error {
+        newId := query.Insert(&User{Name: "john"}).LastInsertId //insert
         //newId := orm.NewQuery(UserTable).UseTx(query.Tx()).Insert(User{Name: "john"}).LastInsertId
         fmt.Println(newId)
         return errors.New("I want rollback") //rollback
@@ -110,11 +115,11 @@ func main() {
     UserTable.Query().Where(&UserTable.Id, orm.WhereIn, subquery).Gets()
 
     //insert subquery
-    UserTable.Query().InsertSubquery(subquery, nil)
+    UserTable.Query().InsertSubquery(subquery)
 
     //join subquery
-    UserTable.Query().Join(subquery, func (query *orm.Query[User]) *orm.Query[User] {
+    UserTable.Query().Join(subquery, func (query *orm.Query[*User]) *orm.Query[*User] {
         return query.Where(&UserTable.Id, orm.Raw("sub.id"))
     }).Gets()
 
-```
+```

orm/create_struct.go

@@ -20,7 +20,7 @@ var findNotNullRegex = regexp.MustCompile("(.+) NOT NULL")
 var findNullRegex = regexp.MustCompile("(.+) NULL")
 
 func (q *Query[T]) CreateStruct(file ...string) error {
-    table := q.TableInterface()
+    table := q.tableInterface()
     dbColumns, err := getTableDbColumns(q)
     if err != nil {
         return err
@@ -139,7 +139,7 @@ func getStructFieldTypeStringByDBType(dbType string) string {
 }
 
 func getSqlSegments[T Table](query *Query[T]) ([]string, error) {
-    table := query.TableInterface()
+    table := query.tableInterface()
     var res map[string]string
 
     err := query.Raw("show create table " + "`" + table.TableName() + "`").GetTo(&res).Err

orm/create_table.go

@@ -63,8 +63,9 @@ func (q *Query[T]) CreateTable() (string, error) {
         extraStrs := getTableNewColumns(originColumnStrs, dbColumnStrs)
         retSql := ""
         var err error
+
         for _, v := range extraStrs {
-            tempSql := "ALTER TABLE " + "`" + q.TableInterface().TableName() + "`" + " ADD " + v
+            tempSql := "ALTER TABLE " + "`" + q.tableInterface().TableName() + "`" + " ADD " + v
 
             retSql += tempSql + "\n"
             _, err = db.Exec(tempSql)
@@ -98,12 +99,18 @@ func getTableNewColumns(origin, current []string) []string {
     }
 
     var ret []string
+    var preCol string
     for _, v := range current {
         if strings.HasPrefix(v, "`") {
             tempStrs := strings.SplitN(v, " ", 2)
             if exist[strings.ToLower(tempStrs[0])] == false {
-                ret = append(ret, v)
+                if preCol != "" {
+                    ret = append(ret, v+" after "+preCol)
+                } else {
+                    ret = append(ret, v)
+                }
             }
+            preCol = tempStrs[0]
         } else {
             tempStrs := strings.SplitN(v, " (", 2)
             if exist[strings.ToLower(tempStrs[0])] == false {

orm/err.go

@@ -14,5 +14,8 @@ var (
     ErrColumnShouldBeStringOrPtr        = errors.New("select|where column should be string or ptr of Table.T.field")
     ErrDestOfGetToMustBePtr             = errors.New("dest of Get-to must be ptr")
     ErrDestOfGetToSliceElemMustNotBePtr = errors.New("dest of Get-to slice elem kind must not be ptr")
+    ErrDestOfGetToMapElemMustNotBePtr   = errors.New("dest of Get-to map elem kind must not be ptr")
     ErrInsertPtrNotAllowed              = errors.New("insert ptr data not allowed")
+    ErrUpdateWithoutCondition           = errors.New("update without condition not allowed")
+    ErrDeleteWithoutCondition           = errors.New("delete without condition not allowed")
 )