bigquery: restore semantics of ForceZeroQuote

Originally, ForceZeroQuote == true was sufficient to set the quote character for CSV loading to '"'. on 2016-9-27, the logic was modified incorrectly, so that both ForceZeroQuote == true and Quote == "" were necessary. This CL restores the original semantics. Change-Id: I790a5567085255f37064a38f8623109128c4a7f5 Reviewed-on: https://code-review.googlesource.com/8995 Reviewed-by: Michael McGreevy <[email protected]>
googleapis · Oct 31, 2016 · 7ee19e7 · 7ee19e7
1 parent f7f94a2
commit 7ee19e7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/bigquery/file.go b/bigquery/file.go
@@ -87,15 +87,19 @@ type FileConfig struct {
 	// default quotation character is the double quote ("), which is used if
 	// both Quote and ForceZeroQuote are unset.
 	// To specify that no character should be interpreted as a quotation
-	// character, set ForceZeroQuote to true and leave Quote unset.
+	// character, set ForceZeroQuote to true.
 	// Only used when reading data.
 	Quote          string
 	ForceZeroQuote bool
 }
 
 // quote returns the CSV quote character, or nil if unset.
 func (fc *FileConfig) quote() *string {
-	if !fc.ForceZeroQuote && fc.Quote == "" {
+	if fc.ForceZeroQuote {
+		quote := ""
+		return &quote
+	}
+	if fc.Quote == "" {
 		return nil
 	}
 	return &fc.Quote

diff --git a/bigquery/file_test.go b/bigquery/file_test.go
@@ -33,7 +33,7 @@ func TestQuote(t *testing.T) {
 		{"", false, nil},
 		{"", true, ptr("")},
 		{"-", false, ptr("-")},
-		{"-", true, ptr("-")}, // force ignored if quote is non-nil
+		{"-", true, ptr("")},
 	} {
 		fc := FileConfig{
 			Quote:          test.quote,
@@ -44,7 +44,7 @@ func TestQuote(t *testing.T) {
 			t.Errorf("%+v\ngot %v\nwant %v", test, pretty.Value(got), pretty.Value(test.want))
 		}
 		if got != nil && test.want != nil && *got != *test.want {
-			t.Errorf("%+v: got %q, want %q", test, got, test.want)
+			t.Errorf("%+v: got %q, want %q", test, *got, *test.want)
 		}
 	}
 }