jsharmony 1.27.2 → 1.28.0

package/AppSrv.File.js

@@ -183,6 +183,7 @@ exports.Download = function (req, res, fullmodelid, keyid, fieldid, options) {
     if (!this.jsh.hasModel(req, fullmodelid)) throw new Error('Error: Model ' + fullmodelid + ' not found in collection.');
     var model = this.jsh.getModel(req, fullmodelid);
     var db = this.jsh.getModelDB(req, fullmodelid);
+    var dbcontext = this.jsh.getDBContext(req, model, db);
     //Verify model access
     if (!Helper.hasModelAction(req, model, 'B')) { Helper.GenError(req, res, -11, _this._tP('Invalid Model Access for @fullmodelid', { fullmodelid })); return; }
     if (model.unbound) { Helper.GenError(req, res, -11, 'Cannot run database queries on unbound models'); return; }
@@ -220,7 +221,7 @@ exports.Download = function (req, res, fullmodelid, keyid, fieldid, options) {
     
     var sql = db.sql.Download(_this.jsh, model, fields, keys, datalockqueries);
     
-    this.ExecRow(req._DBContext, sql, sql_ptypes, sql_params, function (err, rslt) {
+    this.ExecRow(dbcontext, sql, sql_ptypes, sql_params, function (err, rslt) {
       //Get extension, filename
       if(err) jsh.Log.error(err);
       if ((rslt == null) || (rslt.length != 1) || (rslt[0] == null)) { return Helper.GenError(req, res, -33, 'Download file not found.'); }

package/AppSrv.ModelExec.js

@@ -58,6 +58,7 @@ exports.postModelExec = function (req, res, fullmodelid, Q, P, onComplete) {
   var model = jsh.getModel(req, fullmodelid);
   if (!Helper.hasModelAction(req, model, 'U')) { Helper.GenError(req, res, -11, _this._tP('Invalid Model Access for @fullmodelid', { fullmodelid })); return; }
   var db = jsh.getModelDB(req, fullmodelid);
+  var dbcontext = jsh.getDBContext(req, model, db);
   
   var fieldlist = this.getFieldNames(req, model.fields, 'U');
   
@@ -106,7 +107,7 @@ exports.postModelExec = function (req, res, fullmodelid, Q, P, onComplete) {
     sql_params = _this.ApplyTransTblEscapedParameters(sql_params, transtbl);
     var dbfunc = db.Recordset;
     if (model.sqltype && (model.sqltype == 'multirecordset')) dbfunc = db.MultiRecordset;
-    dbfunc.call(db, req._DBContext, sql, sql_ptypes, sql_params, dbtrans, function (err, rslt, stats) {
+    dbfunc.call(db, dbcontext, sql, sql_ptypes, sql_params, dbtrans, function (err, rslt, stats) {
       if (err != null) { err.model = model; err.sql = sql; }
       if (stats) stats.model = model;
       if(model.onsqlupdated) sql_rslt = rslt;

package/AppSrv.ModelForm.js

@@ -39,6 +39,7 @@ exports.getModelForm = function (req, res, fullmodelid, Q, P, form_m) {
   var encryptedfields = this.getEncryptedFields(req, model.fields, 'B');
   var lovkeylist = this.getFieldNamesWithProp(model.fields, 'lovkey');
   var db = _this.jsh.getModelDB(req, fullmodelid);
+  var dbcontext = _this.jsh.getDBContext(req, model, db);
   if ((encryptedfields.length > 0) && !(req.secure) && (!_this.jsh.Config.system_settings.allow_insecure_http_encryption)) { Helper.GenError(req, res, -51, 'Encrypted fields require HTTPS connection'); return; }
   
 
@@ -149,7 +150,7 @@ exports.getModelForm = function (req, res, fullmodelid, Q, P, form_m) {
     var sql = db.sql.getModelForm(_this.jsh, model, selecttype, allfields, sql_allkeyfields, datalockqueries, sortfields);
     var dbfunc = db.Row;
     if (selecttype == 'multiple') dbfunc = db.Recordset;
-    dbfunc.call(db, req._DBContext, sql, sql_ptypes, sql_params, dbtrans, function (err, rslt, stats) {
+    dbfunc.call(db, dbcontext, sql, sql_ptypes, sql_params, dbtrans, function (err, rslt, stats) {
       if ((err == null) && (rslt == null)) err = Helper.NewError('Record not found', -1);
       if (err != null) { err.model = model; err.sql = sql; }
       else {
@@ -250,6 +251,7 @@ exports.putModelForm = function (req, res, fullmodelid, Q, P, onComplete) {
   var encryptedfields = this.getEncryptedFields(req, model.fields, 'I');
   if ((encryptedfields.length > 0) && !(req.secure) && (!_this.jsh.Config.system_settings.allow_insecure_http_encryption)) { Helper.GenError(req, res, -51, 'Encrypted fields require HTTPS connection'); return; }
   var db = _this.jsh.getModelDB(req, fullmodelid);
+  var dbcontext = _this.jsh.getDBContext(req, model, db);
   
   var Pcheck = _.map(fieldlist, function (field) { return '&' + field; });
   Pcheck = Pcheck.concat(_.map(filelist, function (file) { return '|' + file; }));
@@ -348,7 +350,7 @@ exports.putModelForm = function (req, res, fullmodelid, Q, P, onComplete) {
     var sql_rslt = null;
     dbtasks[fullmodelid] = function (dbtrans, callback, transtbl) {
       sql_params = _this.ApplyTransTblEscapedParameters(sql_params, transtbl);
-      db.Row(req._DBContext, dbsql.sql, sql_ptypes, sql_params, dbtrans, function (err, rslt, stats) {
+      db.Row(dbcontext, dbsql.sql, sql_ptypes, sql_params, dbtrans, function (err, rslt, stats) {
         if (stats) stats.model = model;
         if ((err == null) && (rslt != null) && (_this.jsh.map.rowcount in rslt) && (rslt[_this.jsh.map.rowcount] == 0)) err = Helper.NewError('No records affected', -3, stats);
         if (err != null) { err.model = model; err.sql = dbsql.sql; }
@@ -392,7 +394,7 @@ exports.putModelForm = function (req, res, fullmodelid, Q, P, onComplete) {
             }
           }
         });
-        db.Row(req._DBContext, dbsql.enc_sql, enc_sql_ptypes, enc_sql_params, dbtrans, function (err, rslt, stats) {
+        db.Row(dbcontext, dbsql.enc_sql, enc_sql_ptypes, enc_sql_params, dbtrans, function (err, rslt, stats) {
           if (stats) stats.model = model;
           if ((err == null) && (rslt != null) && (_this.jsh.map.rowcount in rslt) && (rslt[_this.jsh.map.rowcount] == 0)) err = Helper.NewError('No records affected', -3, stats);
           if (err != null) { err.model = model; err.sql = dbsql.enc_sql; }
@@ -422,6 +424,7 @@ exports.postModelForm = function (req, res, fullmodelid, Q, P, onComplete) {
   var encryptedfields = this.getEncryptedFields(req, model.fields, 'U');
   if ((encryptedfields.length > 0) && !(req.secure) && (!_this.jsh.Config.system_settings.allow_insecure_http_encryption)) { Helper.GenError(req, res, -51, 'Encrypted fields require HTTPS connection'); return; }
   var db = _this.jsh.getModelDB(req, fullmodelid);
+  var dbcontext = _this.jsh.getDBContext(req, model, db);
   
   var Pcheck = _.map(fieldlist, function (field) { return '&' + field; });
   Pcheck = Pcheck.concat(_.map(filelist, function (file) { return '|' + file; }));
@@ -540,7 +543,7 @@ exports.postModelForm = function (req, res, fullmodelid, Q, P, onComplete) {
       
       dbtasks[fullmodelid] = function (dbtrans, callback, transtbl) {
         sql_params = _this.ApplyTransTblEscapedParameters(sql_params, transtbl);
-        db.Row(req._DBContext, sql, sql_ptypes, sql_params, dbtrans, function (err, rslt, stats) {
+        db.Row(dbcontext, sql, sql_ptypes, sql_params, dbtrans, function (err, rslt, stats) {
           if (stats) stats.model = model;
           if ((err == null) && (rslt != null) && (_this.jsh.map.rowcount in rslt) && (rslt[_this.jsh.map.rowcount] == 0)) err = Helper.NewError('No records affected', -3, stats);
 
@@ -592,6 +595,7 @@ exports.deleteModelForm = function (req, res, fullmodelid, Q, P, onComplete) {
   var fieldlist = this.getFieldNames(req, model.fields, 'D');
   var filelist = this.getFileFieldNames(req, model.fields, '*');
   var db = _this.jsh.getModelDB(req, fullmodelid);
+  var dbcontext = _this.jsh.getDBContext(req, model, db);
   
   var Qcheck = _.map(keylist, function (key) { return '&' + key; });
   Qcheck = Qcheck.concat(_.map(fieldlist, function (field) { return '|' + field; }));
@@ -626,7 +630,7 @@ exports.deleteModelForm = function (req, res, fullmodelid, Q, P, onComplete) {
   var dbtasks = {};
   var sql_rslt = null;
   dbtasks[fullmodelid] = function (dbtrans, callback) {
-    db.Row(req._DBContext, sql, sql_ptypes, sql_params, dbtrans, function (err, rslt, stats) {
+    db.Row(dbcontext, sql, sql_ptypes, sql_params, dbtrans, function (err, rslt, stats) {
       if (stats) stats.model = model;
       if ((err == null) && (rslt != null) && (_this.jsh.map.rowcount in rslt) && (rslt[_this.jsh.map.rowcount] == 0)) err = Helper.NewError('No records affected', -3, stats);
       if (err != null) { err.model = model; err.sql = sql; }

package/AppSrv.ModelGrid.js

@@ -43,6 +43,7 @@ exports.getModelRecordset = function (req, res, fullmodelid, Q, P, rowlimit, opt
   encryptedfields = this.getEncryptedFields(req, model.fields, 'S'); //Encrypted fields can be used for search
   if ((encryptedfields.length > 0) && !(req.secure) && (!_this.jsh.Config.system_settings.allow_insecure_http_encryption)) { Helper.GenError(req, res, -51, 'Encrypted / hash fields require HTTPS connection'); return; }
   var db = _this.jsh.getModelDB(req, fullmodelid);
+  var dbcontext = _this.jsh.getDBContext(req, model, db);
   if ('d' in Q) P = JSON.parse(Q.d);
   
   if (!_this.ParamCheck('Q', Q, ['|rowstart', '|rowcount', '|sort', '|search', '|searchjson', '|d', '|meta', '|getcount'])) { Helper.GenError(req, res, -4, 'Invalid Parameters'); return; }
@@ -212,7 +213,7 @@ exports.getModelRecordset = function (req, res, fullmodelid, Q, P, rowlimit, opt
   var dbtaskname = fullmodelid;
   if (!is_insert) {
     dbtasks[dbtaskname] = function (dbtans, callback) {
-      db.Recordset(req._DBContext, dbsql.sql, sql_ptypes, sql_params, dbtans, function (err, rslt, stats) {
+      db.Recordset(dbcontext, dbsql.sql, sql_ptypes, sql_params, dbtans, function (err, rslt, stats) {
         if (err != null) { err.model = model; err.sql = dbsql.sql; }
         else {
           if (stats) stats.model = model;
@@ -274,7 +275,7 @@ exports.getModelRecordset = function (req, res, fullmodelid, Q, P, rowlimit, opt
   
   if (getcount) {
     dbtasks['_count_' + dbtaskname] = function (dbtrans, callback) {
-      db.Row(req._DBContext, dbsql.rowcount_sql, sql_ptypes, sql_params, dbtrans, function (err, rslt, stats) {
+      db.Row(dbcontext, dbsql.rowcount_sql, sql_ptypes, sql_params, dbtrans, function (err, rslt, stats) {
         if ((err == null) && (rslt == null)) err = Helper.NewError('Count not found', -14);
         if (err != null) { err.model = model; err.sql = dbsql.rowcount_sql; }
         if (stats) stats.model = model;

package/AppSrv.ModelMetadata.js

@@ -33,6 +33,7 @@ exports.getTabCode = function (req, res, fullmodelid, onComplete) {
   var keylist = this.getKeyNames(model.fields);
   var tabcodelist = [model.tabcode];
   var db = _this.jsh.getModelDB(req, fullmodelid);
+  var dbcontext = _this.jsh.getDBContext(req, model, db);
   
   if (req.query.action == 'insert') { return onComplete(); }
   else if (!_.includes(['update','browse'],req.query.action)) { Helper.GenError(req, res, -9, 'Action not supported'); return; }
@@ -65,7 +66,7 @@ exports.getTabCode = function (req, res, fullmodelid, onComplete) {
   
   var sql = db.sql.getTabCode(_this.jsh, model, selectfields, keys, datalockqueries);
   
-  this.ExecScalar(req._DBContext, sql, sql_ptypes, sql_params, function (err, rslt) {
+  this.ExecScalar(dbcontext, sql, sql_ptypes, sql_params, function (err, rslt) {
     if (err) { _this.jsh.Log.error(err); Helper.GenError(req, res, -99999, 'An unexpected error has occurred'); return; }
     if (rslt && rslt[0]) {
       return onComplete(rslt[0]);
@@ -81,6 +82,7 @@ exports.addTitleTasks = function (req, res, model, Q, dbtasks, targetperm) {
   var fieldlist = [];
   var nodatalock = null;
   var db = this.jsh.getModelDB(req, model.id);
+  var dbcontext = this.jsh.getDBContext(req, model, db);
   if (typeof model.title !== 'undefined'){
     if(_.isString(model.title)) title = model.title;
     else if(model.title.insert && Helper.hasAction(targetperm,'I')){
@@ -147,7 +149,7 @@ exports.addTitleTasks = function (req, res, model, Q, dbtasks, targetperm) {
   
   dbtasks['_title'] = function (dbtrans, callback, transtbl) {
     _this.ApplyTransTblChainedParameters(transtbl, sql, sql_ptypes, sql_params, model.fields);
-    db.Scalar(req._DBContext, sql, sql_ptypes, sql_params, dbtrans, function (err, title, stats) {
+    db.Scalar(dbcontext, sql, sql_ptypes, sql_params, dbtrans, function (err, title, stats) {
       if (err) { _this.jsh.Log.error(err); Helper.GenError(req, res, -99999, 'An unexpected error has occurred'); return; }
       if(title) title = Helper.ResolveParams(req, title);
       return callback(null, title, stats);
@@ -248,6 +250,7 @@ exports.addDefaultTasks = function (req, res, model, Q, dbtasks) {
   for(var dbid in defaultCommands){
     let defaultCommand = defaultCommands[dbid];
     var db = _this.jsh.getDB(dbid);
+    var dbcontext = _this.jsh.getDBContext(req, model, db);
     var dflt_sql = db.sql.getDefaultTasks(_this.jsh, defaultCommand.dflt_sql_fields);
   
     //Add parameters from querystring
@@ -257,7 +260,7 @@ exports.addDefaultTasks = function (req, res, model, Q, dbtasks) {
     dbtasks['_defaults_'+dbid] = function (dbtrans, callback, transtbl) {
       _this.ApplyTransTblChainedParameters(transtbl, dflt_sql, defaultCommand.dflt_ptypes, defaultCommand.dflt_params, model.fields);
       if (dflt_sql) {
-        db.Row(req._DBContext, dflt_sql, defaultCommand.dflt_ptypes, defaultCommand.dflt_params, dbtrans, function (err, rslt, stats) {
+        db.Row(dbcontext, dflt_sql, defaultCommand.dflt_ptypes, defaultCommand.dflt_params, dbtrans, function (err, rslt, stats) {
           if (err == null) {
             for (var f in rslt) {
               if (rslt[f] == null) _defaults[f] = '';
@@ -284,6 +287,7 @@ exports.addBreadcrumbTasks = function (req, res, model, Q, dbtasks, targetperm)
   var fieldlist = [];
   var nodatalock = null;
   var db = this.jsh.getModelDB(req, model.id);
+  var dbcontext = this.jsh.getDBContext(req, model, db);
   if(model.breadcrumbs.insert && Helper.hasAction(targetperm,'I')){
     if(model.breadcrumbs.insert.sql){ sql = model.breadcrumbs.insert.sql; fieldlist = model.breadcrumbs.insert.sql_params; nodatalock = model.breadcrumbs.insert.nodatalock; }
   }
@@ -350,7 +354,7 @@ exports.addBreadcrumbTasks = function (req, res, model, Q, dbtasks, targetperm)
   
   dbtasks['_bcrumbs'] = function (dbtrans, callback, transtbl) {
     _this.ApplyTransTblChainedParameters(transtbl, sql, sql_ptypes, sql_params, model.fields);
-    db.Row(req._DBContext, sql, sql_ptypes, sql_params, dbtrans, function (err, rslt, stats) {
+    db.Row(dbcontext, sql, sql_ptypes, sql_params, dbtrans, function (err, rslt, stats) {
       if ((err == null) && (rslt == null)) err = Helper.NewError('Breadcrumbs not found', -14);
       if (err != null) { err.model = model; err.sql = sql; }
       if (stats) stats.model = model;
@@ -384,6 +388,7 @@ exports.addLOVTasks = function (req, res, model, Q, dbtasks, options) {
       if(lov && lov.db){
         lovdb = jsh.getDB(lov.db);
       }
+      var dbcontext = jsh.getDBContext(req, model, lovdb);
 
       //If form and actions="B", do not get the full LOV
       var tgtactions = ejsext.getActions(req, model, field.actions, options.action);
@@ -469,7 +474,7 @@ exports.addLOVTasks = function (req, res, model, Q, dbtasks, options) {
 
       dbtasks['_LOV_' + field.name] = function (dbtrans, callback, transtbl) {
         _this.ApplyTransTblChainedParameters(transtbl, sql, lov_ptypes, lov_params, model.fields);
-        lov_db_function.call(lovdb, req._DBContext, sql, lov_ptypes, lov_params, dbtrans, function (err, rslt, stats) {
+        lov_db_function.call(lovdb, dbcontext, sql, lov_ptypes, lov_params, dbtrans, function (err, rslt, stats) {
           if (err == null) {
             //Generate warning if the LOV options are too long, and sqlselect, sqltruncate is not defined for the field
             if(!rslt) rslt = [];

package/AppSrv.ModelMultisel.js

@@ -40,6 +40,7 @@ exports.getModelMultisel = function (req, res, fullmodelid, Q, P) {
   var allfieldslist = _.union([lovfield.name], fieldlist);
   var allfields = this.getFieldsByName(model.fields, allfieldslist);
   var db = _this.jsh.getModelDB(req, fullmodelid);
+  var dbcontext = _this.jsh.getDBContext(req, model, db);
   
   var is_insert = true;
   if (_this.ParamCheck('Q', Q, _.union(_.map(foreignkeylist, function (foreignkey) { return '&' + foreignkey; }), ['|_action']), false)) { is_insert = false; }
@@ -115,7 +116,7 @@ exports.getModelMultisel = function (req, res, fullmodelid, Q, P) {
   
   var dbtasks = {};
   dbtasks[fullmodelid] = function (dbtrans, callback) {
-    db.Recordset(req._DBContext, sql, sql_ptypes, sql_params, dbtrans, function (err, rslt, stats) {
+    db.Recordset(dbcontext, sql, sql_ptypes, sql_params, dbtrans, function (err, rslt, stats) {
       if ((err == null) && (rslt == null)) err = Helper.NewError('Record not found', -1);
       if (err != null) { err.model = model; err.sql = sql; }
       if (stats) stats.model = model;
@@ -145,6 +146,7 @@ exports.postModelMultisel = function (req, res, fullmodelid, Q, P, onComplete) {
   var foreignkeylist = _this.getFieldNames(req, model.fields, 'F');
   var foreignkeyfields = this.getFieldsByName(model.fields, foreignkeylist);
   var db = _this.jsh.getModelDB(req, fullmodelid);
+  var dbcontext = _this.jsh.getDBContext(req, model, db);
   
   if (!_this.ParamCheck('Q', Q, _.map(foreignkeylist, function (foreignkey) { return '&' + foreignkey; }))) { Helper.GenError(req, res, -4, 'Invalid Parameters'); return; }
   if (!_this.ParamCheck('P', P, ['&' + lovfield.name])) { Helper.GenError(req, res, -4, 'Invalid Parameters'); return; }
@@ -229,7 +231,7 @@ exports.postModelMultisel = function (req, res, fullmodelid, Q, P, onComplete) {
   var sql_rslt = null;
   dbtasks[fullmodelid] = function (dbtrans, callback, transtbl) {
     sql_params = _this.ApplyTransTblEscapedParameters(sql_params, transtbl);
-    db.Row(req._DBContext, sql, sql_ptypes, sql_params, dbtrans, function (err, rslt, stats) {
+    db.Row(dbcontext, sql, sql_ptypes, sql_params, dbtrans, function (err, rslt, stats) {
       if (err != null) { err.model = model; err.sql = sql; }
       if (stats) stats.model = model;
       if(model.onsqlupdated) sql_rslt = rslt;

package/AppSrvRpt.js

@@ -59,7 +59,7 @@ AppSrvRpt.prototype.queueReport = function (req, res, fullmodelid, Q, P, params,
   if(req){
     if (!Helper.hasModelAction(req, model, 'B')) { return errorHandler(-11, jsh._tP('Invalid Model Access for @fullmodelid', { fullmodelid })); }
     db = db || jsh.getModelDB(req, fullmodelid);
-    dbcontext = dbcontext || req._DBContext || 'report';
+    dbcontext = dbcontext || jsh.getDBContext(req, model, db) || 'report';
   }
   else if(!db) throw new Error('Either req or db is required.');
 
@@ -222,7 +222,7 @@ AppSrvRpt.prototype.parseReportSQLData = function (req, db, dbcontext, model, sq
   var _this = this;
   if(req){
     db = db || jsh.getModelDB(req, model.id);
-    dbcontext = dbcontext || req._DBContext || 'report';
+    dbcontext = dbcontext || jsh.getDBContext(req, model, db) || 'report';
   }
   else if(!db) throw new Error('Either req or db is required.');
   _.each(rdata, function (dparams, dname) {
@@ -832,6 +832,7 @@ AppSrvRpt.prototype.runReportJob = function (req, res, fullmodelid, Q, P, onComp
   var sql_params = {};
   var verrors = {};
   var db = jsh.getModelDB(req, fullmodelid);
+  var dbcontext = jsh.getDBContext(req, model, db);
   
   var fields = thisapp.getFieldsByName(model.fields, fieldlist);
   if (fields.length == 0) return onComplete(null, {});
@@ -857,7 +858,7 @@ AppSrvRpt.prototype.runReportJob = function (req, res, fullmodelid, Q, P, onComp
   
   var dbtasks = {};
   dbtasks['jobqueue'] = function (callback) {
-    db.Recordset(req._DBContext, sql, sql_ptypes, sql_params, function (err, rslt, stats) {
+    db.Recordset(dbcontext, sql, sql_ptypes, sql_params, function (err, rslt, stats) {
       if ((err == null) && (rslt == null)) err = Helper.NewError('Record not found', -1);
       if (err != null) { err.model = model; err.sql = sql; }
       if (stats) stats.model = model;

package/README.md

@@ -1,5 +1,5 @@
 # =========
-# jsharmony
+# jsHarmony
 # =========
 
 Rapid Application Development (RAD) Platform for Node.js Database Application Development

package/jsHarmony.Helper.js

@@ -489,6 +489,15 @@ exports.getModelDB = function(req, fullmodelid) {
   return this.getDB(dbid);
 };
 
+exports.getDBContext = function(req, model, db){
+  var dbcontext = req._DBContext;
+  if(this.Config.onGetDBContext){
+    var sysContext = this.Config.onGetDBContext(this, req, model, db);
+    if(!Helper.isNullUndefined(sysContext)) dbcontext = sysContext;
+  }
+  return dbcontext;
+};
+
 exports.getDB = function(dbid){
   if(!dbid) dbid = 'default';
   if(!(dbid in this.DB)) throw new Error('Database connection '+dbid+' not found');

package/jsHarmony.LoadModels.js

@@ -2250,7 +2250,7 @@ exports.ParseEntities = function () {
     if (model.fields) _.each(model.fields, function (field) {
       if(field.lov){
         var lov = field.lov;
-        var lovDB = 'default';
+        var lovDB = modelDB;
         if('database' in lov){
           lov.db = lov.database;
         }

package/jsHarmonyConfig.js

@@ -263,6 +263,9 @@ function jsHarmonyConfig(config){
   //When a client tries to connect to a jsHarmony queue
   this.onQueueSubscribe = []; //function(cb, req, res, queueid){ return cb(); }
 
+  //Overriding the database context
+  this.onGetDBContext = null; //function(jsh, req, model, db){ return 'system'; }
+
   //Theme CSS files
   this.themes = {
     'light': [ 'jsHarmony.theme.light.css' ],

package/lib/CodeGen.SQLObjects.js

@@ -20,6 +20,7 @@ along with this package.  If not, see <http://www.gnu.org/licenses/>.
 var _ = require('lodash');
 var async = require('async');
 var jshParser = require('./JSParser.js');
+var Helper = require('./Helper.js');
 
 module.exports = exports = {};
 
@@ -56,18 +57,25 @@ exports.generateSQLObjects = function(table, options, callback){
             if(!options.withData) return generate_cb();
             var sqlWhere = '1=1';
             if((options.dataFilter||'').trim()) sqlWhere = options.dataFilter;
-            db.Scalar('','select count(*) from ' + tabledef.table_selector + ' where '+sqlWhere,[],{},function(err,datacnt){
-              if(err){ return generate_cb(err); }
-              if(!options.dataFilter && (datacnt > options.maxDataCount)){
-                _this.jsh.Log.warning('Warning: Skipping data for table ' + tabledef.table_selector + ', exceeds max rowcount of ' + options.maxDataCount + ', has ' + datacnt + ' rows' );
-                return generate_cb(null);
+            Helper.execif(!options.dataFilter,
+              function(next){
+                db.Scalar('','select count(*) from ' + tabledef.table_selector,[],{},function(err,datacnt){
+                  if(err){ return generate_cb(err); }
+                  if(datacnt > options.maxDataCount){
+                    _this.jsh.Log.warning('Warning: Skipping data for table ' + tabledef.table_selector + ', exceeds max rowcount of ' + options.maxDataCount + ', has ' + datacnt + ' rows' );
+                    return generate_cb(null);
+                  }
+                  return next();
+                });
+              },
+              function(){
+                db.Recordset('','select * from ' + tabledef.table_selector + ' where '+sqlWhere,[],{},function(err,rslt){
+                  if(err){ return generate_cb(err); }
+                  tabledef.data = rslt;
+                  return generate_cb(null);
+                });
               }
-              db.Recordset('','select * from ' + tabledef.table_selector + ' where '+sqlWhere,[],{},function(err,rslt){
-                if(err){ return generate_cb(err); }
-                tabledef.data = rslt;
-                return generate_cb(null);
-              });
-            });
+            );
           },
           //Generate SQL Object
           function(generate_cb){

package/lib/Helper.js

@@ -1076,6 +1076,14 @@ exports.cubeMapReplace = function(mapping, txt){
   return rslt;
 };
 
+exports.pushArray = function(a,b){
+  if(!a.push) throw new Error('First operand must be an array');
+  if(!b) return;
+  if(!b.length) return;
+  for(var i=0;i<b.length;i++) a.push(b[i]);
+  return a;
+};
+
 exports.requireAnywhere = function(baseModule, moduleName){
   var Module = baseModule.constructor;
   var createRequire = Module.createRequire || Module.createRequireFromPath;
@@ -1130,7 +1138,7 @@ exports.gather = function(f_drain, options){ //f_drain(items, callback)
         _this.items.splice(0);
         f_drain(drainItems, function(err){
           if(!options.parallel) _this.isDraining = false;
-          return callback(err);
+          return callback.apply(null, arguments);
         });
       }
     );

package/lib/WebConnect.js

@@ -44,7 +44,7 @@ function WebConnect() {
   this.MAX_REDIRECTS = 20;
 }
 WebConnect.prototype.reqjson = function (url, method, post, headers, ftarget, callback, options) {
-  this.req(url, method, post, headers, ftarget, function (err, res, rslt) {
+  return this.req(url, method, post, headers, ftarget, function (err, res, rslt) {
     if (callback) {
       if (err) return callback(err, null, null, null);
       if (rslt && (rslt == '---SAVEDTOFILE---')) return callback(err, '---SAVEDTOFILE---', null, res);
@@ -166,6 +166,7 @@ WebConnect.prototype.req = function (url, method, post, headers, ftarget, callba
     else req.write(post);
   }
   req.end();
+  return req;
 };
 
 exports.WebConnect = WebConnect;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsharmony",
-  "version": "1.27.2",
+  "version": "1.28.0",
   "description": "Rapid Application Development (RAD) Platform for Node.js Database Application Development",
   "main": "index.js",
   "scripts": {