one file test fix

Author: BrandonRoehl

dump.go

@@ -328,11 +328,11 @@ func (table *table) initColumnData() error {
 		case "Extra", "extra":
 			extraIndex = i
 		}
-		if fieldIndex > 0 && extraIndex > 0 {
+		if fieldIndex >= 0 && extraIndex >= 0 {
 			break
 		}
 	}
-	if fieldIndex <= 0 || extraIndex <= 0 {
+	if fieldIndex < 0 || extraIndex < 0 {
 		return errors.New("database column information is malformed")
 	}
 

go.mod

@@ -2,7 +2,6 @@ module github.com/jamf/go-mysqldump
 
 require (
 	github.com/DATA-DOG/go-sqlmock v1.5.0
-	github.com/go-sql-driver/mysql v1.5.0
 	github.com/stretchr/testify v1.7.0
 )
 

go.sum

@@ -2,8 +2,6 @@ github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20O
 github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
-github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=

mysqldump_test.go

@@ -42,7 +42,7 @@ CREATE TABLE 'Test_Table' (~id~ int(11) NOT NULL AUTO_INCREMENT,~email~ char(60)
 
 LOCK TABLES ~Test_Table~ WRITE;
 /*!40000 ALTER TABLE ~Test_Table~ DISABLE KEYS */;
-INSERT INTO ~Test_Table~ VALUES ('1',NULL,'Test Name 1'),('2','[email protected]','Test Name 2');
+INSERT INTO ~Test_Table~ (~id~, ~email~, ~name~) VALUES ('1',NULL,'Test Name 1'),('2','[email protected]','Test Name 2');
 /*!40000 ALTER TABLE ~Test_Table~ ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -66,6 +66,12 @@ func RunDump(t testing.TB, data *Data) {
 	showTablesRows := sqlmock.NewRows([]string{"Tables_in_Testdb"}).
 		AddRow("Test_Table")
 
+	showColumnsRows := sqlmock.NewRows([]string{"Field", "Type", "Null", "Key", "Default", "Extra"}).
+		AddRow("id", "int(11)", false, "", 0, "").
+		AddRow("email", "varchar(255)", true, "", nil, "").
+		AddRow("name", "varchar(255)", true, "", nil, "").
+		AddRow("hash", "varchar(255)", true, "", nil, "VIRTUAL GENERATED")
+
 	serverVersionRows := sqlmock.NewRows([]string{"Version()"}).
 		AddRow("test_version")
 
@@ -81,6 +87,7 @@ func RunDump(t testing.TB, data *Data) {
 	mock.ExpectQuery(`^SHOW TABLES$`).WillReturnRows(showTablesRows)
 	mock.ExpectExec("^LOCK TABLES `Test_Table` READ /\\*!32311 LOCAL \\*/$").WillReturnResult(sqlmock.NewResult(1, 1))
 	mock.ExpectQuery("^SHOW CREATE TABLE `Test_Table`$").WillReturnRows(createTableRows)
+	mock.ExpectQuery("^SHOW COLUMNS FROM `Test_Table`$").WillReturnRows(showColumnsRows)
 	mock.ExpectQuery("^SELECT (.+) FROM `Test_Table`$").WillReturnRows(createTableValueRows)
 	mock.ExpectRollback()
 
@@ -116,6 +123,11 @@ func TestNoLockOk(t *testing.T) {
 	showTablesRows := sqlmock.NewRows([]string{"Tables_in_Testdb"}).
 		AddRow("Test_Table")
 
+	showColumnsRows := sqlmock.NewRows([]string{"Field", "Type", "Null", "Key", "Default", "Extra"}).
+		AddRow("id", "int(11)", false, "", 0, "").
+		AddRow("email", "varchar(255)", true, "", nil, "").
+		AddRow("name", "varchar(255)", true, "", nil, "")
+
 	serverVersionRows := sqlmock.NewRows([]string{"Version()"}).
 		AddRow("test_version")
 
@@ -130,6 +142,7 @@ func TestNoLockOk(t *testing.T) {
 	mock.ExpectQuery(`^SELECT version\(\)$`).WillReturnRows(serverVersionRows)
 	mock.ExpectQuery(`^SHOW TABLES$`).WillReturnRows(showTablesRows)
 	mock.ExpectQuery("^SHOW CREATE TABLE `Test_Table`$").WillReturnRows(createTableRows)
+	mock.ExpectQuery("^SHOW COLUMNS FROM `Test_Table`$").WillReturnRows(showColumnsRows)
 	mock.ExpectQuery("^SELECT (.+) FROM `Test_Table`$").WillReturnRows(createTableValueRows)
 	mock.ExpectRollback()