fix: belongs to support omit ref.*
This commit is contained in:
		
							parent
							
								
									0c968b24a8
								
							
						
					
					
						commit
						c5f7c4c264
					
				@ -348,6 +348,10 @@ func saveAssociations(db *gorm.DB, rel *schema.Relationship, values interface{},
 | 
				
			|||||||
		refName        = rel.Name + "."
 | 
							refName        = rel.Name + "."
 | 
				
			||||||
	)
 | 
						)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						if _, ok := selectColumns[rel.Name+".*"]; ok {
 | 
				
			||||||
 | 
							return nil
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	for name, ok := range selectColumns {
 | 
						for name, ok := range selectColumns {
 | 
				
			||||||
		columnName := ""
 | 
							columnName := ""
 | 
				
			||||||
		if strings.HasPrefix(name, refName) {
 | 
							if strings.HasPrefix(name, refName) {
 | 
				
			||||||
 | 
				
			|||||||
@ -674,7 +674,6 @@ func (stmt *Statement) SelectAndOmitColumns(requireCreate, requireUpdate bool) (
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	// omit columns
 | 
						// omit columns
 | 
				
			||||||
	for _, omit := range stmt.Omits {
 | 
						for _, omit := range stmt.Omits {
 | 
				
			||||||
		omit = strings.TrimSuffix(omit, ".*")
 | 
					 | 
				
			||||||
		if stmt.Schema == nil {
 | 
							if stmt.Schema == nil {
 | 
				
			||||||
			results[omit] = false
 | 
								results[omit] = false
 | 
				
			||||||
		} else if omit == "*" {
 | 
							} else if omit == "*" {
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user