Removed a number of logging statements
This commit is contained in:
		
							parent
							
								
									c88df8eb44
								
							
						
					
					
						commit
						f179cddafb
					
				@ -3,7 +3,6 @@ package gorm
 | 
				
			|||||||
import (
 | 
					import (
 | 
				
			||||||
	"database/sql"
 | 
						"database/sql"
 | 
				
			||||||
	"fmt"
 | 
						"fmt"
 | 
				
			||||||
	"log"
 | 
					 | 
				
			||||||
	"reflect"
 | 
						"reflect"
 | 
				
			||||||
	"strings"
 | 
						"strings"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
@ -38,7 +37,6 @@ func Create(scope *Scope) {
 | 
				
			|||||||
							if scope.HasError() {
 | 
												if scope.HasError() {
 | 
				
			||||||
								return
 | 
													return
 | 
				
			||||||
							}
 | 
												}
 | 
				
			||||||
							log.Printf("ID %+v %+v", id, field.Field.Type().String())
 | 
					 | 
				
			||||||
							field.Field.Set(reflect.ValueOf(id).Convert(field.Field.Type()))
 | 
												field.Field.Set(reflect.ValueOf(id).Convert(field.Field.Type()))
 | 
				
			||||||
						}
 | 
											}
 | 
				
			||||||
						if !field.IsBlank || !field.HasDefaultValue {
 | 
											if !field.IsBlank || !field.HasDefaultValue {
 | 
				
			||||||
@ -102,33 +100,15 @@ func Create(scope *Scope) {
 | 
				
			|||||||
				} else if err == nil {
 | 
									} else if err == nil {
 | 
				
			||||||
					scope.db.RowsAffected, _ = results.RowsAffected()
 | 
										scope.db.RowsAffected, _ = results.RowsAffected()
 | 
				
			||||||
				} else {
 | 
									} else {
 | 
				
			||||||
					log.Printf("create err no primary %#v eql %#v", err, err == sql.ErrNoRows)
 | 
					 | 
				
			||||||
					scope.Err(err)
 | 
										scope.Err(err)
 | 
				
			||||||
				}
 | 
									}
 | 
				
			||||||
			} else { // if scope.Dialect().SupportUniquePrimaryKey() {
 | 
								} else {
 | 
				
			||||||
				if err := scope.SqlDB().QueryRow(scope.Sql, scope.SqlVars...).Scan(primaryField.Field.Addr().Interface()); err == nil || err == sql.ErrNoRows {
 | 
									if err := scope.SqlDB().QueryRow(scope.Sql, scope.SqlVars...).Scan(primaryField.Field.Addr().Interface()); err == nil || err == sql.ErrNoRows {
 | 
				
			||||||
					scope.db.RowsAffected = 1
 | 
										scope.db.RowsAffected = 1
 | 
				
			||||||
				} else {
 | 
									} else {
 | 
				
			||||||
					log.Printf("create err %#v eql %#v", err, err == sql.ErrNoRows)
 | 
					 | 
				
			||||||
					scope.Err(err)
 | 
										scope.Err(err)
 | 
				
			||||||
				}
 | 
									}
 | 
				
			||||||
			} /* else {
 | 
								}
 | 
				
			||||||
				// Create a new primary key if one is required, not set, and the server doesn't support unique primary keys.
 | 
					 | 
				
			||||||
				log.Printf("key type %T %#v", val.Interface(), val.Interface())
 | 
					 | 
				
			||||||
				if key, ok := val.Interface().(*uint); ok && (key == nil || *key == 0) {
 | 
					 | 
				
			||||||
				val := primaryField.Field.Addr()
 | 
					 | 
				
			||||||
					id := scope.Dialect().NewUniqueKey(scope)
 | 
					 | 
				
			||||||
					v := reflect.Indirect(val)
 | 
					 | 
				
			||||||
					v.SetUint(id)
 | 
					 | 
				
			||||||
				}
 | 
					 | 
				
			||||||
				if results, err := scope.SqlDB().Exec(scope.Sql, scope.SqlVars...); err == sql.ErrNoRows {
 | 
					 | 
				
			||||||
				} else if err == nil {
 | 
					 | 
				
			||||||
					scope.db.RowsAffected, _ = results.RowsAffected()
 | 
					 | 
				
			||||||
				} else {
 | 
					 | 
				
			||||||
					log.Printf("create err no primary %#v eql %#v", err, err == sql.ErrNoRows)
 | 
					 | 
				
			||||||
					scope.Err(err)
 | 
					 | 
				
			||||||
				}
 | 
					 | 
				
			||||||
			}*/
 | 
					 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -3,7 +3,6 @@ package gorm
 | 
				
			|||||||
import (
 | 
					import (
 | 
				
			||||||
	"errors"
 | 
						"errors"
 | 
				
			||||||
	"fmt"
 | 
						"fmt"
 | 
				
			||||||
	"log"
 | 
					 | 
				
			||||||
	"reflect"
 | 
						"reflect"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -84,7 +83,7 @@ func Query(scope *Scope) {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
			scope.Err(rows.Scan(values...))
 | 
								scope.Err(rows.Scan(values...))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			log.Println("result values", values)
 | 
								//log.Println("result values", values)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			for index, column := range columns {
 | 
								for index, column := range columns {
 | 
				
			||||||
				value := values[index]
 | 
									value := values[index]
 | 
				
			||||||
 | 
				
			|||||||
@ -2,7 +2,6 @@ package gorm
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
import (
 | 
					import (
 | 
				
			||||||
	"fmt"
 | 
						"fmt"
 | 
				
			||||||
	"log"
 | 
					 | 
				
			||||||
	"reflect"
 | 
						"reflect"
 | 
				
			||||||
	"time"
 | 
						"time"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
@ -32,12 +31,10 @@ func (cockroach) NewUniqueKey(scope *Scope) uint64 {
 | 
				
			|||||||
	var id int64
 | 
						var id int64
 | 
				
			||||||
	for rows.Next() {
 | 
						for rows.Next() {
 | 
				
			||||||
		if err := rows.Scan(&id); err != nil {
 | 
							if err := rows.Scan(&id); err != nil {
 | 
				
			||||||
			log.Fatal("ERR UNIQUE ID", id, err)
 | 
					 | 
				
			||||||
			scope.Err(err)
 | 
								scope.Err(err)
 | 
				
			||||||
			return 0
 | 
								return 0
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	log.Printf("UNIQUE ID %#v", id)
 | 
					 | 
				
			||||||
	return uint64(id)
 | 
						return uint64(id)
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user