diff --git a/mysql/database.go b/mysql/database.go
index 85fd6a68f68c49585ea2175b0e9ec746999ac668..f69f6050b239e969a3549f04394d016463dc5443 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 b8048a92c0819656d7ee7cc58083bb28ca5b528e..5310764dbe026d3e67a6745007c0ecde5dfdb8f2 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 e091fe7b35df696a42ddebedeffb57c10b464973..75593c9e9bd2f4c656338dce49ff10b20586c219 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 f725a86168ffdbbded7fdbdf0cf72c879b19cbd2..c2482bfad8a6a8b179e7e33ba481434dac9870fc 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})