From 41a660ba8fe16385de89c956ff3b99348dc9b20a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Carlos=20Nieto?= <jose.carlos@menteslibres.net>
Date: Sat, 23 May 2015 09:40:16 -0500
Subject: [PATCH] Fixing nil reference.
---
util/sqlgen/group_by.go | 4 +++-
util/sqlgen/order_by.go | 6 ++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/util/sqlgen/group_by.go b/util/sqlgen/group_by.go
index 03762a58..fe8ed3f3 100644
--- a/util/sqlgen/group_by.go
+++ b/util/sqlgen/group_by.go
@@ -17,7 +17,9 @@ type groupByT struct {
// Hash returns a unique identifier.
func (g *GroupBy) Hash() string {
if g.hash == "" {
- g.hash = fmt.Sprintf(`GroupBy(%s)`, g.Columns.Hash())
+ if g.Columns != nil {
+ g.hash = fmt.Sprintf(`GroupBy(%s)`, g.Columns.Hash())
+ }
}
return g.hash
}
diff --git a/util/sqlgen/order_by.go b/util/sqlgen/order_by.go
index edaa78f0..d437cde3 100644
--- a/util/sqlgen/order_by.go
+++ b/util/sqlgen/order_by.go
@@ -35,7 +35,7 @@ type SortColumns struct {
// OrderBy represents an ORDER BY clause.
type OrderBy struct {
- SortColumns *SortColumns
+ SortColumns Fragment
hash string
}
@@ -115,7 +115,9 @@ func (s *SortColumns) Compile(layout *Template) (compiled string) {
// Hash returns a unique identifier.
func (s *OrderBy) Hash() string {
if s.hash == "" {
- s.hash = `OrderBy(` + s.SortColumns.Hash() + `)`
+ if s.SortColumns != nil {
+ s.hash = `OrderBy(` + s.SortColumns.Hash() + `)`
+ }
}
return s.hash
}
--
GitLab