jsharmony 1.15.2 → 1.16.3

package/jsHarmony.LoadModels.js

@@ -1635,7 +1635,7 @@ exports.ParseEntities = function () {
         if (field.sql_to_db) field.sql_to_db = _this.parseFieldExpression(field, field.sql_to_db, {}, { ejs:true });
         if (field.sqlsort) field.sqlsort = _this.parseFieldExpression(field, field.sqlsort, {}, { ejs:true });
         if (field.sqlsearch) field.sqlsearch = _this.parseFieldExpression(field, field.sqlsearch, {}, { ejs:true });
-        if (field.sqlsearch_to_db) field.sqlsearch = _this.parseFieldExpression(field, field.sqlsearch_to_db, {}, { ejs:true });
+        if (field.sqlsearch_to_db) field.sqlsearch_to_db = _this.parseFieldExpression(field, field.sqlsearch_to_db, {}, { ejs:true });
         var has_datatype_validator = false;
         if (field.datatype_config){
           if(field.datatype_config.override_length){
@@ -1755,10 +1755,10 @@ exports.ParseEntities = function () {
     }
     
     //Convert mutli-line variables to single string
-    ParseMultiLineProperties(model, ['js', 'jslib', 'sqlselect', 'sqldownloadselect', 'sqlinsert', 'sqlinsertencrypt', 'sqlupdate', 'sqldelete', 'sqlexec', 'sqlwhere', 'sqlgetinsertkeys', 'ongetfilename', 'oninit', 'onload', 'onloadimmediate', 'oninsert', 'onvalidate', 'onupdate', 'ondestroy', 'oncommit', 'onchange']);
+    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']);
     });
@@ -1923,7 +1923,7 @@ exports.ParseEntities = function () {
       'grid_require_search', 'default_search', 'grid_static', 'rowstyle', 'rowclass', 'rowlimit', 'disableautoload',
       'oninit', 'oncommit', 'onload', 'oninsert', 'onupdate', 'onvalidate', 'onloadstate', 'ongetstate', 'onrowbind', 'onrowunbind', 'ondestroy', 'onchange', 'getapi', 'onrender', 'onrendered', 'onsqlinserted', 'onsqlupdated', 'onsqldeleted', 'disable_csv_export',
       'js', 'jslib', 'ejs', 'header', 'css', 'dberrors', 'tablestyle', 'tableclass', 'formstyle', 'formclass', 'popup', 'ongetfilename', 'onloadimmediate', 'sqlwhere', 'sqlwhere_disabled_on_insert', 'breadcrumbs', 'tabpos', 'tabs', 'tabpanelstyle',
-      'nokey', 'nodatalock', 'unbound', 'duplicate', 'sqlselect', 'sqlupdate', 'sqlinsert', 'sqlgetinsertkeys', 'sqldelete', 'sqlexec', 'sqlexec_comment', 'sqltype', 'onroute', 'tabcode', 'noresultsmessage', 'bindings',
+      'nokey', 'nodatalock', 'unbound', 'duplicate', 'sqlselect', 'sqlupdate', 'sqlinsert', 'sqlinsertencrypt', 'sqlgetinsertkeys', 'sqldelete', 'sqlexec', 'sqlexec_comment', 'sqlrowcount', 'sqldownloadselect', 'sqltype', 'onroute', 'tabcode', 'noresultsmessage', 'bindings',
       'path', 'module', 'templates', 'db', 'onecolumn', 'namespace',
       //Report Parameters
       'subheader', 'footerheight', 'headeradd',

package/jsHarmony.js

@@ -141,7 +141,7 @@ jsHarmony.prototype.Init = function(init_cb){
       //Load Configuration Files from modules
       var modeldirs = _this.getModelDirs();
       for (var i = 0; i < modeldirs.length; i++) {
-        _this.Config.LoadJSONConfigFolder(_this, path.normalize(modeldirs[i].path + '../'), _this.Modules[modeldirs[i].module]);
+        _this.Config.LoadJSONConfigFolder(_this, path.normalize(modeldirs[i].path), _this.Modules[modeldirs[i].module]);
       }
 
       //Create Required Folders

package/jsHarmonyConfig.js

@@ -44,9 +44,15 @@ jsHarmonyConfigBase.prototype.Init = function(cb){
   if(cb) return cb();
 };
 //Merge target configuration with existing
-jsHarmonyConfigBase.prototype.Merge = function(config, jsh, sourceModuleName){
-
-  _.merge(this, config);
+jsHarmonyConfigBase.prototype.Merge = function(config, jsh, sourceModuleName, handlers){
+  if(!handlers) handlers = {};
+  for(var prop in config){
+    if(!(prop in this)) this[prop] = config[prop];
+    else if(prop in handlers) handlers[prop](this, config);
+    else if(_.isArray(this[prop]) && _.isArray(config[prop])){ for(var j = 0;j<config[prop].length;j++) this[prop].push(config[prop][j]); }
+    else if(_.isObject(this[prop])) _.merge(this[prop], config[prop]);
+    else this[prop] = config[prop];
+  }
 };
 
 /////////////////
@@ -442,8 +448,8 @@ jsHarmonyConfig.prototype.LoadJSONConfigFolder = function(jsh, fpath, sourceModu
   var _this = this;
 
   //Include appropriate config file based on Path
-  if(!fpath) fpath = jsh.Config.appbasepath;
-  if(!fpath) fpath = path.dirname(require.main.filename);
+  if(!fpath && jsh.Config.appbasepath) fpath = path.join(jsh.Config.appbasepath, 'models');
+  if(!fpath) fpath = path.join(path.dirname(require.main.filename), 'models');
   else if(fpath.substr(fpath.length-1,1)=='/') fpath = fpath.substr(0,fpath.length-1);
 
   //Create array of application path
@@ -454,7 +460,6 @@ jsHarmonyConfig.prototype.LoadJSONConfigFolder = function(jsh, fpath, sourceModu
     patharr.unshift(fbasename);
     fbasepath = path.dirname(fbasepath);
   }
-  fpath += '/models';
   //Load app.config.js
   this.LoadJSONConfigFile(jsh, fpath + '/_config.json', sourceModule);
   //Load app.config.local.js

package/package.json

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

package/sql/datatypes.iseries.json

@@ -63,14 +63,17 @@
   },
   "date":{
     "sql_from_db": "CHAR(%%%SQL%%%, ISO)",
+    "sqlsearch": "CAST(%%%SQL%%% AS DATE)",
     "sqlsearch_to_db": "CAST(%%%SQL%%% AS DATE)"
   },
   "time":{
     "sql_from_db": "CHAR(%%%SQL%%%, ISO)",
+    "sqlsearch": "CAST(%%%SQL%%% AS TIME)",
     "sqlsearch_to_db": "CAST(%%%SQL%%% AS TIME)"
   },
   "timestamp":{
     "sql_from_db": "REGEXP_REPLACE(CHAR(%%%SQL%%%), '-(\\d\\d)\\.(\\d\\d)\\.(\\d\\d)\\.', ' $1:$2:$3.')",
+    "sqlsearch": "CAST(%%%SQL%%% AS TIMESTAMP)",
     "sqlsearch_to_db": "CAST(%%%SQL%%% AS TIMESTAMP)",
     "type": "datetime"
   },

package/sql/datatypes.mssql.json

@@ -12,9 +12,9 @@
   "bit":{ "type": "boolean" },
   "decimal":{ 
     "sql_from_db": "cast(%%%SQL%%% as nvarchar)",
-    "sqlsearch": "%%%SQL%%%",
     "sqlsort": "cast(%%%SQL%%% as decimal(%%%PREC_H%%%,%%%PREC_L%%%))",
     "sql_to_db": "cast(%%%SQL%%% as decimal(%%%PREC_H%%%,%%%PREC_L%%%))",
+    "sqlsearch": "cast(%%%SQL%%% as decimal(%%%PREC_H%%%,%%%PREC_L%%%))",
     "sqlsearch_to_db": "cast(%%%SQL%%% as decimal(%%%PREC_H%%%,%%%PREC_L%%%))",
     "datatype_config": {
       "defaults":{ "PREC_H": 38, "PREC_L": 10 }
@@ -22,9 +22,9 @@
   },
   "float":{ 
     "sql_from_db": "convert(varchar(50), %%%SQL%%%, 3)",
-    "sqlsearch": "%%%SQL%%%",
     "sqlsort": "cast(%%%SQL%%% as float(%%%PREC%%%))",
     "sql_to_db": "cast(%%%SQL%%% as float(%%%PREC%%%))",
+    "sqlsearch": "cast(%%%SQL%%% as float(%%%PREC%%%))",
     "sqlsearch_to_db": "cast(%%%SQL%%% as float(%%%PREC%%%))",
     "datatype_config": {
       "defaults":{ "PREC": 53 }
@@ -36,9 +36,9 @@
   },
   "money":{ 
     "sql_from_db": "cast(%%%SQL%%% as nvarchar)",
-    "sqlsearch": "%%%SQL%%%",
     "sqlsort": "cast(%%%SQL%%% as decimal(%%%PREC_H%%%,%%%PREC_L%%%))",
     "sql_to_db": "cast(%%%SQL%%% as decimal(%%%PREC_H%%%,%%%PREC_L%%%))",
+    "sqlsearch": "cast(%%%SQL%%% as decimal(%%%PREC_H%%%,%%%PREC_L%%%))",
     "sqlsearch_to_db": "cast(%%%SQL%%% as decimal(%%%PREC_H%%%,%%%PREC_L%%%))",
     "datatype_config": {
       "defaults":{ "PREC_H": 19, "PREC_L": 4 }
@@ -51,9 +51,9 @@
   },
   "smallmoney":{ 
     "sql_from_db": "cast(%%%SQL%%% as nvarchar)",
-    "sqlsearch": "%%%SQL%%%",
     "sqlsort": "cast(%%%SQL%%% as decimal(%%%PREC_H%%%,%%%PREC_L%%%))",
     "sql_to_db": "cast(%%%SQL%%% as decimal(%%%PREC_H%%%,%%%PREC_L%%%))",
+    "sqlsearch": "cast(%%%SQL%%% as decimal(%%%PREC_H%%%,%%%PREC_L%%%))",
     "sqlsearch_to_db": "cast(%%%SQL%%% as decimal(%%%PREC_H%%%,%%%PREC_L%%%))",
     "datatype_config": {
       "defaults":{ "PREC_H": 10, "PREC_L": 4 }

package/sql/datatypes.pgsql.json

@@ -12,7 +12,7 @@
   },
   "decimal":{
     "sql_from_db": "cast(%%%SQL%%% as varchar)",
-    "sqlsearch": "%%%SQL%%%",
+    "sqlsearch": "cast(%%%SQL%%% as decimal(%%%PREC_H%%%,%%%PREC_L%%%))",
     "sqlsearch_to_db": "cast(%%%SQL%%% as decimal(%%%PREC_H%%%,%%%PREC_L%%%))",
     "datatype_config":{
       "defaults":{ "PREC_H": 38, "PREC_L": 10 }
@@ -25,7 +25,7 @@
   },
   "double precision":{
     "sql_from_db": "cast(%%%SQL%%% as varchar(50))",
-    "sqlsearch": "%%%SQL%%%",
+    "sqlsearch": "cast(%%%SQL%%% as float(%%%PREC%%%))",
     "sqlsearch_to_db": "cast(%%%SQL%%% as float(%%%PREC%%%))",
     "datatype_config":{
       "defaults":{ "PREC": 53 }

package/sql/datatypes.sqlite.json

@@ -2,12 +2,12 @@
   "integer":{ "type": "int" },
   "decimal":{ 
     "sql_from_db": "%%%SQL%%%",
-    "sqlsearch": "%%%SQL%%%",
+    "sqlsearch": "cast(%%%SQL%%% as real)",
     "sqlsearch_to_db": "cast(%%%SQL%%% as real)"
   },
   "real":{ 
     "sql_from_db": "%%%SQL%%%",
-    "sqlsearch": "%%%SQL%%%",
+    "sqlsearch": "cast(%%%SQL%%% as real)",
     "sqlsearch_to_db": "cast(%%%SQL%%% as real)",
     "datatype_config":{
       "defaults":{ "PREC": 53 }
@@ -16,14 +16,17 @@
   },
   "time":{
     "sql_from_db": "strftime('1970-01-01T%H:%M:%f',%%%SQL%%%)",
+    "sqlsearch": "strftime('1970-01-01T%H:%M:%f',%%%SQL%%%)",
     "sqlsearch_to_db": "strftime('1970-01-01T%H:%M:%f',%%%SQL%%%)"
   },
   "date":{
     "sql_from_db": "strftime('%Y-%m-%dT00:00:00',%%%SQL%%%)",
+    "sqlsearch": "strftime('%Y-%m-%dT00:00:00',%%%SQL%%%)",
     "sqlsearch_to_db": "strftime('%Y-%m-%dT00:00:00',%%%SQL%%%)"
   },
   "datetime":{
     "sql_from_db": "strftime('%Y-%m-%dT%H:%M:%f',%%%SQL%%%)",
+    "sqlsearch": "strftime('%Y-%m-%dT%H:%M:%f',%%%SQL%%%)",
     "sqlsearch_to_db": "strftime('%Y-%m-%dT%H:%M:%f',%%%SQL%%%)"
   },
   "text":{ "type": "varchar" },