backend-plus 2.5.2-betha.14 → 2.5.2-betha.16

package/for-client/my-tables.js

@@ -2203,6 +2203,9 @@ myOwn.specialDefaultValue={
         return belowDepot.row[fieldName]?belowDepot.row[fieldName]+1:(
             aboveDepot.row[fieldName]?aboveDepot.row[fieldName]-1:1
         ); 
+    },
+    current_user: function specialDefaultValueCurrentUser(){
+        return my.config.username;
     }
 }
 

package/lib/backend-plus.d.ts

@@ -188,6 +188,7 @@ export type FieldDefinition = EditableDbDefinition & {
     dbNullable?:boolean        /* dbNullable === false is not nullabla at DB level, but not at CLIENT LEVEL */
     defaultValue?:any
     defaultDbValue?:PgKnownDbValues|string
+    specialDefaultValue?:string /* keyof myOwn.specialDefaultValues and/or keyof AppBackend.prototype.specialSqlDefaultExpressions */
     clientSide?:string         /* keyof: myOwn.clientSides */
     isName?:boolean|'known'    /* is a name but it is a well known name (because the user uses it to thier code or because the code is enugh expresive)
     isPk?:number               /* internal: pos in the primaryKey array */
@@ -204,7 +205,6 @@ export type FieldDefinition = EditableDbDefinition & {
     references?:string         /* table name */ 
     referencesField?:string  
     aggregate?:'avg'|'sum'|'count'|'min'|'max'|'countTrue'          /* keyof myOwn.TableAggregates */
-    specialDefaultValue?:string /* keyof myOwn.specialDefaultValues
     defaultForOtherFields?:boolean   /* the field that stores the "other fields" of a flexible imported table */
     specialValueWhenInsert?:string 
     exportMetadata?:ExportMetadataDefinition 
@@ -548,6 +548,7 @@ export class AppBackend{
     dbUserNameExpr:string
     dbUserRolExpr:string
     specialValueWhenInsert:{[k:string]:(context:ProcedureContext, defField:FieldDefinition, parameters:object)=>any}
+    specialSqlDefaultExpressions:Record<string, string>
     clearCaches():void
     start(opts?: StartOptions):Promise<void>
     getTables():TableItemDef[]
@@ -586,7 +587,7 @@ export class AppBackend{
         messages:Record<LangId,Record<string, string>>
     }
     shutdownCallbackListAdd(param:{message:string, fun:()=>Promise<void>}):void
-    shutdownBackend():Promise<void>
+    shutdownBackend(opts?:{skipTurnOff?:boolean, onlyTurnOff?:boolean}):Promise<void>
     setLog(opts:{until:string, results?:boolean}):void
     getDataDumpTransformations(rawData:string):Promise<{rawData:string, prepareTransformationSql:string[], endTransformationSql:string[]}>
 }

package/lib/backend-plus.js

@@ -643,33 +643,42 @@ AppBackend.prototype.start = function start(opts){
         // @ts-ignore : only for testing */
         this.getMainApp = function getMainApp(){ return mainApp; };
     }
-    this.shutdownBackend = async function shutdownBackend(){
-        console.log('shooting down:');
-        var waitFor = [
-            new Promise(function(resolve,reject){
-                console.log('*','express server');
-                be.server.close(/** @param {Error} err */function(err){
-                    if(err){
-                        console.log('*', err)
-                        reject(err);
-                    }else{
-                        console.log('*','express server done!')
-                        resolve();
-                    }
-                });
-            }),
-            ...(be.shutdownCallbackList.map(x => (async function(){
-                console.log('shut:', x.message)
-                await x.fun()
-                console.log('done:', x.message)
-            })()))
-        ];
-        console.log('*', 'waiting for all')
-        await Promise.all(waitFor);
-        console.log('*', 'all done')
-        mainApp = null;
-        console.log('* logWhy',logWhy)
-        logWhy && logWhy();
+    this.shutdownBackend = async function shutdownBackend(opts){
+        var shootingDown = opts == null || !opts.onlyTurnOff;
+        var turningOff = opts == null || !opts.skipTurnOff;
+        if(!shootingDown){
+            console.log('shooting down:');
+            var waitFor = [
+                new Promise(function(resolve,reject){
+                    console.log('*','express server');
+                    be.server.close(/** @param {Error} err */function(err){
+                        if(err){
+                            console.log('*', err)
+                            reject(err);
+                        }else{
+                            console.log('*','express server done!')
+                            resolve();
+                        }
+                    });
+                }),
+                ...(be.shutdownCallbackList.map(x => (async function(){
+                    console.log('shut:', x.message)
+                    await x.fun()
+                    console.log('done:', x.message)
+                })())),
+            ];
+            console.log('*', 'waiting for all')
+            await Promise.all(waitFor);
+            console.log('*', 'all done')
+            mainApp = null;
+        }
+        if(turningOff){
+            console.log('turning off:');
+            await pg.shutdown();
+            console.log('pg shutdown done!');
+            console.log('* logWhy',logWhy)
+            logWhy && logWhy();
+        }
     };
     return Promise.resolve().then(function(){
         var configList=be.configList();
@@ -802,7 +811,7 @@ AppBackend.prototype.start = function start(opts){
                             }
                         }).then(function(client){
                             if(username){
-                                return client.query(`SELECT set_app_user(${be.db.quoteLiteral(username)})`).execute().then(function(){
+                                return client.query(`CALL set_app_user(${be.db.quoteLiteral(username)})`).execute().then(function(){
                                     return client;
                                 });
                             }else{
@@ -1008,12 +1017,6 @@ AppBackend.prototype.start = function start(opts){
                     mainApp.loginPlusManager.closeManager();
                 }
             });
-            be.shutdownCallbackListAdd({
-                message:'pg',
-                fun:function(){
-                    pg.shutdown();
-                }
-            });
             mainApp.loginPlusManager.setValidatorStrategy(
                 function(req, username, password, done) {
                     var client;
@@ -1022,7 +1025,7 @@ AppBackend.prototype.start = function start(opts){
                     }
                     be.getDbClient(req).then(function(cli){
                         client = cli;
-                        return client.query("select set_app_user('!login')").execute();
+                        return client.query("CALL set_app_user('!login')").execute();
                     }).then(function(){
                         var infoFieldList=be.config.login.infoFieldList||(be.config.login.rolFieldName?[be.config.login.userFieldName,be.config.login.rolFieldName]:[be.config.login.userFieldName]);
                         return client.query(
@@ -1237,6 +1240,10 @@ AppBackend.prototype.specialValueWhenInsert = {
     }
 }
 
+AppBackend.prototype.specialSqlDefaultExpressions = {
+    'current_user': 'get_app_user()',
+}
+
 AppBackend.prototype.checkDatabaseStructure = async function checkDatabaseStructure(client){
     var be=this;
     var result = await client.query(`select setting from pg_settings where name='server_version';`).fetchUniqueValue();
@@ -2681,8 +2688,12 @@ AppBackend.prototype.dumpDbTableFields = function dumpDbTableFields(tableDef, op
             fields.push(
                 '  '+db.quoteIdent(fieldDef.name)+
                 ' '+(fieldDef.dataLength?(fieldType=='text'?'varchar':fieldType)+'('+fieldDef.dataLength+')':fieldType)+
-                (fieldDef.defaultValue!=null?' default '+db.quoteLiteral(fieldDef.defaultValue):'')+
-                (fieldDef.defaultDbValue!=null?' default '+fieldDef.defaultDbValue:'')+
+                ( be.specialSqlDefaultExpressions[fieldDef.defaultDbValue] != null ? ' default ' + be.specialSqlDefaultExpressions[fieldDef.defaultDbValue]
+                : fieldDef.defaultDbValue != null ? ' default ' + fieldDef.defaultDbValue 
+                : be.specialSqlDefaultExpressions[fieldDef.specialDefaultValue] != null ? ' default ' + be.specialSqlDefaultExpressions[fieldDef.specialDefaultValue]
+                : fieldDef.defaultValue != null ? ' default ' + db.quoteLiteral(fieldDef.defaultValue) 
+                : ''
+                ) +
                 (be.isGeneratedSequence(fieldDef.sequence)?' generated always as identity':'')+
                 (fieldDef.generatedAs!=null?` generated always as (${fieldDef.generatedAs}) stored`:'')
             );
@@ -2972,8 +2983,8 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
         }
     }
     lines.push(`
-create or replace function set_app_user(p_user text) returns text
-  security definer volatile language plpgsql
+create or replace procedure set_app_user(p_user text)
+  security definer language plpgsql
 as
 $body$
 declare
@@ -3000,7 +3011,6 @@ begin
         set backend_plus._mode = normal;
     end if;
     perform set_config('backend_plus._user', p_user, false);
-    return p_user;
 end;    
 $body$;
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for the anti Pareto rule",
-  "version": "2.5.2-betha.14",
+  "version": "2.5.2-betha.16",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -106,7 +106,7 @@
     "sinon": "^21.0.0",
     "supertest": "^7.1.4",
     "types.d.ts": "~0.6.22",
-    "typescript": "^5.8.3",
+    "typescript": "^5.9.2",
     "why-is-node-running": "^3.2.2"
   },
   "engines": {