backend-plus 2.0.0-rc.4 → 2.0.0-rc.6

package/README.md

@@ -6,11 +6,11 @@ Backend for the anti Pareto rule.
 
 
 ![stable](https://img.shields.io/badge/stability-stable-blue.svg)
-[![npm-version](https://img.shields.io/npm/v/backend-star.svg)](https://npmjs.org/package/backend-star)
-[![downloads](https://img.shields.io/npm/dm/backend-star.svg)](https://npmjs.org/package/backend-star)
-[![build](https://img.shields.io/travis/codenautas/backend-star/master.svg)](https://travis-ci.org/codenautas/backend-star)
-[![coverage](https://img.shields.io/coveralls/codenautas/backend-star/master.svg)](https://coveralls.io/r/codenautas/backend-star)
-[![dependencies](https://img.shields.io/david/codenautas/backend-star.svg)](https://david-dm.org/codenautas/backend-star)
+[![npm-version](https://img.shields.io/npm/v/backend-plus.svg)](https://npmjs.org/package/backend-plus)
+[![downloads](https://img.shields.io/npm/dm/backend-plus.svg)](https://npmjs.org/package/backend-plus)
+[![build](https://img.shields.io/travis/codenautas/backend-plus/master.svg)](https://travis-ci.org/codenautas/backend-plus)
+[![coverage](https://img.shields.io/coveralls/codenautas/backend-plus/master.svg)](https://coveralls.io/r/codenautas/backend-plus)
+[![dependencies](https://img.shields.io/david/codenautas/backend-plus.svg)](https://david-dm.org/codenautas/backend-plus)
 
 
 language: ![English](https://raw.githubusercontent.com/codenautas/multilang/master/img/lang-en.png)
@@ -205,7 +205,7 @@ entry                        | usage
 -----------------------------|---------------
 server                       |
 .port                        | port where is listening
-.base-rul                    | base url added to domain name
+.base-url                    | base url added to domain name
 .module-store                |
 install                      | (see Spanish)
 .dump                        | (see Spanish)

package/for-client/my-tables.js

@@ -690,11 +690,18 @@ myOwn.tableGrid = function tableGrid(tableName, mainElement, opts){
                     if (myOwn.config.config['grid-row-retain-moved-or-deleted'] && !force) { 
                         var depotsToRetain = grid.depots.filter(depot => depot.tick == tick);
                         for (depot of depotsToRetain) {
+                            depot.row['$refreshed'] = false
                             if (depot.tr && depot.tr.getAttribute('not-here')) depot.tr.removeAttribute('not-here')
                         }
                     }
                     while (depot = depotsToDelete.pop()) {
                         depot.manager.displayAsDeleted(depot, force ? 'change-ff' : 'unknown'); 
+                        if (myOwn.config.config['grid-row-retain-moved-or-deleted']) { 
+                            if(!depot.row['$refreshed']){
+                                grid.retrieveRowAndRefresh(depot,{retrieveIgnoringWhere:true})
+                                depot.row['$refreshed'] = true
+                            }
+                        }
                     }
                 }
             })
@@ -2385,7 +2392,8 @@ myOwn.TableGrid.prototype.displayGrid = function displayGrid(){
             fixedFields:grid.def.primaryKey.map(function(fieldName, i){ 
                 return {fieldName:fieldName, value:depot.primaryKeyValues[i]};
             }),
-            pick:grid.def.pick
+            pick:grid.def.pick,
+            retrieveIgnoringWhere: opts.retrieveIgnoringWhere
         }).then(function(result){
             grid.depotRefresh(depot,{updatedRow:result[0], sendedForUpdate:{}}, opts);
         })

package/install/get_app_user-fun.sql

@@ -0,0 +1,6 @@
+create or replace function get_app_user() returns text
+  stable language sql
+as
+$sql$
+  select split_part(current_setting('application_name'),' ',1);
+$sql$;

package/lib/backend-plus.d.ts

@@ -286,11 +286,11 @@ export type TableDefinition = EditableDbDefinition & {
         viewBody?:string
         insertIfNotUpdate?:boolean
         policies?:{
-            all   ?:{using?:string, check?:string}
-            select?:{using?:string}
-            insert?:{               check?:string}
-            update?:{using?:string, check?:string}
-            delete?:{using?:string}
+            all   ?:{name?:string, using?:string, check?:string}
+            select?:{name?:string, using?:string}
+            insert?:{name?:string,                check?:string}
+            update?:{name?:string, using?:string, check?:string}
+            delete?:{name?:string, using?:string}
         }
         join?:string
         constraintsDeferred?:boolean

package/lib/backend-plus.js

@@ -704,7 +704,7 @@ AppBackend.prototype.start = function start(opts){
                     throw new Error("backend-plus: Motor not recongnized: "+be.config.db.motor);
                 }
                 be.db = pg;
-                be.dbUserNameExpr="split_part(current_setting('application_name'),' ',1)";
+                be.dbUserNameExpr="get_app_user()";
                 be.dbUserRolExpr=`(select ${be.db.quoteIdent(be.config.login.rolFieldName)} 
                     from ${be.config.login.schema?be.db.quoteIdent(be.config.login.schema)+'.':''}${be.db.quoteIdent(be.config.login.table)} 
                     where ${be.db.quoteIdent(be.config.login.userFieldName)} = ${be.dbUserNameExpr})`
@@ -760,6 +760,7 @@ AppBackend.prototype.start = function start(opts){
                     pg.log.inFileName = 'last-pg-error-local.sql'
                     pg.logLastError.inFileName = 'last-pg-error-local.sql'
                 }
+                be.config.db.search_path = be.config.db.search_path ?? [be.config.db.schema, 'public'];
                 be.getDbClient = function getDbClient(req){
                     var paramsDb = be.DoubleDragon?.dbParams?.[req?.user?.[be.config.login.userFieldName]] ?? be.config.db;
                     return pg.connect(paramsDb).then(function(client){
@@ -771,7 +772,7 @@ AppBackend.prototype.start = function start(opts){
                         return client.query(
                             "SET application_name = "+be.db.quoteLiteral(dbAppName)
                         ).execute().then(function(){
-                            var search_path = be.config.db.search_path || [be.config.db.schema, 'public'];
+                            var search_path = be.config.db.search_path;
                             if(search_path.length>0){
                                 return client.query("set SEARCH_PATH TO "+be.db.quoteIdentList(search_path)).execute().then(function(){
                                     return client;
@@ -1253,6 +1254,21 @@ AppBackend.prototype.checkDatabaseStructure = async function checkDatabaseStruct
         `;
         throw new Error(message);
     }
+    var {rows: sql_routines} = await client.query(`SELECT routine_name, routine_schema, routine_definition
+        FROM information_schema.routines
+        WHERE routine_schema in (${be.config.db.search_path.map(path => be.db.quoteLiteral(path)).join(', ')})
+    `).fetchAll();
+    var sqlRoutines = likeAr.toPlainObject(sql_routines, 'routine_name');
+    var message = ''
+    likeAr(AppBackend.prototype.sql_routines).forEach((routine_name, def) => {
+        if (sqlRoutines[routine_name] && def.dump.includes(sqlRoutines[routine_name].routine_definition)) {
+            message += `
+                ----- hay que crear o actualizar la rutina ${routine_name}:
+                ${dump}
+                `;
+        }
+    })
+    if (message) throw new Error(message);
 };
 
 AppBackend.prototype.postConfig = function postConfig(){
@@ -2804,10 +2820,11 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
                 lines.push('');
                 if(tableDef.sql.policies.enabled){
                     policyLines.push(`ALTER TABLE ${cualQuoteTableName} ENABLE ROW LEVEL SECURITY;`);
-                    ['all', 'select', 'insert', 'update', 'delete'].forEach((command)=>{
-                        var polcom=tableDef.sql.policies[command];
-                        if(polcom.using || polcom.check){
-                            policyLines.push(`CREATE POLICY bp_pol_${command} ON ${cualQuoteTableName} AS PERMISSIVE FOR ${command}`+
+                    [null, 'all', 'select', 'insert', 'update', 'delete'].forEach((command)=>{
+                        var polcom=tableDef.sql.policies[command] ?? {using: `true`, permissive:true};
+                        if(polcom?.using || polcom?.check){
+                            policyLines.push(`CREATE POLICY ${be.db.quoteIdent(polcom.name ?? `bp ${command ?? `base`}`)} ON ${cualQuoteTableName} `+
+                                `AS ${polcom.permissive ? `PERMISSIVE` : `RESTRICTIVE`} FOR ${command ?? `all`} TO ${be.config.db.user}`+
                                 (polcom.using?     ` USING ( ${polcom.using} )`:'')+
                                 (polcom.check?` WITH CHECK ( ${polcom.check} )`:'')+';'
                             );
@@ -2990,10 +3007,36 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
             };
         })
     );
+
+    var common = (await Promise.all(be.appStack.map(async function(stackNode){
+        var common = [];
+        for (var prefix of ['../', '../../']) {
+            try {
+                var dirName = Path.join(stackNode.path,prefix+'install').replace(regexpDistReplacer,'$1$2')
+                console.log('********** buscando en', dirName, 'de', stackNode.path)
+                var list = await fs.readdir(dirName);
+            } catch (err) {
+                if (err.code != 'ENOENT') throw err;
+                console.log(err);
+                var list = [];
+            }
+            console.log(list)
+            for(var fileName of list){
+                if (fileName.endsWith('-fun.sql')) {
+                    common.push(await fs.readFile(Path.join(dirName,fileName), 'utf-8'));
+                }
+            }
+        }
+        console.log(common)
+        return common.join('\n');
+    }))).join('\n');
+
     var prepareList=(be.config.install.dump.scripts['prepare']||[]);
     var mainSql=(
         (complete? linesCreate.join('\n'): '')+
         (complete||opts.forDump? searchPathline.join('\n'): '')+
+        '\n-- common'+
+        common+'\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')+

package/lib/procedures-table.js

@@ -78,13 +78,14 @@ ProcedureTables = [
             {name: 'table', encoding:'plain'},
             {name: 'fixedFields', defaultValue:[]},
             {name: 'paramfun', defaultValue:[]},
-            {name: 'pick', defaultValue:'', encoding:'plain'}
+            {name: 'pick', defaultValue:'', encoding:'plain'},
+            {name: 'retrieveIgnoringWhere', defaultValue:false}
         ],
         coreFunction:
         /**
         * 
         * @param {*} context 
-        * @param {{table:string, fixedFields:{fieldName:string, value:any, range:string}[], paramfun:string[], pick:string}} parameters 
+        * @param {{table:string, fixedFields:{fieldName:string, value:any, range:string}[], paramfun:string[], pick:string, retrieveIgnoringWhere:boolean}} parameters * @param {{table:string, fixedFields:{fieldName:string, value:any, range:string}[], paramfun:string[], pick:string}} parameters 
         */
         async function tableDatum(context, parameters){
             var be=context.be;
@@ -148,7 +149,7 @@ ProcedureTables = [
             /** @type {string} */
             var sql="SELECT "+[...defTable.sql.select].join(', ')+
                 "\n FROM "+defTable.sql.from+
-                "\n WHERE "+(defTable.sql.where||(defTable.allow.select && !defTable.forInsertOnlyMode?'true':'false'))+fixedClausule.join("")+
+                "\n WHERE "+((parameters.retrieveIgnoringWhere?'true':defTable.sql.where)||(defTable.allow.select && !defTable.forInsertOnlyMode?'true':'false'))+fixedClausule.join("")+
                 // " ORDER BY "+defTable.primaryKey.map(be.db.quoteIdent.bind(be.db)).join(',')
                 "\n ORDER BY "+(defTable.sql.orderBy||defTable.primaryKey).map(function(fieldName){ return be.db.quoteIdent(fieldName); }).join(',')
             if(specialFixedClause.length){

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for the anti Pareto rule",
-  "version": "2.0.0-rc.4",
+  "version": "2.0.0-rc.6",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -11,7 +11,8 @@
     "lib",
     "for-client",
     "unlogged",
-    "src"
+    "src",
+    "install"
   ],
   "contributors": [
     {
@@ -34,7 +35,7 @@
     "best-globals": "^1.1.2",
     "big.js": "^6.2.1",
     "body-parser": "^1.20.2",
-    "cast-error": "^0.1.0",
+    "cast-error": "^0.1.1",
     "castellano": "^0.1.3",
     "connect-pg-simple": "^9.0.1",
     "cookie-parser": "^1.4.6",
@@ -81,7 +82,7 @@
     "@types/js-yaml": "^4.0.9",
     "@types/mocha": "^10.0.6",
     "@types/multiparty": "~0.0.36",
-    "@types/node": "^20.11.17",
+    "@types/node": "^20.11.19",
     "@types/nodemailer": "^6.4.14",
     "@types/numeral": "~2.0.5",
     "@types/session-file-store": "^1.2.5",
@@ -98,7 +99,7 @@
     "kill-9": "~0.4.3",
     "mocha": "^10.3.0",
     "nyc": "^15.1.0",
-    "puppeteer": "^22.0.0",
+    "puppeteer": "^22.1.0",
     "sinon": "^17.0.1",
     "supertest": "^6.3.4",
     "types.d.ts": "~0.6.21",