improve drop.sql to avoid having to update it whenever new SQL revisions are added

2 files changed, 17 insertions, 6 deletions

diff --git a/src/auditordb/drop.sql b/src/auditordb/drop.sql
index 20bc192c0..4bae66103 100644
--- a/src/auditordb/drop.sql
+++ b/src/auditordb/drop.sql
@@ -17,8 +17,14 @@
 -- Everything in one big transaction
 BEGIN;
 
-SELECT _v.unregister_patch('auditor-0001');
-SELECT _v.unregister_patch('auditor-0002');
+WITH xpatches AS (
+  SELECT patch_name
+  FROM _v.patches
+  WHERE starts_with(patch_name,'auditor-')
+)
+  SELECT _v.unregister_patch(xpatches.patch_name)
+  FROM xpatches;
+
 DROP SCHEMA auditor CASCADE;
 
 -- And we're out of here...
diff --git a/src/exchangedb/drop.sql b/src/exchangedb/drop.sql
index fa7609bfd..b7583f794 100644
--- a/src/exchangedb/drop.sql
+++ b/src/exchangedb/drop.sql
@@ -17,14 +17,19 @@
 -- Everything in one big transaction
 BEGIN;
 
--- TODO: consider use exchange-* in the future!
-SELECT _v.unregister_patch('exchange-0001');
-SELECT _v.unregister_patch('exchange-0002');
+WITH xpatches AS (
+  SELECT patch_name
+  FROM _v.patches
+  WHERE starts_with(patch_name,'exchange-')
+)
+  SELECT _v.unregister_patch(xpatches.patch_name)
+  FROM xpatches;
+
 
 WITH xpatches AS (
   SELECT patch_name
   FROM _v.patches
-  WHERE patch_name='auditor-triggers-0001' -- TODO: use auditor-triggers-* in the future!
+  WHERE starts_with(patch_name,'auditor-triggers-')
 )
   SELECT _v.unregister_patch(xpatches.patch_name)
   FROM xpatches;