From b5db07738d18b867c8e12d2ff1246f8b344aedb5 Mon Sep 17 00:00:00 2001
From: Andrey Nehaychik <andrey.nehaychik@vizor-games.com>
Date: Wed, 26 Sep 2018 15:22:03 +0300
Subject: [PATCH 1/2] Correct work RecordNotFound for RAW SQL

---
 main.go | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/main.go b/main.go
index 17c75ed3..02f44d84 100644
--- a/main.go
+++ b/main.go
@@ -530,9 +530,18 @@ func (s *DB) NewRecord(value interface{}) bool {
 
 // RecordNotFound check if returning ErrRecordNotFound error
 func (s *DB) RecordNotFound() bool {
-	for _, err := range s.GetErrors() {
-		if err == ErrRecordNotFound {
-			return true
+	if s.search.raw {
+		rows, err := s.Rows()
+		defer rows.Close()
+		if err != nil {
+			return false
+		}
+		return !rows.Next()
+	} else {
+		for _, err := range s.GetErrors() {
+			if err == ErrRecordNotFound {
+				return true
+			}
 		}
 	}
 	return false

From 1ab3bc5316bb90ef9286092e57edf1c160bdde4a Mon Sep 17 00:00:00 2001
From: Andrey Nehaychik <andrey.nehaychik@vizor-games.com>
Date: Thu, 27 Sep 2018 12:11:33 +0300
Subject: [PATCH 2/2] Use more correct code styleguide

---
 main.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/main.go b/main.go
index 02f44d84..b50665f0 100644
--- a/main.go
+++ b/main.go
@@ -537,13 +537,14 @@ func (s *DB) RecordNotFound() bool {
 			return false
 		}
 		return !rows.Next()
-	} else {
-		for _, err := range s.GetErrors() {
-			if err == ErrRecordNotFound {
-				return true
-			}
+	}
+
+	for _, err := range s.GetErrors() {
+		if err == ErrRecordNotFound {
+			return true
 		}
 	}
+
 	return false
 }