🩹 修复模型中没有由数据库分配的默认值字段时批量创建数据失败的问题

ORA-00933: SQL 命令未正确结束

Refs: a270d2a
Close: #50

Author: iTanken

create.go

@@ -95,13 +95,14 @@ func outputInserted(db *gorm.DB) (lenDefaultValue int) {
 		return
 	}
 	lenDefaultValue = len(stmtSchema.FieldsWithDefaultDBValue)
-	if lenDefaultValue > 0 {
-		columns := make([]clause.Column, lenDefaultValue)
-		for idx, field := range stmtSchema.FieldsWithDefaultDBValue {
-			columns[idx] = clause.Column{Name: field.DBName}
-		}
-		db.Statement.AddClauseIfNotExists(clause.Returning{Columns: columns})
+	if lenDefaultValue == 0 {
+		return
+	}
+	columns := make([]clause.Column, lenDefaultValue)
+	for idx, field := range stmtSchema.FieldsWithDefaultDBValue {
+		columns[idx] = clause.Column{Name: field.DBName}
 	}
+	db.Statement.AddClauseIfNotExists(clause.Returning{Columns: columns})
 	db.Statement.Build("RETURNING")
 
 	_, _ = db.Statement.WriteString(" INTO ")

create_test.go

@@ -225,6 +225,29 @@ func TestOra03146TTC(t *testing.T) {
 	t.Log("执行成功，影响行数：", result.RowsAffected)
 }
 
+type testNoDefaultDBValues struct {
+	UID  string `gorm:"column:uid;type:varchar(50);comment:用户身份标识" json:"uid"`
+	Name string `gorm:"column:name;size:50;comment:用户姓名" json:"name"`
+
+	Account  string `gorm:"column:account;type:varchar(50);comment:登录账号" json:"account"`
+	Password string `gorm:"column:password;type:varchar(512);comment:登录密码（密文）" json:"password"`
+
+	Email       string `gorm:"column:email;type:varchar(128);comment:邮箱地址" json:"email"`
+	PhoneNumber string `gorm:"column:phone_number;type:varchar(15);comment:E.164" json:"phoneNumber"`
+
+	Sex      string     `gorm:"column:sex;type:char(1);comment:性别" json:"sex"`
+	Birthday *time.Time `gorm:"column:birthday;->:false;<-:create;comment:生日" json:"birthday,omitempty"`
+
+	UserType int `gorm:"column:user_type;size:8;comment:用户类型" json:"userType"`
+
+	Enabled bool   `gorm:"column:enabled;comment:是否可用" json:"enabled"`
+	Remark  string `gorm:"column:remark;size:1024;comment:备注信息" json:"remark"`
+}
+
+func (testNoDefaultDBValues) TableName() string {
+	return "test_no_default_db_values"
+}
+
 func TestCreateInBatches(t *testing.T) {
 	db, err := dbNamingCase, dbErrors[0]
 	if err != nil {
@@ -235,8 +258,8 @@ func TestCreateInBatches(t *testing.T) {
 		return
 	}
 
-	model := TestTableUser{}
-	migrator := db.Set("gorm:table_comments", "用户信息表").Migrator()
+	model := testNoDefaultDBValues{}
+	migrator := db.Set("gorm:table_comments", "没有由数据库分配的默认值字段测试表").Migrator()
 	if migrator.HasTable(model) {
 		if err = migrator.DropTable(model); err != nil {
 			t.Fatalf("DropTable() error = %v", err)
@@ -248,7 +271,7 @@ func TestCreateInBatches(t *testing.T) {
 		t.Log("AutoMigrate() success!")
 	}
 
-	data := []TestTableUser{
+	data := []testNoDefaultDBValues{
 		{UID: "U1", Name: "Lisa", Account: "lisa", Password: "H6aLDNr", PhoneNumber: "+8616666666666", Sex: "0", UserType: 1, Enabled: true},
 		{UID: "U2", Name: "Daniela", Account: "daniela", Password: "Si7l1sRIC79", PhoneNumber: "+8619999999999", Sex: "1", UserType: 1, Enabled: true},
 		{UID: "U3", Name: "Tom", Account: "tom", Password: "********", PhoneNumber: "+8618888888888", Sex: "1", UserType: 1, Enabled: true},