From: Thomas Markwalder <tmark@isc.org>
Date: Fri, 6 Apr 2018 18:41:28 +0000 (-0400)
Subject: [master] Fixed broken Postgresql lease6 queries
X-Git-Tag: trac5458a_base~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1184cb0a168e88cb24b386336f89251413f365d;p=thirdparty%2Fkea.git

[master] Fixed broken Postgresql lease6 queries

    Two Postgresql lease manager v6 queries were missing hardware address
    columns recently added, causing unit tests to fall down.
---

diff --git a/src/lib/dhcpsrv/pgsql_lease_mgr.cc b/src/lib/dhcpsrv/pgsql_lease_mgr.cc
index 34572f73f6..dba13520cf 100644
--- a/src/lib/dhcpsrv/pgsql_lease_mgr.cc
+++ b/src/lib/dhcpsrv/pgsql_lease_mgr.cc
@@ -139,6 +139,7 @@ PgSqlTaggedStatement tagged_statements[] = {
       "SELECT address, duid, valid_lifetime, "
         "extract(epoch from expire)::bigint, subnet_id, pref_lifetime, "
         "lease_type, iaid, prefix_len, fqdn_fwd, fqdn_rev, hostname, "
+        "hwaddr, hwtype, hwaddr_source, "
         "state "
       "FROM lease6"},
 
@@ -182,6 +183,7 @@ PgSqlTaggedStatement tagged_statements[] = {
       "SELECT address, duid, valid_lifetime, "
         "extract(epoch from expire)::bigint, subnet_id, pref_lifetime, "
         "lease_type, iaid, prefix_len, fqdn_fwd, fqdn_rev, hostname, "
+        "hwaddr, hwtype, hwaddr_source, "
         "state "
       "FROM lease6 "
       "WHERE subnet_id = $1"},