golang/ent
1
0
Fork 0
mirror of https://github.com/ent/ent.git synced 2026-05-22 09:31:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

quote table name on DESCRIBE statement (#7)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebookincubator/ent/pull/7

avoid conflicting with reserved words (e.g. "groups" became reserved word in MySQL 8.x)

Reviewed By: alexsn

Differential Revision: D15957279

fbshipit-source-id: b6944752c7e5f6ec37119b11cc0ab8a0d7d3a7ff
This commit is contained in:
Ariel Mashraki
2019-06-23 01:48:26 -07:00
committed by Facebook Github Bot
parent 5ca9494121
commit 0e605681b2
4 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dialect/sql/builder.go
View File

@@ -257,6 +257,25 @@ func (t *TableBuilder) Query() (string, []interface{}) {
return t.b.String(), t.b.args
}
// DescribeBuilder is a query builder for `DESCRIBE` statement.
type DescribeBuilder struct {
b Builder
name string // table name.
}
// Describe returns a query builder for the `DESCRIBE` statement.
//
// Describe("users")
//
func Describe(name string) *DescribeBuilder { return &DescribeBuilder{b: Builder{}, name: name} }
// Query returns query representation of a `DESCRIBE` statement.
func (t *DescribeBuilder) Query() (string, []interface{}) {
t.b.WriteString("DESCRIBE ")
t.b.Append(t.name)
return t.b.String(), nil
}
// TableAlter is a query builder for `ALTER TABLE` statement.
type TableAlter struct {
b Builder

4
dialect/sql/builder_test.go
View File

@@ -13,6 +13,10 @@ func TestBuilder(t *testing.T) {
wantQuery string
wantArgs []interface{}
}{
{
input: Describe("users"),
wantQuery: "DESCRIBE `users`",
},
{
input: CreateTable("users").
Columns(

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

@@ -131,7 +131,8 @@ func (d *MySQL) exist(ctx context.Context, tx dialect.Tx, query string, args ...
// table loads the current table description from the database.
func (d *MySQL) table(ctx context.Context, tx dialect.Tx, name string) (*Table, error) {
rows := &sql.Rows{}
if err := tx.Query(ctx, "DESCRIBE "+name, []interface{}{}, rows); err != nil {
query, args := sql.Describe(name).Query()
if err := tx.Query(ctx, query, args, rows); err != nil {
return nil, fmt.Errorf("dialect/mysql: reading table description %v", err)
}
defer rows.Close()

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

@@ -151,7 +151,7 @@ func TestMySQL_Create(t *testing.T) {
AND TABLE_NAME = ?`)).
WithArgs("users").
WillReturnRows(sqlmock.NewRows([]string{"count"}).AddRow(1))
mock.ExpectQuery("DESCRIBE users").
mock.ExpectQuery("DESCRIBE `users`").
WillReturnRows(sqlmock.NewRows([]string{"Field", "Type", "Null", "Key", "Default", "Extra"}).
AddRow("id", "int(11)", "NO", "PRI", "NULL", "auto_increment").
AddRow("name", "varchar(255)", "NO", "YES", "NULL", ""))
@@ -194,7 +194,7 @@ func TestMySQL_Create(t *testing.T) {
AND TABLE_NAME = ?`)).
WithArgs("users").
WillReturnRows(sqlmock.NewRows([]string{"count"}).AddRow(1))
mock.ExpectQuery("DESCRIBE users").
mock.ExpectQuery("DESCRIBE `users`").
WillReturnRows(sqlmock.NewRows([]string{"Field", "Type", "Null", "Key", "Default", "Extra"}).
AddRow("id", "int(11)", "NO", "PRI", "NULL", "auto_increment").
AddRow("name", "varchar(255)", "NO", "YES", "NULL", ""))