Merge branch 'otiai10-feature/id-but-not-autoincremental'

2015-11-22 09:35:43 +08:00 · 2015-11-22 09:35:43 +08:00 · c0b9e3af82
commit c0b9e3af82
parent 2f9abdcf02 ea83dec214
1 changed files with 4 additions and 1 deletions
--- a/model_struct.go
+++ b/model_struct.go
@ -435,10 +435,13 @@ func (scope *Scope) generateSqlTag(field *StructField) string {
 			size, _ = strconv.Atoi(value)
 		}

-		_, autoIncrease := sqlSettings["AUTO_INCREMENT"]
+		v, autoIncrease := sqlSettings["AUTO_INCREMENT"]
 		if field.IsPrimaryKey {
 			autoIncrease = true
 		}
+		if v == "FALSE" {
+			autoIncrease = false
+		}

 		sqlType = scope.Dialect().SqlTag(reflectValue, size, autoIncrease)
 	}