diff options
| author | Thomas Markwalder <tmark@isc.org> | 2021-12-23 15:50:24 +0100 |
|---|---|---|
| committer | Thomas Markwalder <tmark@isc.org> | 2022-01-07 21:26:56 +0100 |
| commit | 756d609cb42a65b7255a7b26e0bb708c4c605976 (patch) | |
| tree | dbf63d57d8cd557512c09334cdd92a1a513bdf66 /src/lib/pgsql/testutils | |
| parent | [#2244] option scopes and createOptionAuditDHCP6 (diff) | |
| download | kea-756d609cb42a65b7255a7b26e0bb708c4c605976.tar.xz kea-756d609cb42a65b7255a7b26e0bb708c4c605976.zip | |
[#2244] Renamed schema variables
configure.ac
src/share/database/scripts/pgsql/.gitignore
src/share/database/scripts/pgsql/Makefile.am
Updated pgsql upgrade file names
src/lib/dhcpsrv/pgsql_lease_mgr.cc
src/lib/dhcpsrv/tests/pgsql_lease_mgr_unittest.cc
src/lib/pgsql/pgsql_connection.h
src/lib/pgsql/tests/pgsql_connection_unittest.cc
src/lib/pgsql/testutils/pgsql_schema.cc
src/lib/pgsql/testutils/pgsql_schema.h
src/hooks/dhcp/pgsql_cb/pgsql_cb_impl.cc
src/lib/dhcpsrv/pgsql_host_data_source.cc
Rename schema variables
src/share/database/scripts/pgsql/upgrade_007_to_008.sh.in
Added escapes to $s
Diffstat (limited to 'src/lib/pgsql/testutils')
| -rw-r--r-- | src/lib/pgsql/testutils/pgsql_schema.cc | 2 | ||||
| -rw-r--r-- | src/lib/pgsql/testutils/pgsql_schema.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/pgsql/testutils/pgsql_schema.cc b/src/lib/pgsql/testutils/pgsql_schema.cc index 049fadffef..9cf9684d36 100644 --- a/src/lib/pgsql/testutils/pgsql_schema.cc +++ b/src/lib/pgsql/testutils/pgsql_schema.cc @@ -56,7 +56,7 @@ bool wipePgSQLData(bool show_err) { cmd << " sh " << DATABASE_SCRIPTS_DIR << "/pgsql/wipe_data.sh"; // Add expected schema version as the wipe script's first argument. - cmd << " " << PG_SCHEMA_VERSION_MAJOR << "." << PG_SCHEMA_VERSION_MINOR; + cmd << " " << PGSQL_SCHEMA_VERSION_MAJOR << "." << PGSQL_SCHEMA_VERSION_MINOR; // Now add command line arguments for psql. cmd << " --set ON_ERROR_STOP=1 -A -t -h localhost -q -U keatest -d keatest"; diff --git a/src/lib/pgsql/testutils/pgsql_schema.h b/src/lib/pgsql/testutils/pgsql_schema.h index 7a664ab432..6d90762162 100644 --- a/src/lib/pgsql/testutils/pgsql_schema.h +++ b/src/lib/pgsql/testutils/pgsql_schema.h @@ -76,8 +76,8 @@ void createPgSQLSchema(bool show_err = false, bool force = false); /// <TEST_ADMIN_SCRIPTS_DIR>/pgsql/wipe_data.sh /// /// This will fail if there is no schema, if the existing schema -/// version is incorrect (i.e. does not match PG_SCHEMA_VERSION_MAJOR -/// and PG_SCHEMA_VERSION_MINOR), or a SQL error occurs. Otherwise, +/// version is incorrect (i.e. does not match PGSQL_SCHEMA_VERSION_MAJOR +/// and PGSQL_SCHEMA_VERSION_MINOR), or a SQL error occurs. Otherwise, /// the script is should delete all transient data, leaving intact /// reference tables. /// |