diff options
| author | Francis Dupont <fdupont@isc.org> | 2020-06-19 15:46:45 +0200 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2020-06-19 17:04:50 +0200 |
| commit | e6beeb3fcb8ce12dac697bcc1bffe092342cd798 (patch) | |
| tree | 4a6b3254610d07b88846b0e35abdc126b2cb34e4 /src/lib/pgsql/testutils | |
| parent | [#1196] Fixed after migration cleanup (diff) | |
| download | kea-e6beeb3fcb8ce12dac697bcc1bffe092342cd798.tar.xz kea-e6beeb3fcb8ce12dac697bcc1bffe092342cd798.zip | |
[#1196] Addressed comments
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 21b313c1bc..f12bcbfef7 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 << " " << PGSQL_SCHEMA_VERSION_MAJOR << "." << PGSQL_SCHEMA_VERSION_MINOR; + cmd << " " << PG_SCHEMA_VERSION_MAJOR << "." << PG_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 6d90762162..7a664ab432 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 PGSQL_SCHEMA_VERSION_MAJOR -/// and PGSQL_SCHEMA_VERSION_MINOR), or a SQL error occurs. Otherwise, +/// version is incorrect (i.e. does not match PG_SCHEMA_VERSION_MAJOR +/// and PG_SCHEMA_VERSION_MINOR), or a SQL error occurs. Otherwise, /// the script is should delete all transient data, leaving intact /// reference tables. /// |