[#2719] Additional post rebase corrections

modified:

src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
src/hooks/dhcp/pgsql_cb/pgsql_cb_dhcp4.cc
src/share/database/scripts/pgsql/dhcpdb_create.pgsql

diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
index 315af5261029fa957e65fc8489a5f13c1b9abc99..15002386a375c82efda1a810b16b7501b46d42ef 100644 (file)
--- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
+++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
@@ -619,7 +619,7 @@ public:
                     last_subnet->setOfferLft(offer_lft);
                 }
 
-                // server_tag at 70.
+                // server_tag at 71.
 
                 // Subnet ready. Add it to the list.
                 auto ret = subnets.insert(last_subnet);
@@ -632,10 +632,10 @@ public:
                 }
             }
 
-            // Check for new server tags at 70.
-            if (!out_bindings[70]->amNull() &&
-                (last_tag != out_bindings[70]->getString())) {
-                last_tag = out_bindings[70]->getString();
+            // Check for new server tags at 71.
+            if (!out_bindings[71]->amNull() &&
+                (last_tag != out_bindings[71]->getString())) {
+                last_tag = out_bindings[71]->getString();
                 if (!last_tag.empty() && !last_subnet->hasServerTag(ServerTag(last_tag))) {
                     last_subnet->setServerTag(last_tag);
                 }
@@ -2503,9 +2503,9 @@ public:
             }
 
             // server tag
-            if (!out_bindings[37]->amNull() &&
-                (last_tag != out_bindings[37]->getString())) {
-                last_tag = out_bindings[37]->getString();
+            if (!out_bindings[38]->amNull() &&
+                (last_tag != out_bindings[38]->getString())) {
+                last_tag = out_bindings[38]->getString();
                 if (!last_tag.empty() && !last_client_class->hasServerTag(ServerTag(last_tag))) {
                     last_client_class->setServerTag(last_tag);
                 }

diff --git a/src/hooks/dhcp/pgsql_cb/pgsql_cb_dhcp4.cc b/src/hooks/dhcp/pgsql_cb/pgsql_cb_dhcp4.cc
index ecf2510cd97161e3b92464c6806aabd5a515588c..4f9c4369d95461d60df53c40121179028c770b16 100644 (file)
--- a/src/hooks/dhcp/pgsql_cb/pgsql_cb_dhcp4.cc
+++ b/src/hooks/dhcp/pgsql_cb/pgsql_cb_dhcp4.cc
@@ -519,9 +519,9 @@ public:
                 }
             }
 
-            // Check for new server tags at 70.
-            if (!worker.isColumnNull(70)) {
-                std::string new_tag = worker.getString(70);
+            // Check for new server tags at 71.
+            if (!worker.isColumnNull(71)) {
+                std::string new_tag = worker.getString(71);
                 if (last_tag != new_tag) {
                     if (!new_tag.empty() && !last_subnet->hasServerTag(ServerTag(new_tag))) {
                         last_subnet->setServerTag(new_tag);
@@ -2291,9 +2291,9 @@ public:
                 class_list.push_back(last_client_class);
             }
 
-            // Check for new server tags at 37.
-            if (!worker.isColumnNull(37)) {
-                std::string new_tag = worker.getString(37);
+            // Check for new server tags at 38.
+            if (!worker.isColumnNull(38)) {
+                std::string new_tag = worker.getString(38);
                 if (last_tag != new_tag) {
                     if (!new_tag.empty() && !last_client_class->hasServerTag(ServerTag(new_tag))) {
                         last_client_class->setServerTag(new_tag);

diff --git a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
index 96c86bac618662139107d5c3e2bebbdf2cf05979..910ec2e42c7eceb9145103b385296130df6a1c56 100644 (file)
--- a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
+++ b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
@@ -5624,25 +5624,7 @@ CREATE UNIQUE INDEX key_dhcp6_identifier_subnet_id ON hosts
 UPDATE schema_version
     SET version = '13', minor = '0';
 
--- This line concludes the schema upgrade to version 12.
-
--- This line starts the schema upgrade to version 14.
-
--- Add offer_lifetime column to v4 tables.
-ALTER TABLE dhcp4_shared_network
-    ADD COLUMN offer_lifetime BIGINT DEFAULT NULL;
-
-ALTER TABLE dhcp4_subnet
-    ADD COLUMN offer_lifetime BIGINT DEFAULT NULL;
-
-ALTER TABLE dhcp4_client_class
-    ADD COLUMN offer_lifetime BIGINT DEFAULT NULL;
-
--- Update the schema version number.
-UPDATE schema_version
-    SET version = '14', minor = '0';
-
--- This line concludes the schema upgrade to version 14.
+-- This line concludes the schema upgrade to version 13.
 
 -- This line starts the schema upgrade to version 14.