improve schema watch revoke/grant

prostgles · Feb 2, 2024 · cd0316a · cd0316a
1 parent ee79eba
commit cd0316a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/lib/DboBuilder/runSQL.ts b/lib/DboBuilder/runSQL.ts
@@ -106,13 +106,14 @@ const onSQLResult = async function(this: DboBuilder, queryWithoutRLS: string, {
  * Fallback for watchSchema in case of not a superuser (cannot add db event listener)
  */
 export const watchSchemaFallback = async function(this: DboBuilder, { queryWithoutRLS, command }: { queryWithoutRLS: string; command: string; }){
-
+  const SCHEMA_ALTERING_COMMANDS = ["CREATE", "ALTER", "DROP", "REVOKE", "GRANT"];
+  const isNotPickedUpByDDLTrigger = ["REVOKE", "GRANT"].includes(command);
   const { watchSchema, watchSchemaType } = this.prostgles?.opts || {};
   if (
     watchSchema &&
-    (!this.prostgles.isSuperUser || watchSchemaType === "prostgles_queries")
+    (!this.prostgles.isSuperUser || watchSchemaType === "prostgles_queries" || isNotPickedUpByDDLTrigger)
   ) {
-    if (["CREATE", "ALTER", "DROP", "REVOKE", "GRANT"].includes(command)) {
+    if (SCHEMA_ALTERING_COMMANDS.includes(command)) {
       this.prostgles.onSchemaChange({ command, query: queryWithoutRLS })
     } else if (queryWithoutRLS) {
       const cleanedQuery = queryWithoutRLS.toLowerCase().replace(/\s\s+/g, ' ');

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.2.14",
+  "version": "4.2.15",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/tests/server/package-lock.json b/tests/server/package-lock.json