remove postgres trigger

Author: cbaker6

spec/PostgresStorageAdapter.spec.js

@@ -430,16 +430,13 @@ describe_only_db('postgres')('PostgresStorageAdapter', () => {
     expect(adapter._onchange).toHaveBeenCalled();
   });
 
-  it('Idempotency class should have trigger', async () => {
+  it('Idempotency class should have function', async () => {
     await reconfigureServer();
     const config = Config.get('test');
     const adapter = config.database.adapter;
     const client = adapter._client;
-    const triggers = await client.one("SELECT event_object_table, trigger_name, event_manipulation, action_statement FROM information_schema.triggers WHERE event_object_table = '_Idempotency' ORDER BY event_object_table,event_manipulation");
-    expect(triggers.event_object_table).toBe("_Idempotency");
-    expect(triggers.trigger_name).toBe("idempodency_delete_old_rows_trigger");
-    expect(triggers.event_manipulation).toBe("INSERT");
-    expect(triggers.action_statement).toBe("EXECUTE FUNCTION idempodency_delete_old_rows()");
+    const foundFunction = await client.one("SELECT format('%I.%I(%s)', ns.nspname, p.proname, oidvectortypes(p.proargtypes)) FROM pg_proc p INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid) WHERE p.proname = 'idempodency_delete_old_rows'");
+    expect(foundFunction.format).toBe("public.idempodency_delete_old_rows()");
   });
 });
 

src/Adapters/Storage/Postgres/PostgresStorageAdapter.js

@@ -2417,9 +2417,9 @@ export class PostgresStorageAdapter implements StorageAdapter {
       ? fieldNames.map((fieldName, index) => `lower($${index + 3}:name) varchar_pattern_ops`)
       : fieldNames.map((fieldName, index) => `$${index + 3}:name`);
     const qs = `CREATE INDEX IF NOT EXISTS $1:name ON $2:name (${constraintPatterns.join()})`;
-    const setIdempodencyTrigger = options.setIdempodencyTrigger !== undefined ? options.setIdempodencyTrigger : false;
+    const setIdempodencyTrigger = options.setIdempodencyFunction !== undefined ? options.setIdempodencyTrigger : false;
     if (setIdempodencyTrigger) {
-      await this.ensureIdempodencyTriggerExists(options);
+      await this.ensureIdempodencyFunctionExists(options);
     }
     return conn.none(qs, [indexNameOptions.name, className, ...fieldNames])
       .catch(error => {
@@ -2443,44 +2443,26 @@ export class PostgresStorageAdapter implements StorageAdapter {
       });
   }
 
-  async deleteIdempodencyTrigger(
+  async deleteIdempodencyFunction(
     options?: Object = {}
   ): Promise<any> {
     const conn = options.conn !== undefined ? options.conn : this._client;
-    const qs = 'DROP TRIGGER IF EXISTS idempodency_delete_old_rows_trigger ON "_Idempotency"';
+    const qs = 'DROP FUNCTION IF EXISTS idempodency_delete_old_rows()';
     return conn
       .none(qs)
       .catch(error => {
         throw error;
       });
   }
 
-  async ensureIdempodencyTriggerExists(
+  async ensureIdempodencyFunctionExists(
     options?: Object = {}
   ): Promise<any> {
     const conn = options.conn !== undefined ? options.conn : this._client;
     const ttlOptions = options.ttl !== undefined ? `${options.ttl} seconds` : '60 seconds';
     const qs = 'CREATE OR REPLACE FUNCTION idempodency_delete_old_rows() RETURNS trigger LANGUAGE plpgsql AS $$ BEGIN DELETE FROM "_Idempotency" WHERE expire < NOW() - INTERVAL $1; RETURN NEW; END; $$;';
-    await this.deleteIdempodencyTrigger(options = { conn: conn })
-      .catch(error => {
-        throw error;
-      })
-    await conn
-      .none(qs, [ttlOptions])
-      .catch(error => {
-        if (
-          error.code === PostgresDuplicateRelationError ||
-          error.code === PostgresUniqueIndexViolationError ||
-          error.code === PostgresDuplicateObjectError
-        ) {
-          // Function already exists, must have been created by a different request. Ignore error.
-        } else {
-          throw error;
-        }
-      });
-    const qs2 = 'CREATE TRIGGER idempodency_delete_old_rows_trigger AFTER INSERT ON "_Idempotency" FOR EACH ROW EXECUTE PROCEDURE idempodency_delete_old_rows()';
     return conn
-      .none(qs2)
+      .none(qs, [ttlOptions])
       .catch(error => {
         if (
           error.code === PostgresDuplicateRelationError ||

src/Controllers/DatabaseController.js

@@ -1760,18 +1760,25 @@ class DatabaseController {
         throw error;
       });
 
-    const options = this.idempotencyOptions;
     if (this.adapter instanceof MongoStorageAdapter) {
-      options.ttl = 0;
+      await this.adapter
+        .ensureIndex('_Idempotency', requiredIdempotencyFields, ['expire'], 'ttl', false, {
+          ttl: 0,
+        })
+        .catch(error => {
+          logger.warn('Unable to create TTL index for idempotency expire date: ', error);
+          throw error;
+        });
     } else if (this.adapter instanceof PostgresStorageAdapter) {
-      options.setIdempodencyTrigger = true;
+      const options = this.idempotencyOptions;
+      options.setIdempodencyFunction = true;
+      await this.adapter
+        .ensureIndex('_Idempotency', requiredIdempotencyFields, ['expire'], 'ttl', false, options)
+        .catch(error => {
+          logger.warn('Unable to create TTL index for idempotency expire date: ', error);
+          throw error;
+        });
     }
-    await this.adapter
-      .ensureIndex('_Idempotency', requiredIdempotencyFields, ['expire'], 'ttl', false, options)
-      .catch(error => {
-        logger.warn('Unable to create TTL index for idempotency expire date: ', error);
-        throw error;
-      });
     await this.adapter.updateSchemaWithIndexes();
   }