backend-plus 1.18.2 → 1.18.3

package/lib/backend-plus.js

@@ -2756,157 +2756,164 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
     }
     var enancePart= 'do $SQL_ENANCE$\n begin\n' + enanceLines.join('\n')+'\n' + 'end\n$SQL_ENANCE$;';
     var someNotFound=false;
-    return Promise.all(likeAr(partialTableStructures).map(function(tableDef, tableName, _, i){
-        if(tableDef?.sql?.isTable === false) return;
-        // TODO: buscar
-        var buscarEn=[Path.join('local-install',tableName+'.tab')].concat(
-            be.appStack.map(function(stackNode){
-                return Path.join(stackNode.path,'../install',tableName+'.tab').replace(regexpDistReplacer,'$1$2');
-            })
-        );
-        if(be.config.install['table-data-dir'] instanceof Array){
-            buscarEn=be.config.install['table-data-dir'].map(path=>Path.join(path,tableName+'.tab')).concat(buscarEn);
-        }else if(be.config.install['table-data-dir']){
-            buscarEn=[].concat(Path.join(be.config.install['table-data-dir'],tableName+'.tab')).concat(buscarEn);
-        }
-        if(!i) console.log('buscar en', buscarEn)
-        return locatePath(buscarEn).then(function(theTableFileName){
-            if(theTableFileName==undefined){
-                var err = new Error('not found');
-                err.code='ENOENT'
-                throw err;
+    try {
+        var allTableData = await fs.readFile('install/local-data-dump.psql','utf-8');
+    } catch(err) {
+        if (err.code != 'ENOENT') throw err;
+    }
+    if (allTableData) {
+        dataText = [allTableData]
+    } else {
+        await Promise.all(likeAr(partialTableStructures).map(function(tableDef, tableName, _, i){
+            if(tableDef?.sql?.isTable === false) return;
+            // TODO: buscar
+            var buscarEn=[Path.join('local-install',tableName+'.tab')].concat(
+                be.appStack.map(function(stackNode){
+                    return Path.join(stackNode.path,'../install',tableName+'.tab').replace(regexpDistReplacer,'$1$2');
+                })
+            );
+            if(be.config.install['table-data-dir'] instanceof Array){
+                buscarEn=be.config.install['table-data-dir'].map(path=>Path.join(path,tableName+'.tab')).concat(buscarEn);
+            }else if(be.config.install['table-data-dir']){
+                buscarEn=[].concat(Path.join(be.config.install['table-data-dir'],tableName+'.tab')).concat(buscarEn);
             }
-            return fs.readFile(theTableFileName, {encoding:'UTF8'}).then(function(content){
-                return {path:Path.relative(process.cwd(),theTableFileName),content};
-            });
-        }).then(function({path,content}){
-            dataText.push("\n-- table data: "+path);
-            var lines;
-            var rows;
-            var tableDef=partialTableStructures[tableName](contextForDump);
-            var filterField=function(fieldName){
-                if(fieldName==null){
-                    throw new Error('ERROR empty name or extra column in '+tableName+'.tab')
-                }
-                var defField=tableDef.field[fieldName];
-                if(!defField && !fieldName.startsWith('!')){
-                    throw new Error('field '+fieldName+' does no exists in .tab for '+tableName+' in '+path);
+            if(!i) console.log('buscar en', buscarEn)
+            return locatePath(buscarEn).then(function(theTableFileName){
+                if(theTableFileName==undefined){
+                    var err = new Error('not found');
+                    err.code='ENOENT'
+                    throw err;
                 }
-                return !fieldName.startsWith('!') && defField.inTable!==false && !defField.inJoin && (!defField.clientSide || defField.serverSide) && !defField.generatedAs;
-            }
-            if(/[-[]/.test(content[0])){
-                var filterField2=function(_value,fieldName){
-                    var fieldDef = tableDef.field[fieldName];
-                    if(!fieldDef){
-                        console.log('lack of field',fieldName,'in table',tableName,'filtering fields')
+                return fs.readFile(theTableFileName, {encoding:'UTF8'}).then(function(content){
+                    return {path:Path.relative(process.cwd(),theTableFileName),content};
+                });
+            }).then(function({path,content}){
+                dataText.push("\n-- table data: "+path);
+                var lines;
+                var rows;
+                var tableDef=partialTableStructures[tableName](contextForDump);
+                var filterField=function(fieldName){
+                    if(fieldName==null){
+                        throw new Error('ERROR empty name or extra column in '+tableName+'.tab')
                     }
-                    return (!fieldDef.sequence || fieldDef.sequence.name) && filterField(fieldName);
+                    var defField=tableDef.field[fieldName];
+                    if(!defField && !fieldName.startsWith('!')){
+                        throw new Error('field '+fieldName+' does no exists in .tab for '+tableName+' in '+path);
+                    }
+                    return !fieldName.startsWith('!') && defField.inTable!==false && !defField.inJoin && (!defField.clientSide || defField.serverSide) && !defField.generatedAs;
                 }
-                lines = jsYaml.load(content);
-                lines.forEach(function(line){
-                    var dataString="insert into "+db.quoteIdent(tableName)+" ("+
-                        likeAr(line).filter(filterField2).keys().map(db.quoteIdent).join(', ')+
-                        ') values ('+
-                        likeAr(line).filter(filterField2).map(function(value){
-                            return db.quoteNullable(value);
-                        }).join(', ')+");\n";
-                    dataText.push(dataString);
-                });
-                rows=lines;
-            }else{
-                var lines=content.split(/\r?\n/)
-                    .filter(line => !(/^[-| ]*$/.test(line)) )
-                    .map(line => line.split(/(?<!(?:^|[^\\])(?:\\\\)*\\)\|/).map(item => item.trimRight().replace(/\\(.)/g,(_,l)=>(l=='t'?'\t':l=='r'?'\r':l=='n'?'\n':l=='s'?' ':l))) )
-                    .filter(line => line.length>1 || line.length==1 && line[0].trim() );
-                if(lines.length>1){
-                    if(lines[0][0].startsWith('\ufeff')){
-                        lines[0][0]=lines[0][0].replace('\ufeff','')
+                if(/[-[]/.test(content[0])){
+                    var filterField2=function(_value,fieldName){
+                        var fieldDef = tableDef.field[fieldName];
+                        if(!fieldDef){
+                            console.log('lack of field',fieldName,'in table',tableName,'filtering fields')
+                        }
+                        return (!fieldDef.sequence || fieldDef.sequence.name) && filterField(fieldName);
                     }
-                    rows=lines.slice(1);
-                    if(tablesWithStrictSequence[tableName]){
-                        var dataString="COPY "+db.quoteIdent(tableName)+" ("+
-                            lines[0].filter(filterField).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');
-                                }).join('\t')+'\n';
-                            }).join('')+'\\.\n';
-                    }else{
+                    lines = jsYaml.load(content);
+                    lines.forEach(function(line){
                         var dataString="insert into "+db.quoteIdent(tableName)+" ("+
-                            lines[0].filter(filterField).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);
-                                }).join(', ')+")";
-                            }).join(',\n')+';\n';
+                            likeAr(line).filter(filterField2).keys().map(db.quoteIdent).join(', ')+
+                            ') values ('+
+                            likeAr(line).filter(filterField2).map(function(value){
+                                return db.quoteNullable(value);
+                            }).join(', ')+");\n";
+                        dataText.push(dataString);
+                    });
+                    rows=lines;
+                }else{
+                    var lines=content.split(/\r?\n/)
+                        .filter(line => !(/^[-| ]*$/.test(line)) )
+                        .map(line => line.split(/(?<!(?:^|[^\\])(?:\\\\)*\\)\|/).map(item => item.trimRight().replace(/\\(.)/g,(_,l)=>(l=='t'?'\t':l=='r'?'\r':l=='n'?'\n':l=='s'?' ':l))) )
+                        .filter(line => line.length>1 || line.length==1 && line[0].trim() );
+                    if(lines.length>1){
+                        if(lines[0][0].startsWith('\ufeff')){
+                            lines[0][0]=lines[0][0].replace('\ufeff','')
+                        }
+                        rows=lines.slice(1);
+                        if(tablesWithStrictSequence[tableName]){
+                            var dataString="COPY "+db.quoteIdent(tableName)+" ("+
+                                lines[0].filter(filterField).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');
+                                    }).join('\t')+'\n';
+                                }).join('')+'\\.\n';
+                        }else{
+                            var dataString="insert into "+db.quoteIdent(tableName)+" ("+
+                                lines[0].filter(filterField).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);
+                                    }).join(', ')+")";
+                                }).join(',\n')+';\n';
+                        }
+                        dataText.push(dataString);
                     }
-                    dataText.push(dataString);
+                    // tablesWithStrictSequence[tableName]
                 }
-                // tablesWithStrictSequence[tableName]
-            }
-        }).catch(function(err){
-            if(err.code=='ENOENT'){
-                if(!be.config.install.dump["skip-content"]){
-                    console.log('skipping content for','install/'+tableName+'.tab');
-                    someNotFound=true;
+            }).catch(function(err){
+                if(err.code=='ENOENT'){
+                    if(!be.config.install.dump["skip-content"]){
+                        console.log('skipping content for','install/'+tableName+'.tab');
+                        someNotFound=true;
+                    }
+                }else{
+                    throw err;
                 }
-            }else{
-                throw err;
-            }
-        });
-    }).array()).then(function(){
+            });
+        }).array())
         if(someNotFound){
             console.log('silence "skipping content" messages in "local-config.yaml".install.dump.skip-content=true');
         }
-        return Promise.all(
-            ['prepare.sql','pre-adapt.sql','adapt.sql']
-            .concat(be.config.install.dump.scripts['prepare'])
-            .concat(be.config.install.dump.scripts['post-adapt'])
-            .map(function(fileName){
-                return fs.readFile(be.rootPath+'/install/'+fileName, {encoding:'UTF8'}).catch(function(err){
-                    if(err.code!='ENOENT'){
-                        throw err;
-                    }
-                    console.log("err:",err);
-                    return '-- no '+fileName+'\n';
-                }).then(function(content){
-                    return '-- '+fileName+'\n'+content;
-                });
-            })
-        );
-    }).then(function(texts){
-        var prepareList=(be.config.install.dump.scripts['prepare']||[]);
-        var mainSql=(
-            (complete? linesCreate.join('\n'): '')+
-            (complete||opts.forDump? searchPathline.join('\n'): '')+
-            (complete? '\n\n--prepare.sql\n'+ texts[0]+'\n\n' :'' )+
-            (complete? texts.slice(3,3+prepareList.length).join('\n\n')+'\n\n' : '' )+
-            '\n-- functions\n' + functionLines.join('\n')+
-            '\n-- lines \n' + lines.join('\n')+
-            (complete? ('\n\n-- pre-ADAPTs\n'+texts[1]+'\n\n') : '' )+
-            (complete? ('\n\n-- DATA\n'+ dataText.join('\n')) : '' )+ 
-            (complete? ('\n\n-- ADAPTs\n'+ texts[2]+'\n\n') : '' )+
-            '\n-- conss\n' + consLines.join('\n')+
-            '\n-- FKs\n' + fkLines.join('\n')+
-            '\n-- index\n' + indexLines.join('\n')+
-            '\n-- policies\n' + policyLines.join('\n')+
-            (complete? texts.slice(3+prepareList.length).join('\n\n')+'\n\n' : '' )+
-            (complete? (be.config.install.dump.enances==='inline'?enancePart:'') :'')
-        ).replace(/\uFEFF/g /*inner BOM replacing*/,'\n\n').replace(
-            new RegExp(escapeRegExp(db.quoteIdent(be.config.install.dump.db["owner4special-scripts"])),'g'),
-            db.quoteIdent(be.config.install.dump.db.owner)
-        ).replace(
-            new RegExp(escapeRegExp(db.quoteIdent(be.config.install.dump.db["user4special-scripts"])),'g'),
-            db.quoteIdent(be.config.db.user)
-        );
-        if(be.config.install.dump.db["apply-generic-user-replaces"]){
-            mainSql=mainSql.replace(/((\bto\s|=)\s*"?)\w+(_user\b)/ig, "$1"+user);
-            mainSql=mainSql.replace(/((\bto\s|=)\s*"?)\w+(_owner\b)/ig, "$1"+owner);
-        }
-        return {mainSql,enancePart};
-    });
+    }
+    let texts = await Promise.all(
+        ['prepare.sql','pre-adapt.sql','adapt.sql']
+        .concat(be.config.install.dump.scripts['prepare'])
+        .concat(be.config.install.dump.scripts['post-adapt'])
+        .map(function(fileName){
+            return fs.readFile(be.rootPath+'/install/'+fileName, {encoding:'UTF8'}).catch(function(err){
+                if(err.code!='ENOENT'){
+                    throw err;
+                }
+                console.log("err:",err);
+                return '-- no '+fileName+'\n';
+            }).then(function(content){
+                return '-- '+fileName+'\n'+content;
+            });
+        })
+    );
+    var prepareList=(be.config.install.dump.scripts['prepare']||[]);
+    var mainSql=(
+        (complete? linesCreate.join('\n'): '')+
+        (complete||opts.forDump? searchPathline.join('\n'): '')+
+        (complete? '\n\n--prepare.sql\n'+ texts[0]+'\n\n' :'' )+
+        (complete? texts.slice(3,3+prepareList.length).join('\n\n')+'\n\n' : '' )+
+        '\n-- functions\n' + functionLines.join('\n')+
+        '\n-- lines \n' + lines.join('\n')+
+        (complete? ('\n\n-- pre-ADAPTs\n'+texts[1]+'\n\n') : '' )+
+        (complete? ('\n\n-- DATA\n'+ dataText.join('\n')) : '' )+ 
+        (complete? ('\n\n-- ADAPTs\n'+ texts[2]+'\n\n') : '' )+
+        '\n-- conss\n' + consLines.join('\n')+
+        '\n-- FKs\n' + fkLines.join('\n')+
+        '\n-- index\n' + indexLines.join('\n')+
+        '\n-- policies\n' + policyLines.join('\n')+
+        (complete? texts.slice(3+prepareList.length).join('\n\n')+'\n\n' : '' )+
+        (complete? (be.config.install.dump.enances==='inline'?enancePart:'') :'')
+    ).replace(/\uFEFF/g /*inner BOM replacing*/,'\n\n').replace(
+        new RegExp(escapeRegExp(db.quoteIdent(be.config.install.dump.db["owner4special-scripts"])),'g'),
+        db.quoteIdent(be.config.install.dump.db.owner)
+    ).replace(
+        new RegExp(escapeRegExp(db.quoteIdent(be.config.install.dump.db["user4special-scripts"])),'g'),
+        db.quoteIdent(be.config.db.user)
+    );
+    if(be.config.install.dump.db["apply-generic-user-replaces"]){
+        mainSql=mainSql.replace(/((\bto\s|=)\s*"?)\w+(_user\b)/ig, "$1"+user);
+        mainSql=mainSql.replace(/((\bto\s|=)\s*"?)\w+(_owner\b)/ig, "$1"+owner);
+    }
+    return {mainSql,enancePart};
 }
 
 AppBackend.prototype.getDbFunctions = async function (){

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for typed controls",
-  "version": "1.18.2",
+  "version": "1.18.3",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -49,7 +49,7 @@
     "json4all": "^1.2.1",
     "lazy-some": "^0.1.0",
     "like-ar": "^0.3.9",
-    "login-plus": "^1.7.0",
+    "login-plus": "^1.7.1",
     "memorystore": "^1.6.7",
     "mini-tools": "^1.12.0",
     "moment": "^2.29.4",
@@ -61,7 +61,7 @@
     "pug": "^3.0.2",
     "read-yaml-promise": "^1.0.2",
     "regexplicit": "^0.1.3",
-    "require-bro": "^0.3.0",
+    "require-bro": "^0.3.1",
     "self-explain": "^0.10.22",
     "serve-content": "^0.3.18",
     "session-file-store": "^1.5.0",
@@ -106,7 +106,7 @@
     "why-is-node-running": "^2.2.2"
   },
   "engines": {
-    "node": ">= 10"
+    "node": ">= 18"
   },
   "scripts": {
     "test": "(npm run prepublish || echo \"continue w/error\") && mocha --reporter spec --single-run --bail  test/test-*.js",