new version of jshint caught some new issues, fixing issues

Di Wu · Di Wu · commit ba9823d18869 · 2013-07-28T01:33:57.000-07:00
diff --git a/.jshintrc b/.jshintrc
@@ -1,3 +1,10 @@
 {
-  "node": true
+  "node": true,
+  "globals": {
+    "describe" : true,
+    "it"       : true,
+    "Node"     : true,
+    "suite"    : true,
+    "test"     : true
+  }
 }
diff --git a/lib/column.js b/lib/column.js
@@ -8,8 +8,10 @@ var valueExpressionMixin = require('./node/valueExpression');
 
 var Column = function(config) {
   this.table = config.table;
-  for(var name in config) {
-    this[name] = config[name];
+  for (var name in config) {
+    if (config.hasOwnProperty(name)) {
+      this[name] = config[name];
+    }
   }
   this.asc = this.ascending = this;
   this.alias = null;
diff --git a/lib/dialect/index.js b/lib/dialect/index.js
@@ -1,3 +1,5 @@
+'use strict';
+
 // given a dialect name, return the class
 var getDialect = function(dialect) {
   switch (dialect.toLowerCase()) {
diff --git a/lib/dialect/mysql.js b/lib/dialect/mysql.js
@@ -48,7 +48,9 @@ Mysql.prototype.visitRenameColumn = function(renameColumn) {
 
 Mysql.prototype.visitInsert = function(insert) {
   var result = Postgres.prototype.visitInsert.call(this, insert);
-  if (result[2] === 'DEFAULT VALUES') result[2] = '() VALUES ()';
+  if (result[2] === 'DEFAULT VALUES') {
+    result[2] = '() VALUES ()';
+  }
   return result;
 };
 
diff --git a/lib/dialect/postgres.js b/lib/dialect/postgres.js
@@ -59,6 +59,7 @@ Postgres.prototype._getParameterValue = function(value) {
 };
 
 Postgres.prototype._getParameterPlaceholder = function(index, value) {
+  /* jshint unused: false */
   return '$' + index;
 };
 
@@ -245,8 +246,6 @@ Postgres.prototype.visitAlter = function(alter) {
   this._visitingAlter = true;
   // don't auto-generate from clause
   var table = this._queryNode.table;
-  // TODO: col_nodes is unused?
-  var col_nodes = table.columns.map(function(col) { return col.toNode(); });
   var result = [
     'ALTER TABLE',
     this.visit(table.toNode()),
@@ -508,6 +507,7 @@ Postgres.prototype.visitParameter = function(parameter) {
 };
 
 Postgres.prototype.visitDefault = function(parameter) {
+  /* jshint unused: false */
   return ['DEFAULT'];
 };
 
@@ -557,6 +557,7 @@ Postgres.prototype.visitModifier = function(node) {
 };
 
 Postgres.prototype.visitIndexes = function(node) {
+  /* jshint unused: false */
   var tableName = this.visit(this._queryNode.table.toNode());
 
   return [
diff --git a/lib/joiner.js b/lib/joiner.js
@@ -1,19 +1,21 @@
+'use strict';
+
 var getPrimaryKeyColumn = function(table) {
-  for(var i = 0; i < table.columns.length; i++) {
+  for (var i = 0; i < table.columns.length; i++) {
     var col = table.columns[i];
-    if(col.primaryKey) {
+    if (col.primaryKey) {
       return col;
     }
   }
 };
 
 var findReference = function(left, right) {
   // find reference
-  for(var i = 0; i < right.columns.length; i++) {
+  for (var i = 0; i < right.columns.length; i++) {
     var col = right.columns[i];
-    if(col.references) {
+    if (col.references) {
       var leftName = left.getName();
-      if(col.references == leftName || col.references.table == leftName) {
+      if (col.references === leftName || col.references.table === leftName) {
         var leftCol = left[col.references.column] || getPrimaryKeyColumn(left);
         return {
           left: leftCol,
@@ -29,9 +31,8 @@ module.exports = {
   // requires one column to have { references: {table: 'foreignTableName', column: 'foreignColumnName'}}
   // or to have { references: 'foreignTableName'} -- in which case the foreign table's primary key is assumed
   leftJoin: function(left, right) {
-    var leftCol, rightCol;
     var ref = findReference(left, right);
-    if(!ref) {
+    if (!ref) {
       ref = findReference(right, left);
     }
     return left.join(right).on(ref.left.equals(ref.right));
diff --git a/lib/node/index.js b/lib/node/index.js
@@ -1,12 +1,11 @@
 'use strict';
 
-var _          = require('lodash');
 var assert     = require('assert');
 var getDialect = require('../dialect');
 var util       = require('util');
 
-/* jshint unused: false */
 var Node = function(type) {
+  /* jshint unused: false */
   this.nodes = [];
 };
 
@@ -62,12 +61,14 @@ Node.define = function(def) {
     Node.call(this);
   };
   // allow custom sub-class constructor
-  if(def.constructor && def.constructor != {}.constructor) {
+  if(def.constructor && def.constructor !== {}.constructor) {
     c = def.constructor;
   }
   util.inherits(c, Node);
-  for(var key in def) {
-    c.prototype[key] = def[key];
+  for (var key in def) {
+    if (def.hasOwnProperty(key)) {
+      c.prototype[key] = def[key];
+    }
   }
   return c;
 };
diff --git a/lib/node/indexes.js b/lib/node/indexes.js
@@ -1,7 +1,8 @@
 'use strict';
 
 var Node = require('./');
-var IndexesNode = module.exports = Node.define({
+
+var IndexesNode  = Node.define({
   type: 'INDEXES',
 
   constructor: function(table) {
@@ -10,3 +11,5 @@ var IndexesNode = module.exports = Node.define({
     this.table = table;
   }
 });
+
+module.exports = IndexesNode;
diff --git a/lib/node/orderByColumn.js b/lib/node/orderByColumn.js
@@ -1,11 +1,13 @@
 'use strict';
 
 var Node = require(__dirname);
-var OrderByColumn = module.exports = Node.define({
+var OrderByColumn = Node.define({
   type: 'ORDER BY COLUMN',
   constructor: function(config) {
     Node.call(this);
     this.column = config.column;
     this.direction = config.direction;
   }
 });
+
+ module.exports = OrderByColumn;
diff --git a/lib/node/query.js b/lib/node/query.js
@@ -52,7 +52,9 @@ var Query = Node.define({
   constructor: function(table) {
     Node.call(this);
     this.table = table;
-    if (table) this.sql = table.sql;
+    if (table) {
+      this.sql = table.sql;
+    }
   },
   select: function() {
     var select;
@@ -101,7 +103,9 @@ var Query = Node.define({
       return this;
     }
     // calling #where twice functions like calling #where & then #and
-    if (this.whereClause) return this.and(node);
+    if (this.whereClause) {
+      return this.and(node);
+    }
     this.whereClause = new Where(this.table);
     this.whereClause.add(node);
     return this.add(this.whereClause);
@@ -141,7 +145,7 @@ var Query = Node.define({
 
     var args = sliced(arguments);
     // object literal
-    if (arguments.length == 1 && !o.toNode && !o.forEach) {
+    if (arguments.length === 1 && !o.toNode && !o.forEach) {
       args = Object.keys(o).map(function(key) {
         return self.table.get(key).value(o[key]);
       });
diff --git a/lib/node/valueExpression.js b/lib/node/valueExpression.js
@@ -1,7 +1,5 @@
 'use strict';
 
-var _             = require('lodash');
-var Node          = require(__dirname);
 var ParameterNode = require(__dirname + '/parameter');
 
 // Process values, wrapping them in ParameterNode if necessary.
@@ -12,7 +10,7 @@ var processParams = function(val) {
 // Value expressions can be composed to form new value expressions.
 // ValueExpressionMixin is evaluated at runtime, hence the
 // "thunk" around it.
-var ValueExpressionMixin = module.exports = function() {
+var ValueExpressionMixin = function() {
   var PostfixUnaryNode   = require(__dirname + '/postfixUnary');
   var BinaryNode  = require(__dirname + '/binary');
   var TernaryNode = require(__dirname + '/ternary');
@@ -52,7 +50,7 @@ var ValueExpressionMixin = module.exports = function() {
 
   var castMethod = function(dataType) {
     return new CastNode(this.toNode(), dataType);
-  }
+  };
 
   return {
     isNull     : postfixUnaryMethod('IS NULL'),
@@ -86,3 +84,5 @@ var ValueExpressionMixin = module.exports = function() {
     cast       : castMethod
   };
 };
+
+module.exports = ValueExpressionMixin;
diff --git a/lib/node/where.js b/lib/node/where.js
@@ -6,18 +6,21 @@ var TextNode = require(__dirname + '/text');
 
 var normalizeNode = function(table, node) {
   var result = node;
-  if(typeof node == 'string') {
+  if(typeof node === 'string') {
     result = new TextNode('(' + node + ')');
   }
-  else if (!node.toNode && typeof node == 'object'){
+  else if (!node.toNode && typeof node === 'object'){
     result = false;
     for (var colName in node) {
-      var column = table.getColumn(colName);
-      var query = column.equals(node[colName]);
-      if (!result)
-        result = query;
-      else
-        result = result.and(query);
+      if (node.hasOwnProperty(colName)) {
+        var column = table.getColumn(colName);
+        var query = column.equals(node[colName]);
+        if (!result) {
+          result = query;
+        } else {
+          result = result.and(query);
+        }
+      }
     }
   }
   return result;
diff --git a/lib/table.js b/lib/table.js
@@ -15,20 +15,24 @@ var Table = function(config) {
   this._initialConfig = config;
   this.columns = [];
   this.table = this;
-  if (!config.sql) config.sql = require('./index');
+  if (!config.sql) {
+    config.sql = require('./index');
+  }
   this.sql = config.sql;
 };
 
 Table.define = function(config) {
   var table = new Table(config);
   // allow hash of columns as well as array
-  if(config.columns && !util.isArray(config.columns)) {
+  if (config.columns && !util.isArray(config.columns)) {
     var cols = [];
 
-    for(var key in config.columns) {
-      var col = config.columns[key];
-      col.name = key;
-      cols.push(col);
+    for (var key in config.columns) {
+      if (config.columns.hasOwnProperty(key)) {
+        var col = config.columns[key];
+        col.name = key;
+        cols.push(col);
+      }
     }
 
     config.columns = cols;
@@ -89,7 +93,7 @@ Table.prototype.get =
 function(colName) {
   for(var i = 0; i < this.columns.length; i++) {
     var col = this.columns[i];
-    if(col.name == colName) {
+    if (col.name === colName) {
       return col;
     }
   }
diff --git a/test/binary-clause-tests.js b/test/binary-clause-tests.js
@@ -1,4 +1,3 @@
-/* global test */
 'use strict';
 
 var assert = require('assert');
diff --git a/test/clause-definition.js b/test/clause-definition.js
@@ -1,4 +1,3 @@
-/* global test */
 'use strict';
 
 var assert = require('assert');
diff --git a/test/column-tests.js b/test/column-tests.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var assert = require('assert');
 var sql = require(__dirname + '/../lib');
 
diff --git a/test/dialects/aggregate-tests.js b/test/dialects/aggregate-tests.js
@@ -1,7 +1,5 @@
-/* global test */
 'use strict';
 
-var assert = require('assert');
 var Harness = require('./support');
 var post = Harness.definePostTable();
 
diff --git a/test/dialects/alias-tests.js b/test/dialects/alias-tests.js
@@ -2,8 +2,6 @@
 
 var Harness = require('./support');
 var customer = Harness.defineCustomerTable();
-var post = Harness.definePostTable();
-var Table = require(__dirname + '/../../lib/table');
 
 Harness.test({
   query: customer.select(customer.name.isNull().as('nameIsNull')),
diff --git a/test/dialects/binary-clause-tests.js b/test/dialects/binary-clause-tests.js
@@ -3,7 +3,6 @@
 var Harness = require('./support');
 var customer = Harness.defineCustomerTable();
 var post = Harness.definePostTable();
-var Table = require(__dirname + '/../../lib/table');
 
 Harness.test({
   query: customer.select(customer.name.plus(customer.age)),
diff --git a/test/dialects/cast-tests.js b/test/dialects/cast-tests.js
@@ -2,8 +2,6 @@
 
 var Harness = require('./support');
 var customer = Harness.defineCustomerTable();
-var post = Harness.definePostTable();
-var Table = require(__dirname + '/../../lib/table');
 
 // Cast columns.
 Harness.test({
diff --git a/test/dialects/subquery-tests.js b/test/dialects/subquery-tests.js
@@ -3,7 +3,6 @@
 var Harness = require('./support');
 var customer = Harness.defineCustomerTable();
 var user = Harness.defineUserTable();
-var Table = require('../../lib/table');
 var Sql = require('../../lib');
 
 Harness.test({
diff --git a/test/dialects/support.js b/test/dialects/support.js
@@ -1,4 +1,3 @@
-/* global test */
 'use strict';
 var assert = require('assert');
 
diff --git a/test/dialects/ternary-clause-tests.js b/test/dialects/ternary-clause-tests.js
@@ -3,7 +3,6 @@
 var Harness = require('./support');
 var customer = Harness.defineCustomerTable();
 var post = Harness.definePostTable();
-var Table = require(__dirname + '/../../lib/table');
 
 Harness.test({
   query: customer.select().where(customer.age.between(18, 25)),
diff --git a/test/dialects/tostring-tests.js b/test/dialects/tostring-tests.js
@@ -1,9 +1,8 @@
 'use strict';
 
-var assert        = require('assert');
-var Harness       = require('./support');
-var ParameterNode = require('../../lib/node/parameter');
-var post          = Harness.definePostTable();
+var assert  = require('assert');
+var Harness = require('./support');
+var post    = Harness.definePostTable();
 
 // Null
 Harness.test({
diff --git a/test/dialects/unary-clause-tests.js b/test/dialects/unary-clause-tests.js
diff --git a/test/function-tests.js b/test/function-tests.js
diff --git a/test/index-tests.js b/test/index-tests.js
diff --git a/test/select-tests.js b/test/select-tests.js
diff --git a/test/table-tests.js b/test/table-tests.js
diff --git a/test/ternary-clause-tests.js b/test/ternary-clause-tests.js
diff --git a/test/unary-clause-tests.js b/test/unary-clause-tests.js
diff --git a/test/value-expression-tests.js b/test/value-expression-tests.js

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,10 @@`
`1`	`1`	`{`
`2`		`- "node": true`
	`2`	`+ "node": true,`
	`3`	`+ "globals": {`
	`4`	`+ "describe" : true,`
	`5`	`+ "it" : true,`
	`6`	`+ "Node" : true,`
	`7`	`+ "suite" : true,`
	`8`	`+ "test" : true`
	`9`	`+ }`
`3`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+'use strict';`
	`2`	`+`
`1`	`3`	`// given a dialect name, return the class`
`2`	`4`	`var getDialect = function(dialect) {`
`3`	`5`	`switch (dialect.toLowerCase()) {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-/* global test */`
`2`	`1`	`'use strict';`
`3`	`2`
`4`	`3`	`var assert = require('assert');`