From 7eb06fc0d5a4827a28b0631280e92084adc2ac2f Mon Sep 17 00:00:00 2001
From: Nurahmadie <nurahmadie@gmail.com>
Date: Sun, 16 Mar 2014 11:28:55 +0700
Subject: [PATCH] Use NullString instead of checking for error.

---
 pkg/database/migrate/sqlite.go | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkg/database/migrate/sqlite.go b/pkg/database/migrate/sqlite.go
index 3b14189dc..99264b92a 100644
--- a/pkg/database/migrate/sqlite.go
+++ b/pkg/database/migrate/sqlite.go
@@ -326,16 +326,13 @@ func (s *sqliteDriver) getIndexDefinition(tableName string) ([]string, error) {
 	}
 
 	for rows.Next() {
-		var sql string
+		var sql sql.NullString
 		if err := rows.Scan(&sql); err != nil {
-			// This error came from autoindex, since its sql value is null,
-			// we want to continue.
-			if strings.Contains(err.Error(), "Scan pair: <nil> -> *string") {
-				continue
-			}
 			return sqls, err
 		}
-		sqls = append(sqls, sql)
+		if sql.Valid {
+			sqls = append(sqls, sql.String)
+		}
 	}
 
 	if err := rows.Err(); err != nil {