From c086e7386120d4570853a6db71e5fda658f89a62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Carlos=20Nieto?= <jose.carlos@menteslibres.net>
Date: Sun, 9 Aug 2015 08:26:26 -0500
Subject: [PATCH] prepareStatement() must return the generated query for
debugging purposes even if the query contains a syntax error.
---
mysql/database.go | 2 +-
postgresql/database.go | 2 +-
ql/database.go | 2 +-
sqlite/database.go | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/mysql/database.go b/mysql/database.go
index 85fd6a68..f69f6050 100644
--- a/mysql/database.go
+++ b/mysql/database.go
@@ -89,7 +89,7 @@ func (d *database) prepareStatement(stmt *sqlgen.Statement) (p *sqlx.Stmt, query
}
if err != nil {
- return nil, "", err
+ return nil, query, err
}
d.cachedStatements.Write(stmt, &cachedStatement{p, query})
diff --git a/postgresql/database.go b/postgresql/database.go
index b8048a92..5310764d 100644
--- a/postgresql/database.go
+++ b/postgresql/database.go
@@ -91,7 +91,7 @@ func (d *database) prepareStatement(stmt *sqlgen.Statement) (p *sqlx.Stmt, query
}
if err != nil {
- return nil, "", err
+ return nil, query, err
}
d.cachedStatements.Write(stmt, &cachedStatement{p, query})
diff --git a/ql/database.go b/ql/database.go
index e091fe7b..75593c9e 100644
--- a/ql/database.go
+++ b/ql/database.go
@@ -90,7 +90,7 @@ func (d *database) prepareStatement(stmt *sqlgen.Statement) (p *sqlx.Stmt, query
}
if err != nil {
- return nil, "", err
+ return nil, query, err
}
d.cachedStatements.Write(stmt, &cachedStatement{p, query})
diff --git a/sqlite/database.go b/sqlite/database.go
index f725a861..c2482bfa 100644
--- a/sqlite/database.go
+++ b/sqlite/database.go
@@ -95,7 +95,7 @@ func (d *database) prepareStatement(stmt *sqlgen.Statement) (p *sqlx.Stmt, query
}
if err != nil {
- return nil, "", err
+ return nil, query, err
}
d.cachedStatements.Write(stmt, &cachedStatement{p, query})
--
GitLab