From 81e54b2d3cfd47110f38eaddfe7cc297e5fbb5c2 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Wed, 8 Mar 2023 17:04:50 +0000
Subject: [PATCH] fix for ND2_DB_ROLLBACK on netdisco-db-deploy where it cannot
 work on initial schema setup

---
 bin/netdisco-db-deploy | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/netdisco-db-deploy b/bin/netdisco-db-deploy
index 6281b8a0..ed180c9a 100755
--- a/bin/netdisco-db-deploy
+++ b/bin/netdisco-db-deploy
@@ -107,10 +107,6 @@ if ($pg_ver and $pg_ver < 90600) {
     die "\n";
 }
 
-# roll everything back if we're testing
-my $txn_guard = $ENV{ND2_DB_ROLLBACK}
-  ? schema('netdisco')->storage->txn_scope_guard : undef;
-
 if (scalar @ARGV and $ARGV[0] and $ARGV[0] eq '--redeploy-all') {
     $schema->storage->dbh_do(
       sub {
@@ -139,6 +135,10 @@ try {
     $schema->storage->disconnect;
 };
 
+# roll everything back if we're testing
+my $txn_guard = $ENV{ND2_DB_ROLLBACK}
+  ? schema('netdisco')->storage->txn_scope_guard : undef;
+
 # upgrade from whatever dbix_class_schema_versions says, to $VERSION
 # except that get_db_version will be 0 at first deploy
 my $db_version = ($schema->get_db_version || 1);