backend-plus 2.0.0-rc.16 → 2.0.0-rc.18

package/for-client/my-tables.js

@@ -183,20 +183,15 @@ myOwn.i18n.messages.es=changing(myOwn.i18n.messages.es, {
 /** @param {string} text */
 function regex4search(text){
     return new RegExp(
-        text.trim().replace(/[.*+?^${}()|[\]\\]/g, "\\$&")
+        text.toString().trim().replace(/[.*+?^${}()|[\]\\]/g, "\\$&")
         // .replace(/"/g,"\\b")
         .replace(/[ñÑ]/g,'(?:gn|nn?i?|[ñÑ])')
-        .replace(/[cCçÇ]/g,'[cçÇ]')
-        .replace(/[áÁàÀäÄãÃ]/gi,'[AáÁàÀäÄãÃ]')
-        .replace(/[éÉèÈëË]/gi,'[EéÉèÈëË]')
-        .replace(/[íÍìÌïÏ]/gi,'[IíÍìÌïÏ]')
-        .replace(/[óÓòÒöÖõÕ]/gi,'[OóÓòÒöÖõÕ]')
-        .replace(/[úÚùÙüÜ]/gi,'[UúÚùÙüÜ]')
-        .replace(/a/gi,'[AáÁàÀäÄãÃ]')
-        .replace(/e/gi,'[EéÉèÈëË]')
-        .replace(/i/gi,'[IíÍìÌïÏ]')
-        .replace(/o/gi,'[OóÓòÒöÖõÕ]')
-        .replace(/u/gi,'[UúÚùÙüÜ]')
+        .replace(/[cCçÇ]/g,'[cCçÇ]')
+        .replace(/[AáÁàÀäÄãÃ]/gi,'[AáÁàÀäÄãÃ]')
+        .replace(/[EéÉèÈëË]/gi,'[EéÉèÈëË]')
+        .replace(/[IíÍìÌïÏ]/gi,'[IíÍìÌïÏ]')
+        .replace(/[OóÓòÒöÖõÕ]/gi,'[OóÓòÒöÖõÕ]')
+        .replace(/[UúÚùÙüÜ]/gi,'[UúÚùÙüÜ]')
         // .replace(/\s+/g,'.*\\s+.*') mas estricto, exige el espacio
         .replace(/\s+/g,'.*')
     , 'i');
@@ -212,9 +207,9 @@ myOwn.comparatorParameterNull={
     '!=\u2205':true,
 }
 myOwn.comparator={
-    '=':function(valueToCheck,condition){return valueToCheck == condition;},
-    '~':function(valueToCheck,condition){return condition==null || regex4search(condition.toString()).test(valueToCheck);},
-    '!~':function(valueToCheck,condition){return condition==null || !regex4search(condition.toString()).test(valueToCheck);},
+    '=':function(valueToCheck,condition){return sameValue(valueToCheck,condition);},
+    '~': function(valueToCheck,condition){return condition==null || condition instanceof Date ? Math.abs(condition-valueToCheck) <= 1000*60*60*24 : regex4search(condition).test(valueToCheck);},
+    '!~':function(valueToCheck,condition){return condition==null || condition instanceof Date ? Math.abs(condition-valueToCheck) >  1000*60*60*24 :!regex4search(condition).test(valueToCheck);},
     '/R/i':function(valueToCheck,condition){return condition==null || RegExp(condition,'i').test(valueToCheck);},
     '\u2205':function(valueToCheck,condition){return valueToCheck == null;},//\u2205 = conjunto vacío
     '!=\u2205':function(valueToCheck,condition){return valueToCheck != null;},//\u2205 = conjunto vacío
@@ -1005,7 +1000,7 @@ myOwn.DataColumnGrid.prototype.thFilter = function thFilter(depot, iColumn){
     var grid = this.grid;
     var fieldDef = this.fieldDef;
     var fieldName=fieldDef.name;
-    depot.rowSymbols[fieldDef.name]=depot.rowSymbols[fieldDef.name]||'~';
+    depot.rowSymbols[fieldDef.name]=depot.rowSymbols[fieldDef.name]||(fieldDef.typeName == 'text' ? '~' : '=');
     var filterImage=my.path.img+my.comparator.traductor[depot.rowSymbols[fieldDef.name]]+'.png';
     var th=html.td(this.cellAttributes({class:"autoFilter", "typed-controls-direct-input":true},{skipMandatory:true})).create();
     var symbolFilter=th;

package/lib/backend-plus.d.ts

@@ -184,7 +184,7 @@ export type FieldDefinition = EditableDbDefinition & {
     serverSide?:boolean        /* default:!clientSide if the value is retrived from the database */
     inTable?:boolean           /* default:!clientSide && !sql.fields[...].expr. Is a real fisical field in the table */
     /* sizeByte?:number  deprecated size in bytes for numbers */
-    allowEmtpyText?:boolean    /* if a text field accepts '' as a valid value */
+    allowEmptyText?:boolean    /* if a text field accepts '' as a valid value */
     mobileInputType?:string     
     extraRow?:number
     inexactNumber?:number      /* default:depends on typeName  if = means abs(x-v)<espilon

package/lib/backend-plus.js

@@ -2978,22 +2978,32 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
                             lines[0][0]=lines[0][0].replace('\ufeff','')
                         }
                         rows=lines.slice(1);
+                        var filteredFieldDef = lines[0].filter(filterField);
                         if(tablesWithStrictSequence[tableName]){
                             var dataString="COPY "+db.quoteIdent(tableName)+" ("+
-                                lines[0].filter(filterField).map(db.quoteIdent).join(', ')+
+                                filteredFieldDef.map(db.quoteIdent).join(', ')+
                                 ') FROM stdin;\n'+
                                 rows.map(function(line){
-                                    return line.filter(function(_,i){ return filterField(lines[0][i]);}).map(function(value){
-                                        return value===''?'\\N':value.replace(/\\/g,'\\\\').replace(/\t/g,'\\t').replace(/\n/g,'\\n').replace(/\r/g,'\\r');
+                                    return line.filter(function(_,i){ return filterField(lines[0][i]);}).map(function(value,i){
+                                        var def = tableDef.field[filteredFieldDef[i]];
+                                        return value==='' ? (
+                                                def.allowEmptyText && ('nullable' in def) && !def.nullable ? '' : '\\N'
+                                            ): value.replace(/\\/g,'\\\\').replace(/\t/g,'\\t').replace(/\n/g,'\\n').replace(/\r/g,'\\r');
                                     }).join('\t')+'\n';
                                 }).join('')+'\\.\n';
                         }else{
                             var dataString="insert into "+db.quoteIdent(tableName)+" ("+
-                                lines[0].filter(filterField).map(db.quoteIdent).join(', ')+
+                                filteredFieldDef.map(db.quoteIdent).join(', ')+
                                 ') values\n'+
                                 rows.map(function(line){
-                                    return "("+line.filter(function(_,i){ return filterField(lines[0][i]);}).map(function(value){
-                                        return value===''?'null':db.quoteNullable(value);
+                                    return "("+line.filter(function(_,i){ return filterField(lines[0][i]);}).map(function(value,i){
+                                        var def = tableDef.field[filteredFieldDef[i]];
+                                        if(def == null) {
+                                            throw Error("no se encuentra la columna "+filteredFieldDef[i]+" en "+tableName);
+                                        }
+                                        return value==='' ? (
+                                            def.allowEmptyText && ('nullable' in def) && !def.nullable ? "''" : 'null' 
+                                        ) : db.quoteNullable(value);
                                     }).join(', ')+")";
                                 }).join(',\n')+';\n';
                         }

package/lib/procedures-table.js

@@ -823,6 +823,9 @@ ProcedureTables = [
                                     if(value != null && parameters.skipUnknownFieldsAtImport){
                                         value = value.replace(/(\s|\u00A0)+/g,' ').trim()
                                     }
+                                    if (value == null && field.allowEmptyText && ('nullable' in field) && !field.nullable ) {
+                                        value = ''
+                                    }
                                     newRow[field.name]=value;
                                 }
                             });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for the anti Pareto rule",
-  "version": "2.0.0-rc.16",
+  "version": "2.0.0-rc.18",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -82,7 +82,7 @@
     "@types/js-yaml": "^4.0.9",
     "@types/mocha": "^10.0.6",
     "@types/multiparty": "~0.0.36",
-    "@types/node": "^20.13.0",
+    "@types/node": "^20.14.0",
     "@types/nodemailer": "^6.4.15",
     "@types/numeral": "~2.0.5",
     "@types/session-file-store": "^1.2.5",