re-order types

stephenplusplus · stephenplusplus · commit 4616c598fc45 · 2016-12-06T12:33:34.000-05:00
diff --git a/packages/bigquery/src/index.js b/packages/bigquery/src/index.js
@@ -185,36 +185,36 @@ BigQuery.prototype.time = function(value) {
  * @return {string} - The type detected from the value.
  */
 BigQuery.getType_ = function(value) {
-  if (is.number(value)) {
-    return value % 1 === 0 ? 'INT64' : 'FLOAT64';
+  if (value instanceof BigQuery.datetime) {
+    return 'DATETIME';
   }
 
-  if (is.bool(value)) {
-    return 'BOOL';
+  if (value instanceof BigQuery.time) {
+    return 'TIME';
   }
 
-  if (is.date(value)) {
-    return 'TIMESTAMP';
+  if (value instanceof Buffer) {
+    return 'BYTES';
   }
 
   if (is.array(value)) {
     return 'ARRAY';
   }
 
-  if (value instanceof BigQuery.datetime) {
-    return 'DATETIME';
+  if (is.bool(value)) {
+    return 'BOOL';
   }
 
-  if (value instanceof BigQuery.time) {
-    return 'TIME';
+  if (is.date(value)) {
+    return 'TIMESTAMP';
   }
 
-  if (is.object(value)) {
-    return 'STRUCT';
+  if (is.number(value)) {
+    return value % 1 === 0 ? 'INT64' : 'FLOAT64';
   }
 
-  if (value instanceof Buffer) {
-    return 'BYTES';
+  if (is.object(value)) {
+    return 'STRUCT';
   }
 
   return 'STRING';
diff --git a/packages/bigquery/test/index.js b/packages/bigquery/test/index.js
@@ -236,15 +236,15 @@ describe('BigQuery', function() {
 
   describe('getType_', function() {
     it('should return correct types', function() {
-      assert.strictEqual(BigQuery.getType_(8), 'INT64');
-      assert.strictEqual(BigQuery.getType_(8.1), 'FLOAT64');
-      assert.strictEqual(BigQuery.getType_(true), 'BOOL');
-      assert.strictEqual(BigQuery.getType_(new Date()), 'TIMESTAMP');
-      assert.strictEqual(BigQuery.getType_([]), 'ARRAY');
       assert.strictEqual(BigQuery.getType_(bq.datetime()), 'DATETIME');
       assert.strictEqual(BigQuery.getType_(bq.time()), 'TIME');
-      assert.strictEqual(BigQuery.getType_({}), 'STRUCT');
       assert.strictEqual(BigQuery.getType_(new Buffer(2)), 'BYTES');
+      assert.strictEqual(BigQuery.getType_([]), 'ARRAY');
+      assert.strictEqual(BigQuery.getType_(true), 'BOOL');
+      assert.strictEqual(BigQuery.getType_(new Date()), 'TIMESTAMP');
+      assert.strictEqual(BigQuery.getType_(8), 'INT64');
+      assert.strictEqual(BigQuery.getType_(8.1), 'FLOAT64');
+      assert.strictEqual(BigQuery.getType_({}), 'STRUCT');
       assert.strictEqual(BigQuery.getType_('hi'), 'STRING');
     });
   });

Original file line number	Diff line number	Diff line change
`@@ -185,36 +185,36 @@ BigQuery.prototype.time = function(value) {`
`185`	`185`	`* @return {string} - The type detected from the value.`
`186`	`186`	`*/`
`187`	`187`	`BigQuery.getType_ = function(value) {`
`188`		`- if (is.number(value)) {`
`189`		`- return value % 1 === 0 ? 'INT64' : 'FLOAT64';`
	`188`	`+ if (value instanceof BigQuery.datetime) {`
	`189`	`+ return 'DATETIME';`
`190`	`190`	`}`
`191`	`191`
`192`		`- if (is.bool(value)) {`
`193`		`- return 'BOOL';`
	`192`	`+ if (value instanceof BigQuery.time) {`
	`193`	`+ return 'TIME';`
`194`	`194`	`}`
`195`	`195`
`196`		`- if (is.date(value)) {`
`197`		`- return 'TIMESTAMP';`
	`196`	`+ if (value instanceof Buffer) {`
	`197`	`+ return 'BYTES';`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`if (is.array(value)) {`
`201`	`201`	`return 'ARRAY';`
`202`	`202`	`}`
`203`	`203`
`204`		`- if (value instanceof BigQuery.datetime) {`
`205`		`- return 'DATETIME';`
	`204`	`+ if (is.bool(value)) {`
	`205`	`+ return 'BOOL';`
`206`	`206`	`}`
`207`	`207`
`208`		`- if (value instanceof BigQuery.time) {`
`209`		`- return 'TIME';`
	`208`	`+ if (is.date(value)) {`
	`209`	`+ return 'TIMESTAMP';`
`210`	`210`	`}`
`211`	`211`
`212`		`- if (is.object(value)) {`
`213`		`- return 'STRUCT';`
	`212`	`+ if (is.number(value)) {`
	`213`	`+ return value % 1 === 0 ? 'INT64' : 'FLOAT64';`
`214`	`214`	`}`
`215`	`215`
`216`		`- if (value instanceof Buffer) {`
`217`		`- return 'BYTES';`
	`216`	`+ if (is.object(value)) {`
	`217`	`+ return 'STRUCT';`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`return 'STRING';`