From 3e7dcb311994b0b2538cf4c4d82339bfbb6b7b2a Mon Sep 17 00:00:00 2001
From: Andrei Pavel <andrei@isc.org>
Date: Fri, 19 May 2023 12:12:33 +0300
Subject: [PATCH] [#2786] add missing start transaction in upgrade script

Prevents this warning:
WARNING:  there is no transaction in progress
---
 src/share/database/scripts/pgsql/dhcpdb_create.pgsql          | 2 +-
 src/share/database/scripts/pgsql/upgrade_002.0_to_003.0.sh.in | 1 -
 src/share/database/scripts/pgsql/upgrade_003.0_to_003.1.sh.in | 1 -
 src/share/database/scripts/pgsql/upgrade_003.1_to_003.2.sh.in | 1 -
 src/share/database/scripts/pgsql/upgrade_003.2_to_003.3.sh.in | 1 -
 src/share/database/scripts/pgsql/upgrade_003.3_to_004.0.sh.in | 1 -
 src/share/database/scripts/pgsql/upgrade_004.0_to_005.0.sh.in | 1 -
 src/share/database/scripts/pgsql/upgrade_005.0_to_005.1.sh.in | 1 -
 src/share/database/scripts/pgsql/upgrade_005.1_to_006.0.sh.in | 1 -
 src/share/database/scripts/pgsql/upgrade_006.0_to_006.1.sh.in | 1 -
 src/share/database/scripts/pgsql/upgrade_006.1_to_006.2.sh.in | 2 ++
 src/share/database/scripts/pgsql/upgrade_006.2_to_007.0.sh.in | 1 -
 12 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
index c8ddbcb18e..f19d7ab2ac 100644
--- a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
+++ b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
@@ -19,7 +19,7 @@
 
 -- @dhcpdb_create.pgsql
 
--- Start a single transaction for the Entire script
+-- Start a single transaction for the entire script.
 START TRANSACTION;
 
 -- Holds the IPv4 leases.
diff --git a/src/share/database/scripts/pgsql/upgrade_002.0_to_003.0.sh.in b/src/share/database/scripts/pgsql/upgrade_002.0_to_003.0.sh.in
index 1924561add..540e1d33a9 100644
--- a/src/share/database/scripts/pgsql/upgrade_002.0_to_003.0.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_002.0_to_003.0.sh.in
@@ -34,7 +34,6 @@ if [ "$VERSION" != "2.0" ]; then
 fi
 
 psql "$@" >/dev/null <<EOF
-
 START TRANSACTION;
 
 -- This line starts the schema upgrade to version 3.0.
diff --git a/src/share/database/scripts/pgsql/upgrade_003.0_to_003.1.sh.in b/src/share/database/scripts/pgsql/upgrade_003.0_to_003.1.sh.in
index 2f51e2cdc5..74eebdece3 100644
--- a/src/share/database/scripts/pgsql/upgrade_003.0_to_003.1.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_003.0_to_003.1.sh.in
@@ -34,7 +34,6 @@ if [ "$VERSION" != "3.0" ]; then
 fi
 
 psql "$@" >/dev/null <<EOF
-
 START TRANSACTION;
 
 -- This line starts the schema upgrade to version 3.1.
diff --git a/src/share/database/scripts/pgsql/upgrade_003.1_to_003.2.sh.in b/src/share/database/scripts/pgsql/upgrade_003.1_to_003.2.sh.in
index 51eecee2ac..4311df193c 100644
--- a/src/share/database/scripts/pgsql/upgrade_003.1_to_003.2.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_003.1_to_003.2.sh.in
@@ -34,7 +34,6 @@ if [ "$VERSION" != "3.1" ]; then
 fi
 
 psql "$@" >/dev/null <<EOF
-
 START TRANSACTION;
 
 -- This line starts the schema upgrade to version 3.2.
diff --git a/src/share/database/scripts/pgsql/upgrade_003.2_to_003.3.sh.in b/src/share/database/scripts/pgsql/upgrade_003.2_to_003.3.sh.in
index 95aca7c42b..667b088bca 100644
--- a/src/share/database/scripts/pgsql/upgrade_003.2_to_003.3.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_003.2_to_003.3.sh.in
@@ -34,7 +34,6 @@ if [ "$VERSION" != "3.2" ]; then
 fi
 
 psql "$@" >/dev/null <<EOF
-
 START TRANSACTION;
 
 -- This line starts the schema upgrade to version 3.3.
diff --git a/src/share/database/scripts/pgsql/upgrade_003.3_to_004.0.sh.in b/src/share/database/scripts/pgsql/upgrade_003.3_to_004.0.sh.in
index 8dfb591fd3..62b0af0adf 100644
--- a/src/share/database/scripts/pgsql/upgrade_003.3_to_004.0.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_003.3_to_004.0.sh.in
@@ -34,7 +34,6 @@ if [ "$VERSION" != "3.3" ]; then
 fi
 
 psql "$@" >/dev/null <<EOF
-
 START TRANSACTION;
 
 -- This line starts the schema upgrade to version 4.0.
diff --git a/src/share/database/scripts/pgsql/upgrade_004.0_to_005.0.sh.in b/src/share/database/scripts/pgsql/upgrade_004.0_to_005.0.sh.in
index 90aa1a1ef0..0de86c1891 100644
--- a/src/share/database/scripts/pgsql/upgrade_004.0_to_005.0.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_004.0_to_005.0.sh.in
@@ -34,7 +34,6 @@ if [ "$VERSION" != "4.0" ]; then
 fi
 
 psql "$@" >/dev/null <<EOF
-
 START TRANSACTION;
 
 -- This line starts the schema upgrade to version 5.0.
diff --git a/src/share/database/scripts/pgsql/upgrade_005.0_to_005.1.sh.in b/src/share/database/scripts/pgsql/upgrade_005.0_to_005.1.sh.in
index 7bd04edb14..92219049e7 100644
--- a/src/share/database/scripts/pgsql/upgrade_005.0_to_005.1.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_005.0_to_005.1.sh.in
@@ -34,7 +34,6 @@ if [ "$VERSION" != "5.0" ]; then
 fi
 
 psql "$@" >/dev/null <<EOF
-
 START TRANSACTION;
 
 -- This line starts the schema upgrade to version 5.1.
diff --git a/src/share/database/scripts/pgsql/upgrade_005.1_to_006.0.sh.in b/src/share/database/scripts/pgsql/upgrade_005.1_to_006.0.sh.in
index 3918582449..d9cec43601 100644
--- a/src/share/database/scripts/pgsql/upgrade_005.1_to_006.0.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_005.1_to_006.0.sh.in
@@ -34,7 +34,6 @@ if [ "$VERSION" != "5.1" ]; then
 fi
 
 psql "$@" >/dev/null <<EOF
-
 START TRANSACTION;
 
 -- This line starts the schema upgrade to version 6.0.
diff --git a/src/share/database/scripts/pgsql/upgrade_006.0_to_006.1.sh.in b/src/share/database/scripts/pgsql/upgrade_006.0_to_006.1.sh.in
index e95563c8c4..492e2b5731 100644
--- a/src/share/database/scripts/pgsql/upgrade_006.0_to_006.1.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_006.0_to_006.1.sh.in
@@ -34,7 +34,6 @@ if [ "$VERSION" != "6.0" ]; then
 fi
 
 psql "$@" >/dev/null <<EOF
-
 START TRANSACTION;
 
 -- This line starts the schema upgrade to version 6.1.
diff --git a/src/share/database/scripts/pgsql/upgrade_006.1_to_006.2.sh.in b/src/share/database/scripts/pgsql/upgrade_006.1_to_006.2.sh.in
index decffdd06a..93ef2aef3d 100644
--- a/src/share/database/scripts/pgsql/upgrade_006.1_to_006.2.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_006.1_to_006.2.sh.in
@@ -35,6 +35,8 @@ fi
 
 psql "$@" >/dev/null <<EOF
 
+START TRANSACTION;
+
 -- This line starts the schema upgrade to version 6.2.
 
 -- Starting from this version we allow specifying multiple IP reservations
diff --git a/src/share/database/scripts/pgsql/upgrade_006.2_to_007.0.sh.in b/src/share/database/scripts/pgsql/upgrade_006.2_to_007.0.sh.in
index ab1b2734c9..4d9d4af4cf 100644
--- a/src/share/database/scripts/pgsql/upgrade_006.2_to_007.0.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_006.2_to_007.0.sh.in
@@ -34,7 +34,6 @@ if [ "$VERSION" != "6.2" ]; then
 fi
 
 psql "$@" >/dev/null <<EOF
-
 START TRANSACTION;
 
 -- This line starts the schema upgrade to version 7.0.
-- 
2.47.2