Skip to content

Commit

Permalink
Bump github.com/go-rel/sql from 0.2.0 to 0.5.0 (#41)
Browse files Browse the repository at this point in the history
* Bump github.com/go-rel/sql from 0.2.0 to 0.5.0

Bumps [github.com/go-rel/sql](https://github.com/go-rel/sql) from 0.2.0 to 0.5.0.
- [Release notes](https://github.com/go-rel/sql/releases)
- [Changelog](https://github.com/go-rel/sql/blob/main/.goreleaser.yml)
- [Commits](go-rel/sql@v0.2.0...v0.5.0)

---
updated-dependencies:
- dependency-name: github.com/go-rel/sql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* adjust query builder

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Fs02 <surya.asriadie@gmail.com>
  • Loading branch information
dependabot[bot] and Fs02 committed Oct 21, 2021
1 parent a7a91cb commit fb9013c
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 14 deletions.
2 changes: 1 addition & 1 deletion builder/index.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func (i Index) WriteCreateIndex(buffer *builder.Buffer, index rel.Index) {
} else {
buffer.WriteString(" WHERE ")
}
i.Filter.Write(buffer, index.Filter, i.Query)
i.Filter.Write(buffer, "", index.Filter, i.Query)
}
}

Expand Down
16 changes: 8 additions & 8 deletions builder/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,14 @@ func (q Query) WriteSelect(buffer *builder.Buffer, selectQuery rel.SelectQuery,
func (q Query) WriteQuery(buffer *builder.Buffer, query rel.Query) {
q.WriteFrom(buffer, query.Table)
q.WriteJoin(buffer, query.Table, query.JoinQuery)
q.WriteWhere(buffer, query.WhereQuery)
q.WriteWhere(buffer, query.Table, query.WhereQuery)

if len(query.GroupQuery.Fields) > 0 {
q.WriteGroupBy(buffer, query.GroupQuery.Fields)
q.WriteHaving(buffer, query.GroupQuery.Filter)
q.WriteGroupBy(buffer, query.Table, query.GroupQuery.Fields)
q.WriteHaving(buffer, query.Table, query.GroupQuery.Filter)
}

q.WriteOrderBy(buffer, query.SortQuery)
q.WriteOrderBy(buffer, query.Table, query.SortQuery)
q.WriteLimitOffet(buffer, query.LimitQuery, query.OffsetQuery)

if query.LockQuery != "" {
Expand All @@ -95,23 +95,23 @@ func (q Query) WriteQuery(buffer *builder.Buffer, query rel.Query) {
}

// WriteWhere SQL to buffer.
func (q Query) WriteWhere(buffer *builder.Buffer, filter rel.FilterQuery) {
func (q Query) WriteWhere(buffer *builder.Buffer, table string, filter rel.FilterQuery) {
if filter.None() {
return
}

buffer.WriteString(" WHERE ")
q.Filter.Write(buffer, filter, q)
q.Filter.Write(buffer, table, filter, q)
}

// WriteHaving SQL to buffer.
func (q Query) WriteHaving(buffer *builder.Buffer, filter rel.FilterQuery) {
func (q Query) WriteHaving(buffer *builder.Buffer, table string, filter rel.FilterQuery) {
if filter.None() {
return
}

buffer.WriteString(" HAVING ")
q.Filter.Write(buffer, filter, q)
q.Filter.Write(buffer, table, filter, q)
}

// WriteLimitOffet SQL to buffer.
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ go 1.16
require (
github.com/denisenkom/go-mssqldb v0.11.0
github.com/go-rel/rel v0.27.0
github.com/go-rel/sql v0.2.0
github.com/go-rel/sql v0.5.0
github.com/stretchr/testify v1.7.0
)
6 changes: 2 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@ github.com/denisenkom/go-mssqldb v0.11.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/go-rel/rel v0.26.0/go.mod h1:/VBLj1U4ZVb53aB3n22RQwX0V9DvckohseDJQibn2Rs=
github.com/go-rel/rel v0.27.0 h1:Z9NOScAMwu54sxXmL/gET5+qKkisTS95MIk6uH/+r9Y=
github.com/go-rel/rel v0.27.0/go.mod h1:zaIYPmM3AfJrh0xBmm7KoVKRgTNvr0cgZfcJ88gVA2U=
github.com/go-rel/sql v0.2.0 h1:MbrI1Fc2yr2bPj72KMcCzzE4iZqYHEc4tjyU2icWdu4=
github.com/go-rel/sql v0.2.0/go.mod h1:fuxRKIaX09WAyoh/U1Y0xex1ppRcIzuRPmPhrVG+P64=
github.com/go-rel/sql v0.5.0 h1:+TVS9JvEl06Q8rswwuWlY6VZ+gwSBX9um+vKuZ9gsyY=
github.com/go-rel/sql v0.5.0/go.mod h1:2YwenlIaHpTqdD/KPVYG7Y5Ub1+sn1winlC8TrighRU=
github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
Expand All @@ -28,7 +27,6 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO
github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
github.com/lib/pq v1.10.3/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
github.com/mattn/go-sqlite3 v1.14.8/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/mattn/go-sqlite3 v1.14.9 h1:10HX2Td0ocZpYEjhilsuo6WWtUqttj2Kb0KtD86/KYA=
github.com/mattn/go-sqlite3 v1.14.9/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
Expand Down

0 comments on commit fb9013c

Please sign in to comment.