bigquery: honor sourceFormat

stephenplusplus · stephenplusplus · commit 54caa6f1e9eb · 2016-10-24T14:59:43.000-04:00
diff --git a/packages/bigquery/src/table.js b/packages/bigquery/src/table.js
@@ -867,9 +867,8 @@ Table.prototype.import = function(source, metadata, callback) {
   callback = callback || common.util.noop;
   metadata = metadata || {};
 
-  var format = metadata.sourceFormat || metadata.format;
-  if (format) {
-    metadata.sourceFormat = FORMATS[format.toLowerCase()];
+  if (metadata.format) {
+    metadata.sourceFormat = FORMATS[metadata.format.toLowerCase()];
     delete metadata.format;
   }
 
diff --git a/packages/bigquery/test/table.js b/packages/bigquery/test/table.js
@@ -1095,11 +1095,13 @@ describe('BigQuery/Table', function() {
     it('should not override a provided format with a File', function(done) {
       table.bigQuery.request = function(reqOpts) {
         var sourceFormat = reqOpts.json.configuration.load.sourceFormat;
-        assert.equal(sourceFormat, 'CSV');
+        assert.equal(sourceFormat, 'NEWLINE_DELIMITED_JSON');
         done();
       };
 
-      table.import(FILE, { sourceFormat: 'CSV' }, assert.ifError);
+      table.import(FILE, {
+        sourceFormat: 'NEWLINE_DELIMITED_JSON'
+      }, assert.ifError);
     });
 
     it('should execute the callback with error', function(done) {
