JSHint and formatting

.jshintrc

@@ -1,5 +1,6 @@
 {
   "asi": true,
+  "eqnull": true,
   "browser": false,
   "eqeqeq" : true,
   "newcap": false,

lib/client.js

@@ -108,7 +108,7 @@ assign(Client.prototype, {
 
   Raw: Raw,
 
-  raw: function(sql, bindings) {
+  raw: function() {
     var raw = new this.Raw(this)
     return raw.set.apply(raw, arguments)
   },
@@ -154,7 +154,7 @@ assign(Client.prototype, {
   poolDefaults: function(poolConfig) {
     var dispose, client = this
     if (poolConfig.destroy) {
-      deprecate('config.pool.destroy', 'config.pool.dispose')
+      helpers.deprecate('config.pool.destroy', 'config.pool.dispose')
       dispose = poolConfig.destroy
     }
     return {
@@ -203,7 +203,7 @@ assign(Client.prototype, {
   // returning a promise resolved when the connection is released.
   releaseConnection: function(connection) {
     var pool = this.pool
-    return new Promise(function(resolver, rejecter) {
+    return new Promise(function(resolver) {
       debug('releasing connection to pool: %s', connection.__knexUid)
       pool.release(connection)
       resolver()
@@ -213,7 +213,7 @@ assign(Client.prototype, {
   // Destroy the current connection pool for the client.
   destroy: function(callback) {
     var client = this
-    var promise = new Promise(function(resolver, rejecter) {
+    var promise = new Promise(function(resolver) {
       if (!client.pool) return resolver()
       client.pool.end(function() {
         client.pool = undefined

lib/dialects/maria/index.js

@@ -6,8 +6,9 @@ var inherits     = require('inherits')
 var assign       = require('lodash/object/assign')
 var Client_MySQL = require('../mysql')
 var Promise      = require('../../promise')
-
-var Mariasql;
+var SqlString    = require('../../query/string')
+var helpers      = require('../../helpers')
+var pluck        = require('lodash/collection/pluck');
 
 function Client_MariaSQL(config) {
   Client_MySQL.call(this, config)
@@ -62,7 +63,7 @@ assign(Client_MariaSQL.prototype, {
     return new Promise(function(resolver, rejecter) {
       if (!obj.sql) return resolver()
       var rows = [];
-      var query = connection.query(SqlString.format(sql, obj.bindings, false, tz), [])
+      var query = connection.query(SqlString.format(obj.sql, obj.bindings, false, tz), [])
       query.on('result', function(result) {
         result.on('row', rowHandler(function(row) { rows.push(row); }))
         .on('end', function(data) {
@@ -126,6 +127,4 @@ function rowHandler(callback) {
   };
 }
 
-Client_MariaSQL.__proto__ = Client_MySQL
-
 module.exports = Client_MariaSQL

lib/dialects/mysql/index.js

@@ -92,7 +92,7 @@ assign(Client_MySQL.prototype, {
 
   // Process the response as returned from the query.
   processResponse: function(obj, runner) {
-    if (obj == undefined) return;
+    if (obj == null) return;
     var response = obj.response
     var method   = obj.method
     var rows     = response[0]
@@ -127,6 +127,4 @@ function connectionErrorHandler(client, connection, err) {
   }
 }
 
-Client_MySQL.__proto__ = Client
-
 module.exports = Client_MySQL

lib/dialects/mysql/query/compiler.js

@@ -2,7 +2,6 @@
 
 // MySQL Query Compiler
 // ------
-var _             = require('lodash')
 var inherits      = require('inherits')
 var QueryCompiler = require('../../../query/compiler')
 var assign        = require('lodash/object/assign');

lib/dialects/mysql2/index.js

@@ -64,6 +64,4 @@ assign(Client_MySQL2.prototype, {
 
 })
 
-Client_MySQL2.__proto__ = Client_MySQL
-
 module.exports = Client_MySQL2;

lib/dialects/oracle/formatter.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var inherits        = require('inherits')
 var assign          = require('lodash/object/assign')
 var Formatter       = require('../../formatter')

lib/dialects/oracle/index.js

@@ -6,9 +6,9 @@ var _                 = require('lodash')
 var inherits          = require('inherits')
 var Client            = require('../../client')
 var Promise           = require('../../promise')
-var ReturningHelper   = require('./utils').ReturningHelper
 var Formatter         = require('./formatter')
 var assign            = require('lodash/object/assign')
+var helpers           = require('../../helpers')
 
 var Transaction       = require('./transaction')
 var QueryCompiler     = require('./query/compiler')
@@ -158,6 +158,4 @@ assign(Client_Oracle.prototype, {
 
 })
 
-Client_Oracle.__proto__ = Client
-
 module.exports = Client_Oracle

lib/dialects/oracle/query/compiler.js

@@ -33,7 +33,7 @@ assign(QueryCompiler_Oracle.prototype, {
       returning = [returning];
     }
 
-    if (Array.isArray(this.single.insert) && (this.single.insert.length === 1) && _.isEmpty(this.single.insert[0])) {
+    if (Array.isArray(insertValues) && insertValues.length === 1 && _.isEmpty(insertValues[0])) {
       return this._addReturningToSqlAndConvert('insert into ' + this.tableName + ' (' + this.formatter.wrap(this.single.returning) + ') values (default)', returning, this.tableName);
     }
 
@@ -41,7 +41,7 @@ assign(QueryCompiler_Oracle.prototype, {
       return '';
     }
 
-    var insertData = this._prepInsert(this.single.insert);
+    var insertData = this._prepInsert(insertValues);
 
     var sql = {};
 

lib/dialects/oracle/schema/columnbuilder.js

@@ -2,6 +2,7 @@
 
 var inherits      = require('inherits');
 var ColumnBuilder = require('../../../schema/columnbuilder');
+var _             = require('lodash')
 
 function ColumnBuilder_Oracle() {
   ColumnBuilder.apply(this, arguments);

lib/dialects/oracle/schema/tablecompiler.js

@@ -19,8 +19,8 @@ assign(TableCompiler_Oracle.prototype, {
   // Compile a rename column command.
   renameColumn: function(from, to) {
     return this.pushQuery({
-      sql: 'alter table ' + this.tableName() + ' rename column '
-        + this.formatter.wrap(from) + ' to ' + this.formatter.wrap(to)
+      sql: 'alter table ' + this.tableName() + ' rename column ' + 
+        this.formatter.wrap(from) + ' to ' + this.formatter.wrap(to)
     });
   },
 

lib/dialects/oracle/transaction.js

@@ -1,6 +1,8 @@
-
+'use strict';
+var Promise     = require('../../promise')
 var Transaction = require('../../transaction')
 var assign      = require('lodash/object/assign');
+var debugTx     = require('debug')('knex:tx')
 
 function Oracle_Transaction(client, outerTx) {
   Transaction.call(this, client, outerTx)
@@ -9,7 +11,7 @@ function Oracle_Transaction(client, outerTx) {
 assign(Oracle_Transaction.prototype, {
 
   // disable autocommit to allow correct behavior (default is true)
-  beginTransaction: function(conn) {
+  beginTransaction: function() {
     return Promise.resolve()
   },
 
@@ -31,7 +33,7 @@ assign(Oracle_Transaction.prototype, {
       return config.connection || t.client.acquireConnection()  
     }).tap(function(connection) {
       if (!t._outerTx) {
-        return conn.setAutoCommit(false)  
+        return connection.setAutoCommit(false)  
       }
     }).disposer(function(connection) {
       if (!config.connection) {

lib/dialects/oracle/utils.js

@@ -1,6 +1,5 @@
 'use strict';
 
-var _       = require('lodash');
 var helpers = require('../../helpers');
 
 function generateCombinedName(postfix, name, subNames) {

lib/dialects/postgres/index.js

@@ -46,7 +46,9 @@ assign(Client_PG.prototype, {
 
   // Prep the bindings as needed by PostgreSQL.
   prepBindings: function(bindings, tz) {
-    return _.map(bindings, utils.prepareValue);
+    return _.map(bindings, function(binding) {
+      return utils.prepareValue(binding, tz)
+    });
   },
 
   // Get a raw connection, called by the `pool` whenever a new
@@ -100,7 +102,6 @@ assign(Client_PG.prototype, {
 
   _stream: function(connection, obj, stream, options) {
     PGQueryStream = PGQueryStream || require('pg-query-stream');
-    var runner = this;
     var sql = obj.sql = this.positionBindings(obj.sql)
     return new Promise(function(resolver, rejecter) {
       stream.on('error', rejecter);
@@ -163,6 +164,4 @@ assign(Client_PG.prototype, {
 
 })
 
-Client_PG.__proto__ = Client
-
 module.exports = Client_PG

lib/dialects/sqlite3/index.js

@@ -138,6 +138,4 @@ assign(Client_SQLite3.prototype, {
 
 })
 
-Client_SQLite3.__proto__ = Client
-
 module.exports = Client_SQLite3

lib/dialects/sqlite3/query/compiler.js

@@ -4,7 +4,6 @@
 
 var _             = require('lodash')
 var inherits      = require('inherits')
-var Raw           = require('../../../raw')
 var QueryCompiler = require('../../../query/compiler')
 var assign        = require('lodash/object/assign');
 

lib/dialects/sqlite3/schema/columncompiler.js

@@ -1,3 +1,4 @@
+'use strict';
 
 var inherits = require('inherits');
 var ColumnCompiler = require('../../../schema/columncompiler');

lib/dialects/strong-oracle/index.js

@@ -12,6 +12,4 @@ inherits(Client_StrongOracle, Client_Oracle);
 
 Client_StrongOracle.prototype.driverName = 'strong-oracle'
 
-Client_StrongOracle.__proto__ = Client_Oracle
-
 module.exports = Client_StrongOracle;

lib/dialects/websql/index.js

@@ -88,6 +88,4 @@ assign(Client_WebSQL.prototype, {
 
 })
 
-Client_WebSQL.__proto__ = Client_SQLite3
-
 module.exports = Client_WebSQL;

lib/dialects/websql/transaction.js

@@ -1,5 +1,6 @@
-
+'use strict';
 var makeKnex = require('../../util/make-knex')
+var Promise  = require('../../promise')
 
 function Transaction_WebSQL(client) {
   this.client = client
@@ -12,5 +13,4 @@ Transaction_WebSQL.prototype.run = function(container) {
   })
 }
 
-
-module.exports = Transaction_WebSQL
+module.exports = Transaction_WebSQL

lib/formatter.js

@@ -38,7 +38,7 @@ assign(Formatter.prototype, {
 
   // Checks whether a value is a function... if it is, we compile it
   // otherwise we check whether it's a raw
-  parameter: function(value, notSetValue) {
+  parameter: function(value) {
     if (typeof value === 'function') {
       return this.outputQuery(this.compileCallback(value), true);
     }

lib/query/compiler.js

@@ -132,9 +132,8 @@ assign(QueryCompiler.prototype, {
       }
     }
     if (sql.length === 0) sql = ['*'];
-    return 'select ' + (distinct ? 'distinct ' : '') 
-      + sql.join(', ') + 
-      (this.tableName ? ' from ' + this.tableName : '');
+    return 'select ' + (distinct ? 'distinct ' : '') + 
+      sql.join(', ') + (this.tableName ? ' from ' + this.tableName : '');
   },
 
   aggregate: function(stmt) {
@@ -358,7 +357,7 @@ assign(QueryCompiler.prototype, {
     if (!Array.isArray(data)) data = data ? [data] : [];
     var i = -1
     while (++i < data.length) {
-      if (data[i] == undefined) break;
+      if (data[i] == null) break;
       if (i === 0) columns = Object.keys(data[i]).sort()
       var row  = new Array(columns.length)
       var keys = Object.keys(data[i])

lib/runner.js

@@ -2,8 +2,6 @@
 
 var _       = require('lodash')
 var Promise = require('./promise')
-var helpers = require('./helpers')
-var debug   = require('debug')
 var assign  = require('lodash/object/assign');
 
 var PassThrough;

lib/schema/builder.js

@@ -1,9 +1,8 @@
 'use strict';
 
-var _            = require('lodash');
-var inherits     = require('inherits');
-var EventEmitter = require('events').EventEmitter;
-var assign       = require('lodash/object/assign')
+var _            = require('lodash')
+var inherits     = require('inherits')
+var EventEmitter = require('events').EventEmitter
 
 // Constructor for the builder instance, typically called from
 // `knex.builder`, accepting the current `knex` instance,

lib/transaction.js

@@ -176,7 +176,7 @@ assign(Transaction.prototype, {
     return this.client.stream(conn, sql, stream, options)
   },
 
-  _skipping: function() {
+  _skipping: function(sql) {
     return Promise.reject(new Error('Transaction ' + this.txid + ' has already been released skipping: ' + sql))
   },
 

lib/util/make-client.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var assign   = require('lodash/object/assign');
 var inherits = require('inherits')
 
@@ -65,7 +67,5 @@ module.exports = function makeClient(ParentClient) {
     ColumnCompiler: ColumnCompiler
   })
 
-  Client.__proto__ = ParentClient
-
   return Client
 }

lib/util/make-knex.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var EventEmitter   = require('events').EventEmitter
 var assign         = require('lodash/object/assign');
 

test/integration/builder/transaction.js

@@ -3,7 +3,6 @@
 'use strict';
 
 var Promise = testPromise;
-var debug = require('debug')
 
 module.exports = function(knex) {
 

test/unit/schema/sqlite3.js

@@ -424,9 +424,8 @@ describe("SQLite SchemaBuilder", function() {
   
   describe('SQLite3_DDL.prototype._doReplace', function () {
     it('should not change a query that has no matches', function () {
-      return client.schemaBuilder().table('foo', function (tbl) {
+      return client.schemaBuilder().table('foo', function() {
         
-        // i don't really know how to get at an instance of this 'correctly'
         var doReplace = SQLite3_DDL.prototype._doReplace;
         
         var sql1 = 'CREATE TABLE "foo" ("id" integer not null primary key autoincrement, '+