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

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.17",
   "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",