prostgles-server 2.0.249 → 2.0.252

package/dist/DboBuilder.js

@@ -1816,6 +1816,8 @@ class TableHandler extends ViewHandler {
     }
 }
 exports.TableHandler = TableHandler;
+let DATA_TYPES;
+let USER_TABLES;
 const Prostgles_1 = require("./Prostgles");
 const DBSchemaBuilder_1 = require("./DBSchemaBuilder");
 class DboBuilder {
@@ -1859,15 +1861,112 @@ class DboBuilder {
             }
             return this;
         };
+        this.runSQL = async (query, params, options, localParams) => {
+            /** Cache types */
+            DATA_TYPES ?? (DATA_TYPES = await this.db.any("SELECT oid, typname FROM pg_type") ?? []);
+            USER_TABLES ?? (USER_TABLES = await this.db.any("SELECT relid, relname FROM pg_catalog.pg_statio_user_tables") ?? []);
+            const canRunSQL = async (localParams) => {
+                if (!localParams?.socket || !localParams?.httpReq)
+                    return true;
+                const { socket } = localParams;
+                const publishParams = await this.prostgles.publishParser.getPublishParams({ socket });
+                let res = await this.prostgles.opts.publishRawSQL?.(publishParams);
+                return Boolean(res && typeof res === "boolean" || res === "*");
+            };
+            if (!(await canRunSQL(localParams)))
+                throw "Not allowed to run SQL";
+            const { returnType, allowListen } = options || {};
+            const { socket } = localParams || {};
+            const db = localParams?.tx?.t || this.db;
+            if (returnType === "noticeSubscription") {
+                if (!socket)
+                    throw "Only allowed with client socket";
+                return await this.prostgles.dbEventsManager?.addNotice(socket);
+            }
+            else if (returnType === "statement") {
+                try {
+                    return exports.pgp.as.format(query, params);
+                }
+                catch (err) {
+                    throw err.toString();
+                }
+            }
+            else if (db) {
+                let finalQuery = query + "";
+                if (returnType === "arrayMode" && !["listen ", "notify "].find(c => query.toLowerCase().trim().startsWith(c))) {
+                    finalQuery = new PQ({ text: exports.pgp.as.format(query, params), rowMode: "array" });
+                }
+                let _qres = await db.result(finalQuery, params);
+                const { fields, rows, command } = _qres;
+                /**
+                 * Fallback for watchSchema in case not superuser and cannot add db event listener
+                 */
+                const { watchSchema, watchSchemaType } = this.prostgles?.opts || {};
+                if (watchSchema &&
+                    (!this.prostgles.isSuperUser || watchSchemaType === "prostgles_queries")) {
+                    if (["CREATE", "ALTER", "DROP"].includes(command)) {
+                        this.prostgles.onSchemaChange({ command, query });
+                    }
+                    else if (query) {
+                        const cleanedQuery = query.toLowerCase().replace(/\s\s+/g, ' ');
+                        if (PubSubManager_1.PubSubManager.SCHEMA_ALTERING_QUERIES.some(q => cleanedQuery.includes(q.toLowerCase()))) {
+                            this.prostgles.onSchemaChange({ command, query });
+                        }
+                    }
+                }
+                if (command === "LISTEN") {
+                    if (!allowListen)
+                        throw new Error(`Your query contains a LISTEN command. Set { allowListen: true } to get subscription hooks. Or ignore this message`);
+                    if (!socket)
+                        throw "Only allowed with client socket";
+                    return await this.prostgles.dbEventsManager?.addNotify(query, socket);
+                }
+                else if (returnType === "rows") {
+                    return rows;
+                }
+                else if (returnType === "row") {
+                    return rows[0];
+                }
+                else if (returnType === "value") {
+                    return Object.values(rows?.[0] || {})?.[0];
+                }
+                else if (returnType === "values") {
+                    return rows.map(r => Object.values(r[0]));
+                }
+                else {
+                    let qres = {
+                        duration: 0,
+                        ..._qres,
+                        fields: fields?.map(f => {
+                            const dataType = DATA_TYPES.find(dt => +dt.oid === +f.dataTypeID)?.typname ?? "text", tableName = USER_TABLES.find(t => +t.relid === +f.tableID), tsDataType = postgresToTsType(dataType);
+                            return {
+                                ...f,
+                                tsDataType,
+                                dataType,
+                                udt_name: dataType,
+                                tableName: tableName?.relname
+                            };
+                        }) ?? []
+                    };
+                    return qres;
+                }
+            }
+            else
+                console.error("db missing");
+        };
         this.getTX = (cb) => {
             return this.db.tx((t) => {
                 let dbTX = {};
                 this.tablesOrViews?.map(tov => {
                     dbTX[tov.name] = new (tov.is_view ? ViewHandler : TableHandler)(this.db, tov, this, t, dbTX, this.joinPaths);
                 });
+                if (!dbTX.sql) {
+                    dbTX.sql = this.runSQL;
+                }
                 (0, prostgles_types_1.getKeys)(dbTX).map(k => {
                     dbTX[k].dbTX = dbTX;
                 });
+                dbTX.sql = (q, args, opts, localP) => this.runSQL(q, args, opts, { tx: { dbTX, t }, ...(localP ?? {}) });
                 return cb(dbTX, t);
             });
         };
@@ -2030,98 +2129,84 @@ class DboBuilder {
             this.dbo[txKey] = (cb) => this.getTX(cb);
         }
         if (!this.dbo.sql) {
-            let needType = true;
-            let DATA_TYPES = !needType ? [] : await this.db.any("SELECT oid, typname FROM pg_type");
-            let USER_TABLES = !needType ? [] : await this.db.any("SELECT relid, relname FROM pg_catalog.pg_statio_user_tables");
-            this.dbo.sql = async (query, params, options, localParams) => {
-                const canRunSQL = async (localParams) => {
-                    if (!localParams)
-                        return true;
-                    const { socket } = localParams;
-                    const publishParams = await this.prostgles.publishParser.getPublishParams({ socket });
-                    let res = await this.prostgles.opts.publishRawSQL?.(publishParams);
-                    return Boolean(res && typeof res === "boolean" || res === "*");
-                };
-                if (!(await canRunSQL(localParams)))
-                    throw "Not allowed to run SQL";
-                const { returnType, allowListen } = options || {};
-                const { socket } = localParams || {};
-                if (returnType === "noticeSubscription") {
-                    if (!socket)
-                        throw "Only allowed with client socket";
-                    return await this.prostgles.dbEventsManager?.addNotice(socket);
-                }
-                else if (returnType === "statement") {
-                    try {
-                        return exports.pgp.as.format(query, params);
-                    }
-                    catch (err) {
-                        throw err.toString();
-                    }
-                }
-                else if (this.db) {
-                    let finalQuery = query + "";
-                    if (returnType === "arrayMode" && !["listen ", "notify "].find(c => query.toLowerCase().trim().startsWith(c))) {
-                        finalQuery = new PQ({ text: exports.pgp.as.format(query, params), rowMode: "array" });
-                    }
-                    let _qres = await this.db.result(finalQuery, params);
-                    const { fields, rows, command } = _qres;
-                    /**
-                     * Fallback for watchSchema in case not superuser and cannot add db event listener
-                     */
-                    const { watchSchema, watchSchemaType } = this.prostgles?.opts || {};
-                    if (watchSchema &&
-                        (!this.prostgles.isSuperUser || watchSchemaType === "prostgles_queries")) {
-                        if (["CREATE", "ALTER", "DROP"].includes(command)) {
-                            this.prostgles.onSchemaChange({ command, query });
-                        }
-                        else if (query) {
-                            const cleanedQuery = query.toLowerCase().replace(/\s\s+/g, ' ');
-                            if (PubSubManager_1.PubSubManager.SCHEMA_ALTERING_QUERIES.some(q => cleanedQuery.includes(q.toLowerCase()))) {
-                                this.prostgles.onSchemaChange({ command, query });
-                            }
-                        }
-                    }
-                    if (command === "LISTEN") {
-                        if (!allowListen)
-                            throw new Error(`Your query contains a LISTEN command. Set { allowListen: true } to get subscription hooks. Or ignore this message`);
-                        if (!socket)
-                            throw "Only allowed with client socket";
-                        return await this.prostgles.dbEventsManager?.addNotify(query, socket);
-                    }
-                    else if (returnType === "rows") {
-                        return rows;
-                    }
-                    else if (returnType === "row") {
-                        return rows[0];
-                    }
-                    else if (returnType === "value") {
-                        return Object.values(rows?.[0] || {})?.[0];
-                    }
-                    else if (returnType === "values") {
-                        return rows.map(r => Object.values(r[0]));
-                    }
-                    else {
-                        let qres = {
-                            duration: 0,
-                            ..._qres,
-                            fields: fields?.map(f => {
-                                const dataType = DATA_TYPES.find(dt => +dt.oid === +f.dataTypeID)?.typname ?? "text", tableName = USER_TABLES.find(t => +t.relid === +f.tableID), tsDataType = postgresToTsType(dataType);
-                                return {
-                                    ...f,
-                                    tsDataType,
-                                    dataType,
-                                    udt_name: dataType,
-                                    tableName: tableName?.relname
-                                };
-                            }) ?? []
-                        };
-                        return qres;
-                    }
-                }
-                else
-                    console.error("db missing");
-            };
+            this.dbo.sql = this.runSQL;
+            // this.dbo.sql = async (query: string, params: any, options: SQLOptions | undefined, localParams?: LocalParams) => {
+            //     const canRunSQL = async (localParams?: LocalParams) => {
+            //         if(!localParams?.socket || !localParams?.httpReq) return true;
+            //         const { socket } = localParams;
+            //         const publishParams = await this.prostgles.publishParser!.getPublishParams({ socket });
+            //         let res = await this.prostgles.opts.publishRawSQL?.(publishParams);
+            //         return Boolean(res && typeof res === "boolean" || res === "*");
+            //     }
+            //     if(!(await canRunSQL(localParams))) throw "Not allowed to run SQL";
+            //     const { returnType, allowListen }: SQLOptions = options || ({} as any);
+            //     const { socket } = localParams || {};
+            //     if(returnType === "noticeSubscription"){
+            //         if(!socket) throw "Only allowed with client socket"
+            //         return await this.prostgles.dbEventsManager?.addNotice(socket);
+            //     } else if(returnType === "statement"){
+            //         try {
+            //             return pgp.as.format(query, params);
+            //         } catch (err){
+            //             throw (err as any).toString();
+            //         }
+            //     } else if(this.db) {
+            //         let finalQuery = query + "";
+            //         if(returnType === "arrayMode" && !["listen ", "notify "].find(c => query.toLowerCase().trim().startsWith(c))){
+            //             finalQuery = new PQ({ text: pgp.as.format(query, params), rowMode: "array" });
+            //         }
+            //         let _qres = await this.db.result(finalQuery, params)
+            //         const { fields, rows, command } = _qres;
+            //         /**
+            //          * Fallback for watchSchema in case not superuser and cannot add db event listener
+            //          */
+            //         const { watchSchema, watchSchemaType } = this.prostgles?.opts || {};
+            //         if(
+            //             watchSchema &&
+            //             (!this.prostgles.isSuperUser || watchSchemaType === "prostgles_queries")
+            //         ){
+            //             if(["CREATE", "ALTER", "DROP"].includes(command)){
+            //                 this.prostgles.onSchemaChange({ command, query })
+            //             } else if(query) {
+            //                 const cleanedQuery = query.toLowerCase().replace(/\s\s+/g, ' ');
+            //                 if(PubSubManager.SCHEMA_ALTERING_QUERIES.some(q => cleanedQuery.includes(q.toLowerCase()))){
+            //                     this.prostgles.onSchemaChange({ command, query })
+            //                 }
+            //             }
+            //         }
+            //         if(command === "LISTEN"){
+            //             if(!allowListen) throw new Error(`Your query contains a LISTEN command. Set { allowListen: true } to get subscription hooks. Or ignore this message`)
+            //             if(!socket) throw "Only allowed with client socket"
+            //             return await this.prostgles.dbEventsManager?.addNotify(query, socket);
+            //         } else if(returnType === "rows") {
+            //             return rows;
+            //         } else if(returnType === "row") {
+            //             return rows[0];
+            //         } else if(returnType === "value") {
+            //             return Object.values(rows?.[0] || {})?.[0];
+            //         } else if(returnType === "values") {
+            //             return rows.map(r => Object.values(r[0]));
+            //         } else {
+            //             let qres: SQLResult<typeof returnType> = {
+            //                 duration: 0,
+            //                 ..._qres,
+            //                 fields: fields?.map(f => {
+            //                     const dataType = DATA_TYPES.find(dt => +dt.oid === +f.dataTypeID)?.typname ?? "text",
+            //                         tableName = USER_TABLES.find(t => +t.relid === +f.tableID),
+            //                         tsDataType = postgresToTsType(dataType);
+            //                     return {
+            //                         ...f,
+            //                         tsDataType,
+            //                         dataType,
+            //                         udt_name: dataType,
+            //                         tableName: tableName?.relname
+            //                     }
+            //                 }) ?? []
+            //             };
+            //             return qres;
+            //         }
+            //     } else console.error("db missing");
+            // }
         }
         else {
             console.warn(`Could not create dbo.sql handler because there is already a table named "sql"`);
@@ -2201,7 +2286,7 @@ async function getTablesForSchemaPostgresSQL(db, schema = "public") {
     , array_to_json(vr.table_names) as parent_tables
     , obj_description(cc.table_oid::regclass) as comment
     FROM information_schema.tables t  
-    INNER join (
+    LEFT JOIN (    -- INNER join slows things down
          SELECT c.table_schema, c.table_name, c.column_name, c.data_type, c.udt_name
         , e.data_type as element_type
         , e.udt_name as element_udt_name