diff --git a/docs/adapter.js.html b/docs/adapter.js.html index ef7945a..031d971 100644 --- a/docs/adapter.js.html +++ b/docs/adapter.js.html @@ -110,7 +110,7 @@ module.exports = { Documentation generated by JSDoc 3.3.0-alpha9 - on Tue Nov 18th 2014 using the DocStrap template. diff --git a/docs/driver.js.html b/docs/driver.js.html index 5a9e47b..907121a 100644 --- a/docs/driver.js.html +++ b/docs/driver.js.html @@ -252,7 +252,7 @@ module.exports = d; Documentation generated by JSDoc 3.3.0-alpha9 - on Tue Nov 18th 2014 using the DocStrap template. diff --git a/docs/helpers.js.html b/docs/helpers.js.html index 4f7f753..f421591 100644 --- a/docs/helpers.js.html +++ b/docs/helpers.js.html @@ -213,7 +213,7 @@ module.exports = h; Documentation generated by JSDoc 3.3.0-alpha9 - on Tue Nov 18th 2014 using the DocStrap template. diff --git a/docs/index.html b/docs/index.html index d4cea68..4c4d1ed 100644 --- a/docs/index.html +++ b/docs/index.html @@ -148,7 +148,7 @@ query.select('foo') Documentation generated by JSDoc 3.3.0-alpha9 - on Tue Nov 18th 2014 using the DocStrap template. diff --git a/docs/module-adapter.html b/docs/module-adapter.html index e1896bb..3130cfd 100644 --- a/docs/module-adapter.html +++ b/docs/module-adapter.html @@ -354,7 +354,7 @@ Documentation generated by JSDoc 3.3.0-alpha9 - on Tue Nov 18th 2014 using the DocStrap template. diff --git a/docs/module-driver.html b/docs/module-driver.html index f75afe5..f1e285a 100644 --- a/docs/module-driver.html +++ b/docs/module-driver.html @@ -170,7 +170,7 @@ Documentation generated by JSDoc 3.3.0-alpha9 - on Tue Nov 18th 2014 using the DocStrap template. diff --git a/docs/module-helpers.html b/docs/module-helpers.html index c5cd3d4..1752581 100644 --- a/docs/module-helpers.html +++ b/docs/module-helpers.html @@ -1027,7 +1027,7 @@ in the passed array

Documentation generated by JSDoc 3.3.0-alpha9 - on Tue Nov 18th 2014 using the DocStrap template. diff --git a/docs/module-node-query.html b/docs/module-node-query.html index a999e77..e306a0f 100644 --- a/docs/module-node-query.html +++ b/docs/module-node-query.html @@ -83,7 +83,7 @@
-

require("node-query")(drivername, connObject, connLib) → {queryBuilder}

+

require("node-query")(drivername, connObject, connLib) → {queryBuilder}

@@ -113,6 +113,8 @@ Type + Argument + @@ -138,6 +140,14 @@ + + + + + + + + @@ -161,6 +171,14 @@ + + + + + + + + @@ -184,10 +202,20 @@ + + + <optional>
+ + + + + + + -

The name of the db connection library you are using, eg. mysql or mysql2

+

The name of the db connection library you are using, eg. mysql or mysql2. Optional if the same as drivername

@@ -385,7 +413,7 @@ @@ -457,7 +485,7 @@ Documentation generated by JSDoc 3.3.0-alpha9 - on Tue Nov 18th 2014 using the DocStrap template. diff --git a/docs/module-query-builder.html b/docs/module-query-builder.html index f491edf..e742fbe 100644 --- a/docs/module-query-builder.html +++ b/docs/module-query-builder.html @@ -383,7 +383,7 @@ @@ -519,7 +519,7 @@ @@ -764,7 +764,7 @@ @@ -955,7 +955,7 @@ @@ -1154,7 +1154,7 @@ @@ -1355,7 +1355,7 @@ @@ -1546,7 +1546,7 @@ @@ -1641,7 +1641,7 @@ @@ -1788,7 +1788,7 @@ @@ -1875,7 +1875,7 @@ @@ -1962,7 +1962,7 @@ @@ -2147,7 +2147,7 @@ @@ -2357,7 +2357,7 @@ @@ -2539,7 +2539,7 @@ @@ -2771,7 +2771,7 @@ @@ -2997,7 +2997,7 @@ @@ -3176,7 +3176,7 @@ @@ -3402,7 +3402,7 @@ @@ -3593,7 +3593,7 @@ @@ -3681,7 +3681,7 @@ prefixed with 'OR'

@@ -3866,7 +3866,7 @@ prefixed with 'OR'

@@ -4092,7 +4092,7 @@ prefixed with 'OR'

@@ -4180,7 +4180,7 @@ prefixed with 'OR NOT'

@@ -4406,7 +4406,7 @@ prefixed with 'OR NOT'

@@ -4591,7 +4591,7 @@ prefixed with 'OR NOT'

@@ -4750,7 +4750,7 @@ prefixed with 'OR NOT'

@@ -4886,7 +4886,7 @@ prefixed with 'OR NOT'

@@ -5022,7 +5022,7 @@ prefixed with 'OR NOT'

@@ -5181,7 +5181,7 @@ prefixed with 'OR NOT'

@@ -5320,7 +5320,7 @@ prefixed with 'OR NOT'

@@ -5502,7 +5502,7 @@ prefixed with 'OR NOT'

@@ -5712,7 +5712,7 @@ prefixed with 'OR NOT'

@@ -5897,7 +5897,7 @@ prefixed with 'OR NOT'

@@ -6056,7 +6056,7 @@ prefixed with 'OR NOT'

@@ -6192,7 +6192,7 @@ prefixed with 'OR NOT'

@@ -6328,7 +6328,7 @@ prefixed with 'OR NOT'

@@ -6487,7 +6487,7 @@ prefixed with 'OR NOT'

@@ -6551,7 +6551,7 @@ prefixed with 'OR NOT'

Documentation generated by JSDoc 3.3.0-alpha9 - on Tue Nov 18th 2014 using the DocStrap template. diff --git a/docs/module-query-parser.html b/docs/module-query-parser.html index 1870029..cce42dd 100644 --- a/docs/module-query-parser.html +++ b/docs/module-query-parser.html @@ -466,7 +466,7 @@ Documentation generated by JSDoc 3.3.0-alpha9 - on Tue Nov 18th 2014 using the DocStrap template. diff --git a/docs/modules.list.html b/docs/modules.list.html index a4ed007..7e4b9f0 100644 --- a/docs/modules.list.html +++ b/docs/modules.list.html @@ -158,7 +158,7 @@ Documentation generated by JSDoc 3.3.0-alpha9 - on Tue Nov 18th 2014 using the DocStrap template. diff --git a/docs/node-query.js.html b/docs/node-query.js.html index dd6f63b..32f214a 100644 --- a/docs/node-query.js.html +++ b/docs/node-query.js.html @@ -86,10 +86,12 @@ var NodeQuery = function() { * @alias module:node-query * @param {String} drivername - The name of the database type, eg. mysql or pg * @param {Object} connObject - A connection object from the database library you are connecting with - * @param {String} connLib - The name of the db connection library you are using, eg. mysql or mysql2 + * @param {String} [connLib] - The name of the db connection library you are using, eg. mysql or mysql2. Optional if the same as drivername * @return {queryBuilder} */ this.init = function (driverType, connObject, connLib) { + connLib = connLib || driverType; + var fs = require('fs'), qb = require('./query-builder'); @@ -149,7 +151,7 @@ module.exports = new NodeQuery(); Documentation generated by JSDoc 3.3.0-alpha9 - on Tue Nov 18th 2014 using the DocStrap template. diff --git a/docs/query-builder.js.html b/docs/query-builder.js.html index 0888f51..11eda61 100644 --- a/docs/query-builder.js.html +++ b/docs/query-builder.js.html @@ -305,7 +305,6 @@ var QueryBuilder = function(driver, adapter) { }); }, whereNull: function(field, stmt, conj) { - conj = conj || 'AND'; field = driver.quoteIdentifiers(field); var item = field + ' ' + stmt; @@ -1042,7 +1041,7 @@ module.exports = QueryBuilder; Documentation generated by JSDoc 3.3.0-alpha9 - on Tue Nov 18th 2014 using the DocStrap template. diff --git a/docs/query-parser.js.html b/docs/query-parser.js.html index 71e0908..46d73ba 100644 --- a/docs/query-parser.js.html +++ b/docs/query-parser.js.html @@ -184,7 +184,7 @@ module.exports = QueryParser; Documentation generated by JSDoc 3.3.0-alpha9 - on Tue Nov 18th 2014 using the DocStrap template.