Skip to content

Commit

Permalink
remove back quote
Browse files Browse the repository at this point in the history
  • Loading branch information
@mazrean
mazrean committed Mar 21, 2022
1 parent 686aa84 commit e4a088e
Show file tree
Hide file tree
Showing 17 changed files with 578 additions and 540 deletions.
24 changes: 12 additions & 12 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ It also supports many CRUD syntaxes in SQL.
## Example
#### Example 1

String column `` `users`. `name` `` can be compared to a `string` value, but comparing it to an `int` value will result in a compile error.
String column `users.name` can be compared to a `string` value, but comparing it to an `int` value will result in a compile error.

```go
// correct
Expand Down Expand Up @@ -114,7 +114,7 @@ db, err := sql.Open("mysql", "user:pass@tcp(host:port)/database?parseTime=true&l

### Insert
```go
// INSERT INTO `users` (`id`, `name`, `created_at`) VALUES ({{uuid.New()}}, "name1", {{time.Now()}}), ({{uuid.New()}}, "name2", {{time.Now()}})
// INSERT INTO users (id, name, created_at) VALUES ({{uuid.New()}}, "name1", {{time.Now()}}), ({{uuid.New()}}, "name2", {{time.Now()}})
affectedRows, err := genorm.
Insert(orm.User()).
Values(&orm.UserTable{
Expand All @@ -132,25 +132,25 @@ affectedRows, err := genorm.
### Select

```go
// SELECT `id`, `name`, `created_at` FROM `users`
// SELECT id, name, created_at FROM users
// userValues: []orm.UserTable
userValues, err := genorm.
Select(orm.User()).
GetAll(db)

// SELECT `id`, `name`, `created_at` FROM `users` LIMIT 1
// SELECT id, name, created_at FROM users LIMIT 1
// userValue: orm.UserTable
userValue, err := genorm.
Select(orm.User()).
Get(db)

// SELECT `id` FROM `users`
// SELECT id FROM users
// userIDs: []uuid.UUID
userIDs, err := genorm.
Pluck(orm.User(), user.IDExpr).
GetAll(db)

// SELECT COUNT(`id`) AS `result` FROM `users` LIMIT 1
// SELECT COUNT(id) AS result FROM users LIMIT 1
// userNum: int64
userNum, err := genorm.
Pluck(orm.User(), genorm.Count(user.IDExpr, false)).
Expand All @@ -159,7 +159,7 @@ userNum, err := genorm.

### Update
```go
// UPDATE `users` SET `name`="name"
// UPDATE users SET name="name"
affectedRows, err = genorm.
Update(orm.User()).
Set(
Expand All @@ -171,7 +171,7 @@ affectedRows, err = genorm.

### Delete
```go
// DELETE FROM `users`
// DELETE FROM users
affectedRows, err = genorm.
Delete(orm.User()).
Do(db)
Expand All @@ -180,7 +180,7 @@ affectedRows, err = genorm.
### Join
#### Select
```go
// SELECT `users`.`name`, `messages`.`content` FROM `users` INNER JOIN `messages` ON `users`.`id` = `messages`.`user_id`
// SELECT users.name, messages.content FROM users INNER JOIN messages ON users.id = messages.user_id
// messageUserValues: []orm.MessageUserTable
userID := orm.MessageUserParseExpr(user.ID)
userName := orm.MessageUserParse(user.Name)
Expand All @@ -195,7 +195,7 @@ messageUserValues, err := genorm.

#### Update
```go
// UPDATE `users` INNER JOIN `messages` ON `users.id` = `messages`.`id` SET `content`="hello world"
// UPDATE users INNER JOIN messages ON users.id = messages.id SET content="hello world"
userIDColumn := orm.MessageUserParseExpr(user.ID)
messageUserIDColumn := orm.MessageUserParseExpr(message.UserID)
messageContent := orm.MessageUserParse(message.Content)
Expand Down Expand Up @@ -239,15 +239,15 @@ if err != nil {
### Context

```go
// SELECT `id`, `name`, `created_at` FROM `users`
// SELECT id, name, created_at FROM users
// userValues: []orm.UserTable
userValues, err := genorm.
Select(orm.User()).
GetAllCtx(context.Background(), db)
```

```go
// INSERT INTO `users` (`id`, `name`, `created_at`) VALUES ({{uuid.New()}}, "name", {{time.Now()}})
// INSERT INTO users (id, name, created_at) VALUES ({{uuid.New()}}, "name", {{time.Now()}})
affectedRows, err := genorm.
Insert(orm.User()).
Values(&orm.UserTable{
Expand Down
62 changes: 31 additions & 31 deletions clause_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func TestWhereConditionClauseGetExprTest(t *testing.T) {
{
description: "normal",
expr: &expr{
query: "(`hoge`.`huga` = ?)",
query: "(hoge.huga = ?)",
args: []genorm.ExprType{genorm.Wrap(1)},
},
},
Expand Down Expand Up @@ -199,7 +199,7 @@ func TestGroupClauseSetTest(t *testing.T) {
description: "normal",
setExprs: []*expr{
{
query: "(`hoge`.`huga` = ?)",
query: "(hoge.huga = ?)",
args: []genorm.ExprType{genorm.Wrap(1)},
},
},
Expand All @@ -209,7 +209,7 @@ func TestGroupClauseSetTest(t *testing.T) {
beforeExprs: []*expr{},
setExprs: []*expr{
{
query: "(`hoge`.`huga` = ?)",
query: "(hoge.huga = ?)",
args: []genorm.ExprType{genorm.Wrap(1)},
},
},
Expand All @@ -218,13 +218,13 @@ func TestGroupClauseSetTest(t *testing.T) {
description: "condition already set",
beforeExprs: []*expr{
{
query: "(`hoge`.`huga` = ?)",
query: "(hoge.huga = ?)",
args: []genorm.ExprType{genorm.Wrap(1)},
},
},
setExprs: []*expr{
{
query: "(`hoge`.`huga` = ?)",
query: "(hoge.huga = ?)",
args: []genorm.ExprType{genorm.Wrap(2)},
},
},
Expand Down Expand Up @@ -301,7 +301,7 @@ func TestGroupClauseExistTest(t *testing.T) {
description: "normal",
exprs: []*expr{
{
query: "(`hoge`.`huga` = ?)",
query: "(hoge.huga = ?)",
args: []genorm.ExprType{genorm.Wrap(1)},
},
},
Expand Down Expand Up @@ -359,26 +359,26 @@ func TestGroupClauseGetExprTest(t *testing.T) {
description: "normal",
exprs: []*expr{
{
query: "(`hoge`.`huga` = ?)",
query: "(hoge.huga = ?)",
args: []genorm.ExprType{genorm.Wrap(1)},
},
},
query: "GROUP BY (`hoge`.`huga` = ?)",
query: "GROUP BY (hoge.huga = ?)",
args: []genorm.ExprType{genorm.Wrap(1)},
},
{
description: "multi exprs",
exprs: []*expr{
{
query: "(`hoge`.`huga` = ?)",
query: "(hoge.huga = ?)",
args: []genorm.ExprType{genorm.Wrap(1)},
},
{
query: "(`hoge`.`nya` = ?)",
query: "(hoge.nya = ?)",
args: []genorm.ExprType{genorm.Wrap(2)},
},
},
query: "GROUP BY (`hoge`.`huga` = ?), (`hoge`.`nya` = ?)",
query: "GROUP BY (hoge.huga = ?), (hoge.nya = ?)",
args: []genorm.ExprType{genorm.Wrap(1), genorm.Wrap(2)},
},
{
Expand Down Expand Up @@ -465,15 +465,15 @@ func TestOrderClauseAddTest(t *testing.T) {
description: "normal",
addItem: orderItem{
expr: &expr{
query: "(`hoge`.`huga` = ?)",
query: "(hoge.huga = ?)",
args: []genorm.ExprType{genorm.Wrap(1)},
},
direction: genorm.Asc,
},
afterExprs: []orderItem{
{
expr: &expr{
query: "(`hoge`.`huga` = ?)",
query: "(hoge.huga = ?)",
args: []genorm.ExprType{genorm.Wrap(1)},
},
direction: genorm.Asc,
Expand All @@ -484,15 +484,15 @@ func TestOrderClauseAddTest(t *testing.T) {
description: "desc",
addItem: orderItem{
expr: &expr{
query: "(`hoge`.`huga` = ?)",
query: "(hoge.huga = ?)",
args: []genorm.ExprType{genorm.Wrap(1)},
},
direction: genorm.Desc,
},
afterExprs: []orderItem{
{
expr: &expr{
query: "(`hoge`.`huga` = ?)",
query: "(hoge.huga = ?)",
args: []genorm.ExprType{genorm.Wrap(1)},
},
direction: genorm.Desc,
Expand All @@ -504,15 +504,15 @@ func TestOrderClauseAddTest(t *testing.T) {
beforeExprs: []orderItem{},
addItem: orderItem{
expr: &expr{
query: "(`hoge`.`huga` = ?)",
query: "(hoge.huga = ?)",
args: []genorm.ExprType{genorm.Wrap(1)},
},
direction: genorm.Asc,
},
afterExprs: []orderItem{
{
expr: &expr{
query: "(`hoge`.`huga` = ?)",
query: "(hoge.huga = ?)",
args: []genorm.ExprType{genorm.Wrap(1)},
},
direction: genorm.Asc,
Expand All @@ -524,30 +524,30 @@ func TestOrderClauseAddTest(t *testing.T) {
beforeExprs: []orderItem{
{
expr: &expr{
query: "(`hoge`.`huga` = ?)",
query: "(hoge.huga = ?)",
args: []genorm.ExprType{genorm.Wrap(1)},
},
direction: genorm.Asc,
},
},
addItem: orderItem{
expr: &expr{
query: "(`hoge`.`huga` = ?)",
query: "(hoge.huga = ?)",
args: []genorm.ExprType{genorm.Wrap(2)},
},
direction: genorm.Asc,
},
afterExprs: []orderItem{
{
expr: &expr{
query: "(`hoge`.`huga` = ?)",
query: "(hoge.huga = ?)",
args: []genorm.ExprType{genorm.Wrap(1)},
},
direction: genorm.Asc,
},
{
expr: &expr{
query: "(`hoge`.`huga` = ?)",
query: "(hoge.huga = ?)",
args: []genorm.ExprType{genorm.Wrap(2)},
},
direction: genorm.Asc,
Expand All @@ -565,7 +565,7 @@ func TestOrderClauseAddTest(t *testing.T) {
description: "invalid direction",
addItem: orderItem{
expr: &expr{
query: "(`hoge`.`huga` = ?)",
query: "(hoge.huga = ?)",
args: []genorm.ExprType{genorm.Wrap(1)},
},
},
Expand Down Expand Up @@ -672,7 +672,7 @@ func TestOrderClauseExistTest(t *testing.T) {
items: []orderItem{
{
expr: &expr{
query: "(`hoge`.`huga` = ?)",
query: "(hoge.huga = ?)",
args: []genorm.ExprType{genorm.Wrap(1)},
},
direction: genorm.Asc,
Expand Down Expand Up @@ -746,35 +746,35 @@ func TestOrderClauseGetExprTest(t *testing.T) {
items: []orderItem{
{
expr: &expr{
query: "(`hoge`.`huga` = ?)",
query: "(hoge.huga = ?)",
args: []genorm.ExprType{genorm.Wrap(1)},
},
direction: genorm.Asc,
},
},
query: "ORDER BY (`hoge`.`huga` = ?) ASC",
query: "ORDER BY (hoge.huga = ?) ASC",
args: []genorm.ExprType{genorm.Wrap(1)},
},
{
description: "desc",
items: []orderItem{
{
expr: &expr{
query: "(`hoge`.`huga` = ?)",
query: "(hoge.huga = ?)",
args: []genorm.ExprType{genorm.Wrap(1)},
},
direction: genorm.Desc,
},
},
query: "ORDER BY (`hoge`.`huga` = ?) DESC",
query: "ORDER BY (hoge.huga = ?) DESC",
args: []genorm.ExprType{genorm.Wrap(1)},
},
{
description: "invlid direction",
items: []orderItem{
{
expr: &expr{
query: "(`hoge`.`huga` = ?)",
query: "(hoge.huga = ?)",
args: []genorm.ExprType{genorm.Wrap(1)},
},
},
Expand All @@ -786,20 +786,20 @@ func TestOrderClauseGetExprTest(t *testing.T) {
items: []orderItem{
{
expr: &expr{
query: "(`hoge`.`huga` = ?)",
query: "(hoge.huga = ?)",
args: []genorm.ExprType{genorm.Wrap(1)},
},
direction: genorm.Asc,
},
{
expr: &expr{
query: "(`hoge`.`nya` = ?)",
query: "(hoge.nya = ?)",
args: []genorm.ExprType{genorm.Wrap(2)},
},
direction: genorm.Asc,
},
},
query: "ORDER BY (`hoge`.`huga` = ?) ASC, (`hoge`.`nya` = ?) ASC",
query: "ORDER BY (hoge.huga = ?) ASC, (hoge.nya = ?) ASC",
args: []genorm.ExprType{genorm.Wrap(1), genorm.Wrap(2)},
},
{
Expand Down
2 changes: 1 addition & 1 deletion cmd/genorm/generator/codegen/column.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ func (clmn *column) sqlColumnsDecl() ast.Decl {
Args: []ast.Expr{
&ast.BasicLit{
Kind: token.STRING,
Value: "\"`%s`.`%s`\"",
Value: `"%s.%s"`,
},
&ast.CallExpr{
Fun: &ast.SelectorExpr{
Expand Down
16 changes: 2 additions & 14 deletions cmd/genorm/generator/codegen/table.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,20 +227,8 @@ func (tbl *table) exprDecl() ast.Decl {
Results: []ast.Expr{
&ast.CallExpr{
Fun: &ast.SelectorExpr{
X: fmtIdent,
Sel: ast.NewIdent("Sprintf"),
},
Args: []ast.Expr{
&ast.BasicLit{
Kind: token.STRING,
Value: "\"`%s`\"",
},
&ast.CallExpr{
Fun: &ast.SelectorExpr{
X: tbl.recvIdent,
Sel: basicTableTableNameIdent,
},
},
X: tbl.recvIdent,
Sel: basicTableTableNameIdent,
},
},
ast.NewIdent("nil"),
Expand Down
Loading

0 comments on commit e4a088e

Please sign in to comment.