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

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[]

package/lib/backend-plus.js

@@ -802,7 +802,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{
@@ -1022,7 +1022,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 +1237,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 +2685,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 +2980,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 +3008,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.15",
   "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": {