Skip to content

Commit

Permalink
remove unnecessary code
Browse files Browse the repository at this point in the history
  • Loading branch information
@hwbrzzl
hwbrzzl committed Mar 3, 2025
1 parent 5322101 commit 4dbc51c
Show file tree
Hide file tree
Showing 6 changed files with 62 additions and 186 deletions.
6 changes: 2 additions & 4 deletions contracts/database/db/db.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ type DB interface {
}

type Query interface {
// Avg(column string) (any, error)
// commit
// Count(dest *int64) error
// Chunk(size int, callback func(rows []any) error) error
Expand Down Expand Up @@ -44,9 +43,8 @@ type Query interface {
// Join(table string, on any, args ...any) Query
// latest
// LeftJoin(table string, on any, args ...any) Query
Limit(limit uint64) Query
// Limit(limit uint64) Query
// lockForUpdate
// Max(column string) (any, error)
// offset
OrderBy(column string) Query
OrderByDesc(column string) Query
Expand Down Expand Up @@ -74,7 +72,7 @@ type Query interface {
// ToRawSql
Update(column any, value ...any) (*Result, error)
// updateOrInsert
Value(column string, dest any) error
// Value(column string, dest any) error
// when
Where(query any, args ...any) Query
WhereBetween(column string, x, y any) Query
Expand Down
17 changes: 0 additions & 17 deletions contracts/database/db/grammar.go
View file

This file was deleted.

60 changes: 25 additions & 35 deletions database/db/query.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"github.com/goravel/framework/contracts/database/schema"
"github.com/goravel/framework/errors"
"github.com/goravel/framework/support/carbon"
"github.com/goravel/framework/support/convert"
"github.com/goravel/framework/support/str"
)

Expand Down Expand Up @@ -227,12 +226,12 @@ func (r *Query) Insert(data any) (*db.Result, error) {
}, nil
}

func (r *Query) Limit(limit uint64) db.Query {
q := r.clone()
q.conditions.Limit = &limit
// func (r *Query) Limit(limit uint64) db.Query {
// q := r.clone()
// q.conditions.Limit = &limit

return q
}
// return q
// }

func (r *Query) OrderBy(column string) db.Query {
q := r.clone()
Expand Down Expand Up @@ -406,31 +405,31 @@ func (r *Query) Update(column any, value ...any) (*db.Result, error) {
}, nil
}

func (r *Query) Value(column string, dest any) error {
r.conditions.Selects = []string{column}
r.conditions.Limit = convert.Pointer(uint64(1))
// func (r *Query) Value(column string, dest any) error {
// r.conditions.Selects = []string{column}
// r.conditions.Limit = convert.Pointer(uint64(1))

sql, args, err := r.buildSelect()
if err != nil {
return err
}
// sql, args, err := r.buildSelect()
// if err != nil {
// return err
// }

err = r.builder.Get(dest, sql, args...)
if err != nil {
if errors.Is(err, databasesql.ErrNoRows) {
r.trace(sql, args, 0, nil)
return nil
}
// err = r.builder.Get(dest, sql, args...)
// if err != nil {
// if errors.Is(err, databasesql.ErrNoRows) {
// r.trace(sql, args, 0, nil)
// return nil
// }

r.trace(sql, args, -1, err)
// r.trace(sql, args, -1, err)

return err
}
// return err
// }

r.trace(sql, args, -1, nil)
// r.trace(sql, args, -1, nil)

return nil
}
// return nil
// }

func (r *Query) Where(query any, args ...any) db.Query {
q := r.clone()
Expand Down Expand Up @@ -610,16 +609,7 @@ func (r *Query) buildSelect() (sql string, args []any, err error) {
}

builder = builder.Where(sqlizer)

if grammar, ok := r.grammar.(db.CompileOrderByGrammar); ok {
if r.conditions.Limit != nil && len(r.conditions.OrderBy) == 0 {
r.conditions.OrderBy = []string{"(select 0)"}
}

builder = grammar.CompileOrderBy(builder, r.conditions.OrderBy)
} else {
builder = builder.OrderBy(r.conditions.OrderBy...)
}
builder = builder.OrderBy(r.conditions.OrderBy...)

if r.conditions.Limit != nil {
builder = builder.Limit(*r.conditions.Limit)
Expand Down
44 changes: 22 additions & 22 deletions database/db/query_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -389,17 +389,17 @@ func (s *QueryTestSuite) TestInsert() {
})
}

func (s *QueryTestSuite) TestLimit() {
var users []TestUser
// func (s *QueryTestSuite) TestLimit() {
// var users []TestUser

s.mockDriver.EXPECT().Config().Return(database.Config{}).Once()
s.mockBuilder.EXPECT().Select(&users, "SELECT * FROM users WHERE age = ? LIMIT 1", 25).Return(nil).Once()
s.mockDriver.EXPECT().Explain("SELECT * FROM users WHERE age = ? LIMIT 1", 25).Return("SELECT * FROM users WHERE age = 25 LIMIT 1").Once()
s.mockLogger.EXPECT().Trace(s.ctx, s.now, "SELECT * FROM users WHERE age = 25 LIMIT 1", int64(0), nil).Return().Once()
// s.mockDriver.EXPECT().Config().Return(database.Config{}).Once()
// s.mockBuilder.EXPECT().Select(&users, "SELECT * FROM users WHERE age = ? LIMIT 1", 25).Return(nil).Once()
// s.mockDriver.EXPECT().Explain("SELECT * FROM users WHERE age = ? LIMIT 1", 25).Return("SELECT * FROM users WHERE age = 25 LIMIT 1").Once()
// s.mockLogger.EXPECT().Trace(s.ctx, s.now, "SELECT * FROM users WHERE age = 25 LIMIT 1", int64(0), nil).Return().Once()

err := s.query.Where("age", 25).Limit(1).Get(&users)
s.Nil(err)
}
// err := s.query.Where("age", 25).Limit(1).Get(&users)
// s.Nil(err)
// }

func (s *QueryTestSuite) TestOrderBy() {
var users []TestUser
Expand Down Expand Up @@ -744,21 +744,21 @@ func (s *QueryTestSuite) TestUpdate() {
})
}

func (s *QueryTestSuite) TestValue() {
var name string
// func (s *QueryTestSuite) TestValue() {
// var name string

s.mockDriver.EXPECT().Config().Return(database.Config{}).Once()
s.mockBuilder.EXPECT().Get(&name, "SELECT name FROM users WHERE name = ? LIMIT 1", "John").Run(func(dest any, query string, args ...any) {
destName := dest.(*string)
*destName = "John"
}).Return(nil).Once()
s.mockDriver.EXPECT().Explain("SELECT name FROM users WHERE name = ? LIMIT 1", "John").Return("SELECT name FROM users WHERE name = \"John\" LIMIT 1").Once()
s.mockLogger.EXPECT().Trace(s.ctx, s.now, "SELECT name FROM users WHERE name = \"John\" LIMIT 1", int64(-1), nil).Return().Once()
// s.mockDriver.EXPECT().Config().Return(database.Config{}).Once()
// s.mockBuilder.EXPECT().Get(&name, "SELECT name FROM users WHERE name = ? LIMIT 1", "John").Run(func(dest any, query string, args ...any) {
// destName := dest.(*string)
// *destName = "John"
// }).Return(nil).Once()
// s.mockDriver.EXPECT().Explain("SELECT name FROM users WHERE name = ? LIMIT 1", "John").Return("SELECT name FROM users WHERE name = \"John\" LIMIT 1").Once()
// s.mockLogger.EXPECT().Trace(s.ctx, s.now, "SELECT name FROM users WHERE name = \"John\" LIMIT 1", int64(-1), nil).Return().Once()

err := s.query.Where("name", "John").Value("name", &name)
s.NoError(err)
s.Equal("John", name)
}
// err := s.query.Where("name", "John").Value("name", &name)
// s.NoError(err)
// s.Equal("John", name)
// }

func (s *QueryTestSuite) TestWhere() {
s.Run("simple condition", func() {
Expand Down
95 changes: 0 additions & 95 deletions mocks/database/db/Query.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 13 additions & 13 deletions tests/db_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -362,19 +362,19 @@ func (s *DBTestSuite) TestUpdate_Delete() {
}
}

func (s *DBTestSuite) TestValue() {
for driver, query := range s.queries {
s.Run(driver, func() {
query.DB().Table("products").Insert(Product{Name: "value_product"})

var name string
err := query.DB().Table("products").Where("name", "value_product").Value("name", &name)

s.NoError(err)
s.Equal("value_product", name)
})
}
}
// func (s *DBTestSuite) TestValue() {
// for driver, query := range s.queries {
// s.Run(driver, func() {
// query.DB().Table("products").Insert(Product{Name: "value_product"})

// var name string
// err := query.DB().Table("products").Where("name", "value_product").Value("name", &name)

// s.NoError(err)
// s.Equal("value_product", name)
// })
// }
// }

func (s *DBTestSuite) TestWhere() {
for driver, query := range s.queries {
Expand Down

0 comments on commit 4dbc51c

Please sign in to comment.