jsharmony 1.16.2 → 1.18.0

package/AppSrvTask.js

@@ -286,7 +286,7 @@ AppSrvTask.prototype.exec_sqltrans = function(model, command, params, options, c
 };
 
 AppSrvTask.prototype.exec_sql = function(model, command, params, options, command_cb){
-  //sql (sql, db, into, foreach_row)
+  //sql (sql, db, into, foreach_row, fields)
 
   var _this = this;
 
@@ -774,7 +774,7 @@ AppSrvTask.prototype.getCSVSQLData = function(model, command, params, options, o
 };
 
 AppSrvTask.prototype.exec_write_csv = function(model, command, params, options, command_cb){
-  //write_csv (path, db, data, sql, overwrite, headers)
+  //write_csv (path, db, data, sql, overwrite, fields, headers, csv_options)
   //handle data: {}, [], [[]], [{}]
   //can't have both data and sql
 
@@ -819,6 +819,7 @@ AppSrvTask.prototype.exec_write_csv = function(model, command, params, options,
       var columns = _.map(command.fields, function(field){ if(_.isString(field)) return field; return field.name; });
       if(!_.isEmpty(columns)) command.columns = columns;
     }
+    csv_options = _.extend(csv_options, (command.csv_options || {}));
     var csvwriter = csv.stringify(csv_options);
     csvwriter.on('error', function(err){
       if(hasError) return;
@@ -846,7 +847,7 @@ AppSrvTask.prototype.exec_write_csv = function(model, command, params, options,
 };
 
 AppSrvTask.prototype.exec_append_csv = function(model, command, params, options, command_cb){
-  //append_csv (path, db, data, sql)
+  //append_csv (path, db, data, sql, fields, headers, csv_options)
 
   var _this = this;
 
@@ -888,6 +889,7 @@ AppSrvTask.prototype.exec_append_csv = function(model, command, params, options,
       var columns = _.map(command.fields, function(field){ if(_.isString(field)) return field; return field.name; });
       if(!_.isEmpty(columns)) command.columns = columns;
     }
+    csv_options = _.extend(csv_options, (command.csv_options || {}));
     var csvwriter = csv.stringify(csv_options);
     csvwriter.on('error', function(err){
       if(hasError) return;
@@ -1109,7 +1111,8 @@ AppSrvTask.prototype.exec_shell = function(model, command, params, options, comm
 };
 
 AppSrvTask.prototype.exec_email = function(model, command, params, options, command_cb){
-  //email (to, cc, bcc, subject, text, html, attachments)
+  //email ( email: { to, cc, bcc, subject, text, html, attachments } )
+  //email ( jsharmony_txt: { txt_attrib, to, cc, bcc, attachments } )
 
   var _this = this;
 

package/jsHarmony.LoadModels.js

@@ -1758,7 +1758,7 @@ exports.ParseEntities = function () {
     ParseMultiLineProperties(model, ['js', 'jslib', 'sqlselect', 'sqldownloadselect', 'sqlrowcount', 'sqlinsert', 'sqlinsertencrypt', 'sqlupdate', 'sqldelete', 'sqlexec', 'sqlwhere', 'sqlgetinsertkeys', 'ongetfilename', 'oninit', 'onload', 'onloadimmediate', 'oninsert', 'onvalidate', 'onupdate', 'ondestroy', 'oncommit', 'onchange']);
     if (model.breadcrumbs) ParseMultiLineProperties(model.breadcrumbs, ['sql']);
     if (model.fields) _.each(model.fields, function (field) {
-      ParseMultiLineProperties(field, ['onchange', 'sqlselect', 'sqlupdate', 'sqlinsert', 'sqlwhere', 'sqlsort', 'sqlsearch', 'sqlsearchsound', 'value']);
+      ParseMultiLineProperties(field, ['onclick','onchange', 'sqlselect', 'sqlupdate', 'sqlinsert', 'sqlwhere', 'sqlsort', 'sqlsearch', 'sqlsearchsound', 'value']);
       if (field.lov) ParseMultiLineProperties(field.lov, ['sql', 'sql2', 'sqlmp', 'sqlselect']);
       if (field.controlparams) ParseMultiLineProperties(field.controlparams, ['onpopup']);
     });

package/jsHarmony.LoadTasks.js

@@ -126,7 +126,7 @@ exports.ParseTaskCommand = function(model, command, params){
     parseChildCommands('read_file', 'foreach_line', 'line');
   }
   else if(command.exec == 'write_csv'){
-    validateCommandProperties(['path','db','data','sql','headers','overwrite','fields']);
+    validateCommandProperties(['path','db','data','sql','headers','overwrite','fields','csv_options']);
     if(command.sql) command.sql = Helper.ParseMultiLine(command.sql);
     if(command.data){
       if(!_.isArray(command.data)) command.data = [command.data]; //{} => [{}]
@@ -134,7 +134,7 @@ exports.ParseTaskCommand = function(model, command, params){
     }
   }
   else if(command.exec == 'append_csv'){
-    validateCommandProperties(['path','db','data','sql','headers','fields']);
+    validateCommandProperties(['path','db','data','sql','headers','fields','csv_options']);
     if(command.sql) command.sql = Helper.ParseMultiLine(command.sql);
     if(command.data){
       if(!_.isArray(command.data)) command.data = [command.data]; //{} => [{}]

package/lib/CodeGen.SQLObjects.js

@@ -26,7 +26,7 @@ module.exports = exports = {};
 exports.generateSQLObjects = function(table, options, callback){
   var _this = this;
   
-  options = _.extend({ db: 'default', withData: false, maxDataCount: 5000, ignore_jsharmony_schema: true }, options);
+  options = _.extend({ db: 'default', withData: false, dataFilter: null, maxDataCount: 5000, ignore_jsharmony_schema: true }, options);
   if(!options.db) options.db = 'default';
   var db = this.jsh.DB[options.db];
   var rslt = {};
@@ -54,13 +54,15 @@ exports.generateSQLObjects = function(table, options, callback){
           //Get data
           function(generate_cb){
             if(!options.withData) return generate_cb();
-            db.Scalar('','select count(*) from ' + tabledef.table_selector,[],{},function(err,datacnt){
+            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(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);
               }
-              db.Recordset('','select * from ' + tabledef.table_selector,[],{},function(err,rslt){
+              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);

package/package.json

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