fix go-zero issue #3328

zeromicro · Jun 14, 2023 · 728584b · 728584b
1 parent aa7e847
commit 728584b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/parser/columndefinition_test.go b/parser/columndefinition_test.go
@@ -58,8 +58,9 @@ func TestVisitor_VisitColumnDefinition(t *testing.T) {
 	columnDefinition = v.(*ColumnDefinition)
 
 	assert.Equal(t, ColumnConstraint{
-		AutoIncrement: true,
-		Unique:        true,
+		AutoIncrement:   true,
+		Unique:          true,
+		HasDefaultValue: false,
 	}, *columnDefinition.ColumnConstraint)
 
 	v, err = p.testMysqlSyntax("test.sql", accept, `bigint(20) NULL DEFAULT NULL AUTO_INCREMENT UNIQUE KEY`)

diff --git a/parser/columndefinition_visitor.go b/parser/columndefinition_visitor.go
@@ -96,7 +96,7 @@ func (v *visitor) visitDefaultColumnConstraint(ctx *gen.DefaultColumnConstraintC
 	text = strings.Trim(text, "'")
 	replacer := strings.NewReplacer("\r", "", "\n", "")
 	text = replacer.Replace(text)
-	if strings.ToUpper(text) == "NULL" {
+	if strings.HasPrefix(strings.ToUpper(text), "NULL") {
 		return false
 	}