From: Tomek Mrugalski Date: Thu, 23 Jun 2016 11:04:54 +0000 (+0200) Subject: [github21] Compilation fix (PG versions constants updated in tests) X-Git-Tag: trac4283_base~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bad2b659bb3452b60c23a28845f1a4b15ba02d22;p=thirdparty%2Fkea.git [github21] Compilation fix (PG versions constants updated in tests) --- diff --git a/src/lib/dhcpsrv/pgsql_lease_mgr.h b/src/lib/dhcpsrv/pgsql_lease_mgr.h index e871b90c0f..d316f1b9f0 100644 --- a/src/lib/dhcpsrv/pgsql_lease_mgr.h +++ b/src/lib/dhcpsrv/pgsql_lease_mgr.h @@ -25,7 +25,7 @@ namespace dhcp { class PgSqlLease4Exchange; class PgSqlLease6Exchange; -/// Defines PostgreSQL backend version: 2.0 +/// Defines PostgreSQL backend version: 3.0 const uint32_t PG_CURRENT_VERSION = 3; const uint32_t PG_CURRENT_MINOR = 0; diff --git a/src/lib/dhcpsrv/tests/pgsql_lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/pgsql_lease_mgr_unittest.cc index d44d5dff35..9234881863 100755 --- a/src/lib/dhcpsrv/tests/pgsql_lease_mgr_unittest.cc +++ b/src/lib/dhcpsrv/tests/pgsql_lease_mgr_unittest.cc @@ -190,8 +190,8 @@ TEST_F(PgSqlLeaseMgrTest, checkVersion) { // Check version pair version; ASSERT_NO_THROW(version = lmptr_->getVersion()); - EXPECT_EQ(PG_SCHEMA_VERSION_MAJOR, version.first); - EXPECT_EQ(PG_SCHEMA_VERSION_MINOR, version.second); + EXPECT_EQ(PG_CURRENT_VERSION, version.first); + EXPECT_EQ(PG_CURRENT_MINOR, version.second); } ////////////////////////////////////////////////////////////////////////////////