From 292359f1aa3ed643d6fff840054404656e487e4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Carlos=20Nieto?= <jose.carlos@menteslibres.net>
Date: Thu, 12 Jun 2014 13:42:16 -0500
Subject: [PATCH] Updating sqlgen calls.
---
mysql/database.go | 12 +++++++-----
mysql/result.go | 4 ++--
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/mysql/database.go b/mysql/database.go
index 378affda..7730534e 100644
--- a/mysql/database.go
+++ b/mysql/database.go
@@ -43,6 +43,8 @@ var (
TimeFormat = "%d:%02d:%02d.%03d"
)
+var template *sqlgen.Template
+
var (
columnPattern = regexp.MustCompile(`^([a-z]+)\(?([0-9,]+)?\)?\s?([a-z]*)?`)
sqlPlaceholder = sqlgen.Value{sqlgen.Raw{`?`}}
@@ -69,7 +71,7 @@ func debugEnabled() bool {
func init() {
- sqlgen.SetTemplate(sqlgen.Template{
+ template = &sqlgen.Template{
mysqlColumnSeparator,
mysqlIdentifierSeparator,
mysqlIdentifierQuote,
@@ -97,7 +99,7 @@ func init() {
mysqlDropDatabaseLayout,
mysqlDropTableLayout,
mysqlSelectCountLayout,
- })
+ }
db.Register(Driver, &Source{})
}
@@ -108,7 +110,7 @@ func (self *Source) doExec(stmt sqlgen.Statement, args ...interface{}) (sql.Resu
return nil, db.ErrNotConnected
}
- query := stmt.Compile()
+ query := stmt.Compile(template)
if debugEnabled() == true {
sqlutil.DebugQuery(query, args)
@@ -126,7 +128,7 @@ func (self *Source) doQuery(stmt sqlgen.Statement, args ...interface{}) (*sql.Ro
return nil, db.ErrNotConnected
}
- query := stmt.Compile()
+ query := stmt.Compile(template)
if debugEnabled() == true {
sqlutil.DebugQuery(query, args)
@@ -144,7 +146,7 @@ func (self *Source) doQueryRow(stmt sqlgen.Statement, args ...interface{}) (*sql
return nil, db.ErrNotConnected
}
- query := stmt.Compile()
+ query := stmt.Compile(template)
if debugEnabled() == true {
sqlutil.DebugQuery(query, args)
diff --git a/mysql/result.go b/mysql/result.go
index 0564f8f9..1f4b3a89 100644
--- a/mysql/result.go
+++ b/mysql/result.go
@@ -28,7 +28,7 @@ import (
"upper.io/db/util/sqlgen"
)
-type counter struct {
+type counter_t struct {
Total uint64 `db:"_t"`
}
@@ -239,7 +239,7 @@ func (self *Result) Count() (uint64, error) {
defer rows.Close()
- dst := counter{}
+ dst := counter_t{}
self.table.T.FetchRow(&dst, rows)
return dst.Total, nil
--
GitLab