golang/ent
1
0
Fork 0
mirror of https://github.com/ent/ent.git synced 2026-04-28 05:30:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

dialect/entsql: add support for table-options in annotation (#938)

Browse Source
This commit is contained in:
Daven
2020-11-10 12:40:56 -06:00
committed by GitHub
parent 7574923d91
commit 534dbbe590
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dialect/entsql/annotation.go
View File

@@ -34,6 +34,14 @@ type Annotation struct {
// }
//
Collation string `json:"collation,omitempty"`
// Options defines the additional table options. For example:
//
// entsql.Annotation{
// Options: "ENGINE = INNODB",
// }
//
Options string `json:"options,omitempty"`
}
// Name describes the annotation name.

3
dialect/sql/schema/mysql.go
View File

@@ -183,6 +183,9 @@ func (d *MySQL) tBuilder(t *Table) *sql.TableBuilder {
if collate := t.Annotation.Collation; collate != "" {
b.Collate(collate)
}
if opts := t.Annotation.Options; opts != "" {
b.Options(opts)
}
}
return b
}

3
dialect/sql/schema/mysql_test.go
View File

@@ -63,13 +63,14 @@ func TestMySQL_Create(t *testing.T) {
Annotation: &entsql.Annotation{
Charset: "utf8",
Collation: "utf8_general_ci",
Options: "ENGINE = INNODB",
},
},
},
before: func(mock mysqlMock) {
mock.start("5.7.8")
mock.tableExists("users", false)
mock.ExpectExec(escape("CREATE TABLE IF NOT EXISTS `users`(`id` bigint AUTO_INCREMENT NOT NULL, `name` varchar(255) NULL, `age` bigint NOT NULL, `doc` json NULL, `enums` enum('a', 'b') NOT NULL, `uuid` char(36) binary NULL, `datetime` datetime NULL, `decimal` decimal(6,2) NOT NULL, PRIMARY KEY(`id`)) CHARACTER SET utf8 COLLATE utf8_general_ci")).
mock.ExpectExec(escape("CREATE TABLE IF NOT EXISTS `users`(`id` bigint AUTO_INCREMENT NOT NULL, `name` varchar(255) NULL, `age` bigint NOT NULL, `doc` json NULL, `enums` enum('a', 'b') NOT NULL, `uuid` char(36) binary NULL, `datetime` datetime NULL, `decimal` decimal(6,2) NOT NULL, PRIMARY KEY(`id`)) CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE = INNODB")).
WillReturnResult(sqlmock.NewResult(0, 1))
mock.ExpectCommit()
},