[#2786] add missing start transaction in upgrade script

Prevents this warning:
WARNING:  there is no transaction in progress

diff --git a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
index c8ddbcb18e4f6152e5fc2ff37d8e5c80d95a0248..f19d7ab2acaa05c578fce88bc95ee076461292de 100644 (file)
--- 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 1924561add1e257700573d5a7c9d1a7b2f5a509c..540e1d33a92da32127bc45878bf0d0b14ad8ce55 100644 (file)
--- 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 2f51e2cdc5ddb8e27a4bcd7e7d206f46af8080bf..74eebdece358dd906392d75f162f88d528af436a 100644 (file)
--- 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 51eecee2acf023cfe42db55912404165109174b0..4311df193cac896ff4ef1a418fb828c93cdd70cc 100644 (file)
--- 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 95aca7c42b2e88691f2af039dfc38e86d1a70c08..667b088bcaf07b45edb5a435539f6a00e35f4fc5 100644 (file)
--- 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 8dfb591fd33f34ee3c3e4f52356a77fb17bf5b49..62b0af0adfba5a8f236e2a33a6ead75c47366af5 100644 (file)
--- 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 90aa1a1ef041a677037627e66684ba95a3deae95..0de86c1891174297a77387e0d86e5a172419e73a 100644 (file)
--- 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 7bd04edb1443b201ce07a2822b466af2769d5800..92219049e78c1a5091b28f74c9c874059417bdf2 100644 (file)
--- 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 3918582449f64f7c10fba6834a99a27754e7e673..d9cec436011fca6339c7f6c0933bc501fc1886f9 100644 (file)
--- 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 e95563c8c4089c06b05bbf8b3e5e92aaeb725bc9..492e2b5731e3375668213aaa7fa26962184fdd4e 100644 (file)
--- 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 decffdd06a2d012e6d3a03f9a772fbc6a98292db..93ef2aef3d2255b135b5efe9154929274c50e91b 100644 (file)
--- 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 ab1b2734c9bc76d49bcea1139176637740bfec0d..4d9d4af4cffee6ea8787557c3cdd729204320bf3 100644 (file)
--- 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.