Ability to ignore tables

Author: BrandonRoehl

dump.go

@@ -275,16 +275,14 @@ func (data *Data) createTableValues(name string) (string, error) {
 		st := tp.ScanType()
 		if tp.DatabaseTypeName() == "BLOB" {
 			types[i] = reflect.TypeOf(sql.RawBytes{})
-		} else if st == nil || st.Kind() == reflect.Slice {
-			types[i] = reflect.TypeOf(sql.NullString{})
-		} else if st.Kind() == reflect.Int ||
+		} else if st != nil && (st.Kind() == reflect.Int ||
 			st.Kind() == reflect.Int8 ||
 			st.Kind() == reflect.Int16 ||
 			st.Kind() == reflect.Int32 ||
-			st.Kind() == reflect.Int64 {
+			st.Kind() == reflect.Int64) {
 			types[i] = reflect.TypeOf(sql.NullInt64{})
 		} else {
-			types[i] = st
+			types[i] = reflect.TypeOf(sql.NullString{})
 		}
 	}
 	values := make([]interface{}, len(tt))

dump_test.go

@@ -244,7 +244,7 @@ func TestCreateTableValuesNil(t *testing.T) {
 		t.Errorf("there were unfulfilled expections: %s", err)
 	}
 
-	expectedResult := "('1',null,'Test Name 1'),('2','[email protected]','Test Name 2'),('3','','Test Name 3')"
+	expectedResult := "('1',NULL,'Test Name 1'),('2','[email protected]','Test Name 2'),('3','','Test Name 3')"
 
 	if !reflect.DeepEqual(result, expectedResult) {
 		t.Fatalf("expected %#v, got %#v", expectedResult, result)
@@ -284,9 +284,9 @@ func TestCreateTableOk(t *testing.T) {
 	}
 
 	expectedResult := &table{
-		Name:   "Test_Table",
+		Name:   "`Test_Table`",
 		SQL:    "CREATE TABLE 'Test_Table' (`id` int(11) NOT NULL AUTO_INCREMENT,`s` char(60) DEFAULT NULL, PRIMARY KEY (`id`))ENGINE=InnoDB DEFAULT CHARSET=latin1",
-		Values: "('1',null,'Test Name 1'),('2','[email protected]','Test Name 2')",
+		Values: "('1',NULL,'Test Name 1'),('2','[email protected]','Test Name 2')",
 	}
 
 	if !reflect.DeepEqual(result, expectedResult) {

mysqldump_test.go

@@ -80,7 +80,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\ 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 */;