Improved database model migration and added indexing (#2655)

database/db.go

@@ -26,20 +26,35 @@ const (
 )
 
 func initModels() error {
-	models := []interface{}{
+	// Order matters: first create tables without dependencies
+	baseModels := []interface{}{
 		&model.User{},
-		&model.Inbound{},
-		&model.OutboundTraffics{},
 		&model.Setting{},
-		&model.InboundClientIps{},
-		&xray.ClientTraffic{},
 	}
-	for _, model := range models {
+
+	// Migrate base models
+	for _, model := range baseModels {
 		if err := db.AutoMigrate(model); err != nil {
-			log.Printf("Error auto migrating model: %v", err)
+			log.Printf("Error auto migrating base model: %v", err)
 			return err
 		}
 	}
+
+	// Then migrate models with dependencies
+	dependentModels := []interface{}{
+		&model.Inbound{},
+		&model.OutboundTraffics{},
+		&model.InboundClientIps{},
+		&xray.ClientTraffic{},
+	}
+
+	for _, model := range dependentModels {
+		if err := db.AutoMigrate(model); err != nil {
+			log.Printf("Error auto migrating dependent model: %v", err)
+			return err
+		}
+	}
+
 	return nil
 }
 

database/model/model.go

@@ -29,14 +29,14 @@ type User struct {
 
 type Inbound struct {
 	Id          int                  `json:"id" form:"id" gorm:"primaryKey;autoIncrement"`
-	UserId      int                  `json:"-"`
+	UserId      int                  `json:"-" gorm:"index"`
 	Up          int64                `json:"up" form:"up"`
 	Down        int64                `json:"down" form:"down"`
 	Total       int64                `json:"total" form:"total"`
 	Remark      string               `json:"remark" form:"remark"`
 	Enable      bool                 `json:"enable" form:"enable"`
 	ExpiryTime  int64                `json:"expiryTime" form:"expiryTime"`
-	ClientStats []xray.ClientTraffic `gorm:"foreignKey:InboundId;references:Id" json:"clientStats" form:"clientStats"`
+	ClientStats []xray.ClientTraffic `gorm:"foreignKey:InboundId;references:Id;constraint:OnDelete:CASCADE" json:"clientStats"`
 
 	// config part
 	Listen         string   `json:"listen" form:"listen"`

install.sh

@@ -283,4 +283,4 @@ install_x-ui() {
 
 echo -e "${green}Running...${plain}"
 install_base
-install_x-ui $1
+install_x-ui $1

x-ui.sh

@@ -1912,4 +1912,4 @@ if [[ $# > 0 ]]; then
     esac
 else
     show_menu
-fi
+fi

xray/client_traffic.go

@@ -2,9 +2,9 @@ package xray
 
 type ClientTraffic struct {
 	Id         int    `json:"id" form:"id" gorm:"primaryKey;autoIncrement"`
-	InboundId  int    `json:"inboundId" form:"inboundId"`
+	InboundId  int    `json:"inboundId" form:"inboundId" gorm:"index;not null"`
 	Enable     bool   `json:"enable" form:"enable"`
-	Email      string `json:"email" form:"email" gorm:"unique"`
+	Email      string `json:"email" form:"email" gorm:"uniqueIndex"`
 	Up         int64  `json:"up" form:"up"`
 	Down       int64  `json:"down" form:"down"`
 	ExpiryTime int64  `json:"expiryTime" form:"expiryTime"`