add fileTable rules

lib/DboBuilder/insertDataParse.ts

@@ -122,11 +122,6 @@ export async function insertDataParse(
     const extraKeys = getExtraKeys(row);
     const colInserts = getColumnInserts(row);
 
-    /* Upload file then continue insert */
-    // if (this.is_media) {
-    //   return uploadFile.bind(this)(row, validate, localParams)
-
-    // } else 
     /* Potentially a nested join */
     if (hasNestedInserts) {
 
@@ -278,9 +273,6 @@ export async function insertDataParse(
   }));
 
   const result = isMultiInsert ? _data : _data[0];
-  // if(validate && !isNestedInsert){
-  //     result = isMultiInsert? await Promise.all(_data.map(async d => await validate({ ...d }))) : await validate({ ..._data[0] });
-  // }
   const res = hasNestedInserts ?
     { insertResult: result } :
     { data: result };

lib/PubSubManager/initPubSubManager.ts

@@ -92,22 +92,26 @@ export async function initPubSubManager(this: PubSubManager): Promise<PubSubMana
               END $$;`
 
             const queryTimeoutMillis = Math.min(5e3, Math.round(this.appCheckFrequencyMS/2));
-            this.db.any(`    
+            const timeout = setTimeout(() => {
+              this.db.any(`    
               /* 
                 ${queryIdentifier}
                 ${REALTIME_TRIGGER_CHECK_QUERY} 
                 ${PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID}
               */
               DO $$ 
               BEGIN
-                PERFORM pg_sleep(\${queryTimeoutMillis}/1e3);
+                /* PERFORM pg_sleep(\${queryTimeoutMillis}/1e3); */
                 PERFORM pg_cancel_backend(pid)
                 FROM pg_catalog.pg_stat_activity
                 WHERE pid <> pg_backend_pid()
                 AND query = \${queryIdentifier};
               END $$;
             `, { queryTimeoutMillis, queryIdentifier })
+            }, queryTimeoutMillis);
             await this.db.any(checkForStaleTriggers);
+            clearTimeout(timeout);
+
             tries = 5;
             log("updated last_check");
           } catch (e: any) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.1.98",
+  "version": "4.1.99",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

tests/client/PID.txt

@@ -1 +1 @@
-30132
+1097907

tests/server/DBoGenerated.d.ts

@@ -63,16 +63,6 @@ export type DBSchemaGenerated = {
       id?: number;
     };
   };
-  dmesg_logs: {
-    is_view: false;
-    select: true;
-    insert: true;
-    update: true;
-    delete: true;
-    columns: {
-      log?: null | string;
-    };
-  };
   ex_j_ins: {
     is_view: false;
     select: true;
@@ -86,30 +76,6 @@ export type DBSchemaGenerated = {
       public?: null | string;
     };
   };
-  files: {
-    is_view: false;
-    select: true;
-    insert: true;
-    update: true;
-    delete: true;
-    columns: {
-      added?: string;
-      cloud_url?: null | string;
-      content_length?: number;
-      content_type: string;
-      deleted?: null | number;
-      deleted_from_storage?: null | number;
-      description?: null | string;
-      etag?: null | string;
-      extension: string;
-      id?: string;
-      name: string;
-      original_name: string;
-      signed_url?: null | string;
-      signed_url_expires?: null | number;
-      url: string;
-    };
-  };
   geography_columns: {
     is_view: true;
     select: true;