From 3ab0bc600f92060f0eaf3289eddd569ac5234fdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Carlos=20Nieto?= <jose.carlos@menteslibres.net>
Date: Fri, 9 Dec 2016 06:35:04 -0600
Subject: [PATCH] Fixing ignored immutable queries
---
internal/sqladapter/result.go | 18 +++++++-----------
lib/sqlbuilder/batch.go | 2 +-
lib/sqlbuilder/builder_test.go | 2 +-
postgresql/collection.go | 2 +-
4 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/internal/sqladapter/result.go b/internal/sqladapter/result.go
index e9a79e93..108ec25b 100644
--- a/internal/sqladapter/result.go
+++ b/internal/sqladapter/result.go
@@ -212,15 +212,11 @@ func (r *Result) Count() (uint64, error) {
}
func (r *Result) buildSelect() sqlbuilder.Selector {
- q := r.b.Select(r.fields...)
-
- q.From(r.table)
- q.Where(filter(r.conds)...)
- q.Limit(r.limit)
- q.Offset(r.offset)
-
- q.GroupBy(r.groupBy...)
- q.OrderBy(r.orderBy...)
-
- return q
+ return r.b.Select(r.fields...).
+ From(r.table).
+ Where(filter(r.conds)...).
+ Limit(r.limit).
+ Offset(r.offset).
+ GroupBy(r.groupBy...).
+ OrderBy(r.orderBy...)
}
diff --git a/lib/sqlbuilder/batch.go b/lib/sqlbuilder/batch.go
index 0177b8e6..1ed38365 100644
--- a/lib/sqlbuilder/batch.go
+++ b/lib/sqlbuilder/batch.go
@@ -32,7 +32,7 @@ func (b *BatchInserter) nextQuery() *inserter {
i := 0
for values := range b.values {
i++
- clone.Values(values...)
+ clone = clone.Values(values...).(*inserter)
if i == b.size {
break
}
diff --git a/lib/sqlbuilder/builder_test.go b/lib/sqlbuilder/builder_test.go
index 44d5b60c..e4c72565 100644
--- a/lib/sqlbuilder/builder_test.go
+++ b/lib/sqlbuilder/builder_test.go
@@ -628,7 +628,7 @@ func TestSelect(t *testing.T) {
Where(db.Cond{"hub_id": 3})
// Don't reassign
- sq.And(db.Cond{"role": []int{1, 2}})
+ _ = sq.And(db.Cond{"role": []int{1, 2}})
assert.Equal(
`SELECT "user_id" FROM "user_access" WHERE ("hub_id" = $1)`,
diff --git a/postgresql/collection.go b/postgresql/collection.go
index 2a66fc50..fb6f89b4 100644
--- a/postgresql/collection.go
+++ b/postgresql/collection.go
@@ -102,7 +102,7 @@ func (t *table) Insert(item interface{}) (interface{}, error) {
}
// Asking the database to return the primary key after insertion.
- q.Returning(pKey...)
+ q = q.Returning(pKey...)
var keyMap db.Cond
if err = q.Iterator().One(&keyMap); err != nil {
--
GitLab