Merge pull request #665 from mjtrangoni/fix-gometalinter-issues

Fix gometalinter issues

5 files changed, 8 insertions, 13 deletions

diff --git a/sqlite3.go b/sqlite3.go
index d75e8b0..f2c2053 100644
--- a/sqlite3.go
+++ b/sqlite3.go
@@ -1376,7 +1376,7 @@ func (d *SQLiteDriver) Open(dsn string) (driver.Conn, error) {
 	//  - Activate User Authentication
 	//		Check if the user wants to activate User Authentication.
 	//		If so then first create a temporary AuthConn to the database
-	//		This is possible because we are already succesfully authenticated.
+	//		This is possible because we are already successfully authenticated.
 	//
 	//	- Check if `sqlite_user`` table exists
 	//		YES				=> Add the provided user from DSN as Admin User and
@@ -1387,7 +1387,7 @@ func (d *SQLiteDriver) Open(dsn string) (driver.Conn, error) {
 	// Create connection to SQLite
 	conn := &SQLiteConn{db: db, loc: loc, txlock: txlock}
 
-	// Password Cipher has to be registerd before authentication
+	// Password Cipher has to be registered before authentication
 	if len(authCrypt) > 0 {
 		switch strings.ToUpper(authCrypt) {
 		case "SHA1":
diff --git a/sqlite3_func_crypt.go b/sqlite3_func_crypt.go
index d397c8c..afd9333 100644
--- a/sqlite3_func_crypt.go
+++ b/sqlite3_func_crypt.go
@@ -13,7 +13,7 @@ import (
 
 // This file provides several different implementations for the
 // default embedded sqlite_crypt function.
-// This function is uses a ceasar-cypher by default
+// This function is uses a caesar-cypher by default
 // and is used within the UserAuthentication module to encode
 // the password.
 //
@@ -40,7 +40,7 @@ import (
 // password X, sqlite_crypt(X,NULL) is run.  A new random salt is selected
 // when the second argument is NULL.
 //
-// The built-in version of of sqlite_crypt() uses a simple Ceasar-cypher
+// The built-in version of of sqlite_crypt() uses a simple Caesar-cypher
 // which prevents passwords from being revealed by searching the raw database
 // for ASCII text, but is otherwise trivally broken.  For better password
 // security, the database should be encrypted using the SQLite Encryption
diff --git a/sqlite3_opt_userauth_test.go b/sqlite3_opt_userauth_test.go
index b4ac4a9..df65215 100644
--- a/sqlite3_opt_userauth_test.go
+++ b/sqlite3_opt_userauth_test.go
@@ -447,13 +447,13 @@ func TestUserAuthModifyUser(t *testing.T) {
 		t.Fatal(err)
 	}
 	if rv != SQLITE_AUTH {
-		t.Fatal("Password change succesful while not allowed")
+		t.Fatal("Password change successful while not allowed")
 	}
 
 	// Modify other user password and flag through *SQLiteConn
 	err = c2.AuthUserChange("user2", "invalid", false)
 	if err != ErrAdminRequired {
-		t.Fatal("Password change succesful while not allowed")
+		t.Fatal("Password change successful while not allowed")
 	}
 }
 
diff --git a/sqlite3_test.go b/sqlite3_test.go
index b295ddd..a67cf42 100644
--- a/sqlite3_test.go
+++ b/sqlite3_test.go
@@ -1299,10 +1299,7 @@ func TestAggregatorRegistration(t *testing.T) {
 
 	sql.Register("sqlite3_AggregatorRegistration", &SQLiteDriver{
 		ConnectHook: func(conn *SQLiteConn) error {
-			if err := conn.RegisterAggregator("customSum", customSum, true); err != nil {
-				return err
-			}
-			return nil
+			return conn.RegisterAggregator("customSum", customSum, true)
 		},
 	})
 	db, err := sql.Open("sqlite3_AggregatorRegistration", ":memory:")
diff --git a/upgrade/package.go b/upgrade/package.go
index 2b12a77..895bc73 100644
--- a/upgrade/package.go
+++ b/upgrade/package.go
@@ -1,6 +1,4 @@
-// Package upgrade
-//
-// Dummy to ensure package can be loaded
+// Package upgrade is a dummy package to ensure package can be loaded
 //
 // This file is to avoid the following error:
 // can't load package: package go-sqlite3/upgrade: build constraints exclude all Go files in go-sqlite3\upgrade