1 files changed, 17 insertions, 1 deletions
diff --git a/lib/gitlab/database/schema_cleaner.rb b/lib/gitlab/database/schema_cleaner.rb
index c3cdcf1450d..2c8d0a4eb6d 100644
--- a/lib/gitlab/database/schema_cleaner.rb
+++ b/lib/gitlab/database/schema_cleaner.rb
@@ -25,7 +25,23 @@ module Gitlab
         # The intention here is to not introduce an assumption about the standard schema,
         # unless we have a good reason to do so.
         structure.gsub!(/public\.(\w+)/, '\1')
-        structure.gsub!(/CREATE EXTENSION IF NOT EXISTS (\w+) WITH SCHEMA public;/, 'CREATE EXTENSION IF NOT EXISTS \1;')
+        structure.gsub!(
+          /CREATE EXTENSION IF NOT EXISTS (\w+) WITH SCHEMA public;/,
+          'CREATE EXTENSION IF NOT EXISTS \1;'
+        )
+
+        # Table lock-writes triggers should not be added to the schema
+        # These triggers are added by the rake task gitlab:db:lock_writes for a decomposed database.
+        structure.gsub!(
+          %r{
+            ^CREATE.TRIGGER.gitlab_schema_write_trigger_\w+
+            \s
+            BEFORE.INSERT.OR.DELETE.OR.UPDATE.OR.TRUNCATE.ON.\w+
+            \s
+            FOR.EACH.STATEMENT.EXECUTE.FUNCTION.gitlab_schema_prevent_write\(\);$
+          }x,
+          ''
+        )
 
         structure.gsub!(/\n{3,}/, "\n\n")