use browserify-safe require statements (#352)

all boils down to _not_ using `__dirname` inside a require call

lib/dialect/mssql.js

@@ -20,7 +20,7 @@ var Mssql = function(config) {
   this.config = config || {};
 };
 
-var Postgres = require(__dirname + '/postgres');
+var Postgres = require('./postgres');
 
 util.inherits(Mssql, Postgres);
 

lib/dialect/mysql.js

@@ -10,7 +10,7 @@ var Mysql = function(config) {
   this.config = config || {};
 };
 
-var Postgres = require(__dirname + '/postgres');
+var Postgres = require('./postgres');
 
 util.inherits(Mysql, Postgres);
 

lib/dialect/oracle.js

@@ -9,9 +9,9 @@ var Oracle = function(config) {
   this.config = config || {};
 };
 
-var Postgres = require(__dirname + '/postgres');
+var Postgres = require('./postgres');
 
-var Mssql = require(__dirname + '/mssql');
+var Mssql = require('./mssql');
 
 util.inherits(Oracle, Postgres);
 

lib/dialect/sqlite.js

@@ -11,7 +11,7 @@ var Sqlite = function(config) {
   this.config = config || {};
 };
 
-var Postgres = require(__dirname + '/postgres');
+var Postgres = require('./postgres');
 
 util.inherits(Sqlite, Postgres);
 

lib/functions.js

@@ -1,7 +1,7 @@
 'use strict';
 var _ = require('lodash');
 var sliced = require('sliced');
-var FunctionCall = require(__dirname + '/node/functionCall');
+var FunctionCall = require('./node/functionCall');
 
 // create a function that creates a function call of the specific name, using the specified sql instance
 var getFunctionCallCreator = function(name) {

lib/node/addColumn.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'ADD COLUMN'

lib/node/alias.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var _ = require('lodash');
-var Node = require(__dirname);
+var Node = require('./index');
 
 var AliasNode = Node.define({
   type: 'ALIAS',

lib/node/alter.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'ALTER'

lib/node/arrayCall.js

@@ -1,9 +1,9 @@
 'use strict';
 
 var _                    = require('lodash');
-var Node                 = require(__dirname);
-var ParameterNode        = require(__dirname + '/parameter');
-var valueExpressionMixin = require(__dirname + '/valueExpression');
+var Node                 = require('./index');
+var ParameterNode        = require('./parameter');
+var valueExpressionMixin = require('./valueExpression');
 
 var ArrayCallNode = Node.define({
   type: 'ARRAY CALL',
@@ -18,7 +18,7 @@ var ArrayCallNode = Node.define({
 _.extend(ArrayCallNode.prototype, valueExpressionMixin());
 
 // allow aliasing
-var AliasNode = require(__dirname + '/alias');
+var AliasNode = require('./alias');
 _.extend(ArrayCallNode.prototype, AliasNode.AliasMixin);
 
 module.exports = ArrayCallNode;

lib/node/at.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var _                    = require('lodash');
-var Node                 = require(__dirname);
-var valueExpressionMixin = require(__dirname + '/valueExpression');
+var Node                 = require('./index');
+var valueExpressionMixin = require('./valueExpression');
 
 var valueExpressionMixed = false;
 var AtNode = Node.define({
@@ -21,7 +21,7 @@ var AtNode = Node.define({
 });
 
 // allow aliasing
-var AliasNode = require(__dirname + '/alias');
+var AliasNode = require('./alias');
 _.extend(AtNode.prototype, AliasNode.AliasMixin);
 
 module.exports = AtNode;

lib/node/binary.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var _                    = require('lodash');
-var Node                 = require(__dirname);
-var valueExpressionMixin = require(__dirname + '/valueExpression');
+var Node                 = require('./index');
+var valueExpressionMixin = require('./valueExpression');
 
 var valueExpressionMixed = false;
 var BinaryNode = Node.define(_.extend({
@@ -23,7 +23,7 @@ var BinaryNode = Node.define(_.extend({
 }));
 
 // allow aliasing
-var AliasNode = require(__dirname + '/alias');
+var AliasNode = require('./alias');
 _.extend(BinaryNode.prototype, AliasNode.AliasMixin);
 
 module.exports = BinaryNode;

lib/node/cascade.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'CASCADE'

lib/node/case.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var _                    = require('lodash');
-var Node                 = require(__dirname);
-var valueExpressionMixin = require(__dirname + '/valueExpression');
+var Node                 = require('./index');
+var valueExpressionMixin = require('./valueExpression');
 
 var valueExpressionMixed = false;
 var CaseNode = Node.define(_.extend({
@@ -23,7 +23,7 @@ var CaseNode = Node.define(_.extend({
 }));
 
 // allow aliasing
-var AliasNode = require(__dirname + '/alias');
+var AliasNode = require('./alias');
 _.extend(CaseNode.prototype, AliasNode.AliasMixin);
 
 module.exports = CaseNode;

lib/node/cast.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var _                    = require('lodash');
-var Node                 = require(__dirname);
-var valueExpressionMixin = require(__dirname + '/valueExpression');
+var Node                 = require('./index');
+var valueExpressionMixin = require('./valueExpression');
 
 var valueExpressionMixed = false;
 var CastNode = Node.define({
@@ -21,7 +21,7 @@ var CastNode = Node.define({
 });
 
 // allow aliasing
-var AliasNode = require(__dirname + '/alias');
+var AliasNode = require('./alias');
 _.extend(CastNode.prototype, AliasNode.AliasMixin);
 
 module.exports = CastNode;

lib/node/column.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'COLUMN',

lib/node/create.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'CREATE',

lib/node/createView.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'CREATE VIEW',

lib/node/default.js

@@ -1,6 +1,6 @@
 'use strict';
 
-module.exports = require(__dirname).define({
+module.exports = require('./index').define({
   type: 'DEFAULT',
   value: function() {
     return;

lib/node/delete.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'DELETE'

lib/node/distinct.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'DISTINCT',

lib/node/distinctOn.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'DISTINCT ON',

lib/node/drop.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'DROP',

lib/node/dropColumn.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'DROP COLUMN'

lib/node/forShare.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'FOR SHARE'

lib/node/forUpdate.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'FOR UPDATE'

lib/node/foreignKey.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'FOREIGN KEY',

lib/node/from.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 var From = Node.define({
   type: 'FROM'

lib/node/functionCall.js

@@ -1,9 +1,9 @@
 'use strict';
 
 var _                    = require('lodash');
-var Node                 = require(__dirname);
-var ParameterNode        = require(__dirname + '/parameter');
-var valueExpressionMixin = require(__dirname + '/valueExpression');
+var Node                 = require('./index');
+var ParameterNode        = require('./parameter');
+var valueExpressionMixin = require('./valueExpression');
 
 var FunctionCallNode = Node.define({
   type: 'FUNCTION CALL',
@@ -18,7 +18,7 @@ var FunctionCallNode = Node.define({
 _.extend(FunctionCallNode.prototype, valueExpressionMixin());
 
 // allow aliasing
-var AliasNode = require(__dirname + '/alias');
+var AliasNode = require('./alias');
 _.extend(FunctionCallNode.prototype, AliasNode.AliasMixin);
 
 module.exports = FunctionCallNode;

lib/node/groupBy.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'GROUP BY'

lib/node/having.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'HAVING'

lib/node/ifExists.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'IF EXISTS'

lib/node/ifNotExists.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'IF NOT EXISTS'

lib/node/in.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var _                    = require('lodash');
-var Node                 = require(__dirname);
-var valueExpressionMixin = require(__dirname + '/valueExpression');
+var Node                 = require('./index');
+var valueExpressionMixin = require('./valueExpression');
 
 var valueExpressionMixed = false;
 var InNode = Node.define(_.extend({
@@ -22,7 +22,7 @@ var InNode = Node.define(_.extend({
 }));
 
 // allow aliasing
-var AliasNode = require(__dirname + '/alias');
+var AliasNode = require('./alias');
 _.extend(InNode.prototype, AliasNode.AliasMixin);
 
 module.exports = InNode;

lib/node/index.js

@@ -98,4 +98,4 @@ Node.define = function(def) {
 };
 
 module.exports = Node;
-var TextNode = require(__dirname + '/text');
+var TextNode = require('./text');

lib/node/interval.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var Node          = require(__dirname);
-var ParameterNode = require(__dirname + '/parameter');
+var Node          = require('./index');
+var ParameterNode = require('./parameter');
 
 var IntervalNode = Node.define({
   type: 'INTERVAL',

lib/node/join.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 var JoinNode = module.exports = Node.define({
   type: 'JOIN',
   constructor: function(subType, from, to) {

lib/node/literal.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'LITERAL',

lib/node/notIn.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var _                    = require('lodash');
-var Node                 = require(__dirname);
-var valueExpressionMixin = require(__dirname + '/valueExpression');
+var Node                 = require('./index');
+var valueExpressionMixin = require('./valueExpression');
 
 var valueExpressionMixed = false;
 var NotInNode = Node.define(_.extend({
@@ -22,7 +22,7 @@ var NotInNode = Node.define(_.extend({
 }));
 
 // allow aliasing
-var AliasNode = require(__dirname + '/alias');
+var AliasNode = require('./alias');
 _.extend(NotInNode.prototype, AliasNode.AliasMixin);
 
 module.exports = NotInNode;

lib/node/onConflict.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'ONCONFLICT'

lib/node/onDuplicate.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'ONDUPLICATE'

lib/node/orIgnore.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'OR IGNORE'

lib/node/orderBy.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'ORDER BY'

lib/node/orderByValue.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 var OrderByColumn = Node.define({
   type: 'ORDER BY VALUE',

lib/node/parameter.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 var ParameterNode = module.exports = Node.define({
   type: 'PARAMETER',

lib/node/postfixUnary.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var _                    = require('lodash');
-var Node                 = require(__dirname);
-var valueExpressionMixin = require(__dirname + '/valueExpression');
+var Node                 = require('./index');
+var valueExpressionMixin = require('./valueExpression');
 
 var valueExpressionMixed = false;
 var PostfixUnaryNode = Node.define({
@@ -22,7 +22,7 @@ var PostfixUnaryNode = Node.define({
 });
 
 // allow aliasing
-var AliasNode = require(__dirname + '/alias');
+var AliasNode = require('./alias');
 _.extend(PostfixUnaryNode.prototype, AliasNode.AliasMixin);
 
 module.exports = PostfixUnaryNode;

lib/node/prefixUnary.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var _                    = require('lodash');
-var Node                 = require(__dirname);
-var valueExpressionMixin = require(__dirname + '/valueExpression');
+var Node                 = require('./index');
+var valueExpressionMixin = require('./valueExpression');
 
 var valueExpressionMixed = false;
 var PrefixUnaryNode = Node.define({
@@ -22,7 +22,7 @@ var PrefixUnaryNode = Node.define({
 });
 
 // allow aliasing
-var AliasNode = require(__dirname + '/alias');
+var AliasNode = require('./alias');
 _.extend(PrefixUnaryNode.prototype, AliasNode.AliasMixin);
 
 module.exports = PrefixUnaryNode;

lib/node/query.js

@@ -1,11 +1,11 @@
 'use strict';
 
 var _ = require('lodash');
-var alias = require(__dirname + '/alias');
+var alias = require('./alias');
 var assert = require('assert');
 var sliced = require('sliced');
 var util   = require('util');
-var valueExpressionMixin = require(__dirname + '/valueExpression');
+var valueExpressionMixin = require('./valueExpression');
 
 var Node            = require('./');
 var Select          = require('./select');

lib/node/rename.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'RENAME'

lib/node/renameColumn.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'RENAME COLUMN'

lib/node/restrict.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'RESTRICT'

lib/node/returning.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'RETURNING'

lib/node/select.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'SELECT',

lib/node/slice.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var _                    = require('lodash');
-var Node                 = require(__dirname);
-var valueExpressionMixin = require(__dirname + '/valueExpression');
+var Node                 = require('./index');
+var valueExpressionMixin = require('./valueExpression');
 
 var valueExpressionMixed = false;
 var SliceNode = Node.define({
@@ -22,7 +22,7 @@ var SliceNode = Node.define({
 });
 
 // allow aliasing
-var AliasNode = require(__dirname + '/alias');
+var AliasNode = require('./alias');
 _.extend(SliceNode.prototype, AliasNode.AliasMixin);
 
 module.exports = SliceNode;

lib/node/table.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 module.exports = Node.define({
   type: 'TABLE',
   constructor: function(table) {

lib/node/ternary.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var _                    = require('lodash');
-var Node                 = require(__dirname);
-var valueExpressionMixin = require(__dirname + '/valueExpression');
+var Node                 = require('./index');
+var valueExpressionMixin = require('./valueExpression');
 
 var valueExpressionMixed = false;
 var TernaryNode = Node.define(_.extend({
@@ -25,7 +25,7 @@ var TernaryNode = Node.define(_.extend({
 }));
 
 // allow aliasing
-var AliasNode = require(__dirname + '/alias');
+var AliasNode = require('./alias');
 _.extend(TernaryNode.prototype, AliasNode.AliasMixin);
 
 module.exports = TernaryNode;

lib/node/text.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'TEXT',

lib/node/truncate.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'TRUNCATE',

lib/node/update.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require(__dirname);
+var Node = require('./index');
 
 module.exports = Node.define({
   type: 'UPDATE'

lib/node/where.js

@@ -1,8 +1,8 @@
 'use strict';
 
-var Node = require(__dirname);
-var BinaryNode = require(__dirname + '/binary');
-var TextNode = require(__dirname + '/text');
+var Node = require('./index');
+var BinaryNode = require('./binary');
+var TextNode = require('./text');
 
 var normalizeNode = function(table, node) {
   var result = node;

lib/table.js

@@ -3,13 +3,13 @@
 var util = require('util');
 var lodash = require('lodash');
 
-var Query = require(__dirname + '/node/query');
-var Column = require(__dirname + '/column');
-var TableNode = require(__dirname + '/node/table');
-var JoinNode = require(__dirname + '/node/join');
-var LiteralNode = require(__dirname + '/node/literal');
-var Joiner = require(__dirname + '/joiner');
-var ForeignKeyNode = require(__dirname + '/node/foreignKey');
+var Query = require('./node/query');
+var Column = require('./column');
+var TableNode = require('./node/table');
+var JoinNode = require('./node/join');
+var LiteralNode = require('./node/literal');
+var Joiner = require('./joiner');
+var ForeignKeyNode = require('./node/foreignKey');
 
 var Table = function(config) {
   this._schema = config.schema;