added QueryBuilder interface for SelectQuery,UpdateQuery,DeleteQuery

query_base.go

@@ -65,6 +65,17 @@ var (
 	_ IDB = (*Tx)(nil)
 )
 
+// QueryBuilder is used SelectQuery,UpdateQuery, DeleteQuery for adding new Where conditions
+type QueryBuilder interface {
+	Query
+	Where(query string, args ...interface{}) QueryBuilder
+	WhereGroup(sep string, fn func(QueryBuilder) QueryBuilder) QueryBuilder
+	WhereOr(query string, args ...interface{}) QueryBuilder
+	WhereDeleted() QueryBuilder
+	WhereAllWithDeleted() QueryBuilder
+	WherePK(cols ...string) QueryBuilder
+	Unwrap() interface{}
+}
 type baseQuery struct {
 	db   *DB
 	conn IConn

query_delete.go

@@ -286,3 +286,48 @@ func (q *DeleteQuery) afterDeleteHook(ctx context.Context) error {
 	}
 	return nil
 }
+
+//------------------------------------------------------------------------------
+type deleteQueryBuilder struct {
+	*DeleteQuery
+}
+
+func (q *deleteQueryBuilder) WhereGroup(sep string, fn func(QueryBuilder) QueryBuilder) QueryBuilder {
+	q.DeleteQuery.WhereGroup(sep, func(qs *DeleteQuery) *DeleteQuery {
+		return fn(&deleteQueryBuilder{qs}).(*deleteQueryBuilder).DeleteQuery
+	})
+	return q
+}
+
+func (q *deleteQueryBuilder) Where(query string, args ...interface{}) QueryBuilder {
+	q.DeleteQuery.Where(query, args...)
+	return q
+}
+
+func (q *deleteQueryBuilder) WhereOr(query string, args ...interface{}) QueryBuilder {
+	q.DeleteQuery.WhereOr(query, args...)
+	return q
+}
+
+func (q *deleteQueryBuilder) WhereDeleted() QueryBuilder {
+	q.DeleteQuery.WhereDeleted()
+	return q
+}
+
+func (q *deleteQueryBuilder) WhereAllWithDeleted() QueryBuilder {
+	q.DeleteQuery.WhereAllWithDeleted()
+	return q
+}
+
+func (q *deleteQueryBuilder) WherePK(cols ...string) QueryBuilder {
+	q.DeleteQuery.WherePK(cols...)
+	return q
+}
+
+func (q *deleteQueryBuilder) Unwrap() interface{} {
+	return q.DeleteQuery
+}
+
+func (q *DeleteQuery) Query() QueryBuilder {
+	return &deleteQueryBuilder{q}
+}

query_select.go

@@ -920,6 +920,51 @@ func (q *SelectQuery) whereExists(ctx context.Context) (bool, error) {
 	return n == 1, nil
 }
 
+//------------------------------------------------------------------------------
+type selectQueryBuilder struct {
+	*SelectQuery
+}
+
+func (q *selectQueryBuilder) WhereGroup(sep string, fn func(QueryBuilder) QueryBuilder) QueryBuilder {
+	q.SelectQuery.WhereGroup(sep, func(qs *SelectQuery) *SelectQuery {
+		return fn(&selectQueryBuilder{qs}).(*selectQueryBuilder).SelectQuery
+	})
+	return q
+}
+
+func (q *selectQueryBuilder) Where(query string, args ...interface{}) QueryBuilder {
+	q.SelectQuery.Where(query, args...)
+	return q
+}
+
+func (q *selectQueryBuilder) WhereOr(query string, args ...interface{}) QueryBuilder {
+	q.SelectQuery.WhereOr(query, args...)
+	return q
+}
+
+func (q *selectQueryBuilder) WhereDeleted() QueryBuilder {
+	q.SelectQuery.WhereDeleted()
+	return q
+}
+
+func (q *selectQueryBuilder) WhereAllWithDeleted() QueryBuilder {
+	q.SelectQuery.WhereAllWithDeleted()
+	return q
+}
+
+func (q *selectQueryBuilder) WherePK(cols ...string) QueryBuilder {
+	q.SelectQuery.WherePK(cols...)
+	return q
+}
+
+func (q *selectQueryBuilder) Unwrap() interface{} {
+	return q.SelectQuery
+}
+
+func (q *SelectQuery) Query() QueryBuilder {
+	return &selectQueryBuilder{q}
+}
+
 //------------------------------------------------------------------------------
 
 type joinQuery struct {

query_update.go

@@ -486,3 +486,48 @@ func (q *UpdateQuery) FQN(column string) Ident {
 func (q *UpdateQuery) hasTableAlias(fmter schema.Formatter) bool {
 	return fmter.HasFeature(feature.UpdateMultiTable | feature.UpdateTableAlias)
 }
+
+//------------------------------------------------------------------------------
+type updateQueryBuilder struct {
+	*UpdateQuery
+}
+
+func (q *updateQueryBuilder) WhereGroup(sep string, fn func(QueryBuilder) QueryBuilder) QueryBuilder {
+	q.UpdateQuery.WhereGroup(sep, func(qs *UpdateQuery) *UpdateQuery {
+		return fn(&updateQueryBuilder{qs}).(*updateQueryBuilder).UpdateQuery
+	})
+	return q
+}
+
+func (q *updateQueryBuilder) Where(query string, args ...interface{}) QueryBuilder {
+	q.UpdateQuery.Where(query, args...)
+	return q
+}
+
+func (q *updateQueryBuilder) WhereOr(query string, args ...interface{}) QueryBuilder {
+	q.UpdateQuery.WhereOr(query, args...)
+	return q
+}
+
+func (q *updateQueryBuilder) WhereDeleted() QueryBuilder {
+	q.UpdateQuery.WhereDeleted()
+	return q
+}
+
+func (q *updateQueryBuilder) WhereAllWithDeleted() QueryBuilder {
+	q.UpdateQuery.WhereAllWithDeleted()
+	return q
+}
+
+func (q *updateQueryBuilder) WherePK(cols ...string) QueryBuilder {
+	q.UpdateQuery.WherePK(cols...)
+	return q
+}
+
+func (q *updateQueryBuilder) Unwrap() interface{} {
+	return q.UpdateQuery
+}
+
+func (q *UpdateQuery) Query() QueryBuilder {
+	return &updateQueryBuilder{q}
+}