[3969] Addressed review comments

diff --git a/src/bin/admin/scripts/pgsql/.gitignore b/src/bin/admin/scripts/pgsql/.gitignore
new file mode 100644 (file)
index 0000000..9976ce8
--- /dev/null
+++ b/src/bin/admin/scripts/pgsql/.gitignore
@@ -0,0 +1 @@
+upgrade_1.0_to_2.0.sh

diff --git a/src/bin/admin/tests/dhcpdb_create_1.0.pgsql b/src/bin/admin/tests/dhcpdb_create_1.0.pgsql
index 8030e26ea87d032195bf33eac710c526325c9240..0f6b645654cfceecb47d01d4a8a1b7aa60ab88b6 100644 (file)
--- a/src/bin/admin/tests/dhcpdb_create_1.0.pgsql
+++ b/src/bin/admin/tests/dhcpdb_create_1.0.pgsql
@@ -13,7 +13,9 @@
 -- NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 -- WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
--- This is the Kea DHCP schema specification for PostgreSQL.
+-- This is the Kea DHCP schema specification for PostgreSQL schema 1.0.
+-- It is used to create a 1.0 schema database for testing kea-admin's
+-- ability to upgrade Postgres databases.
 
 -- The schema is reasonably portable (with the exception of some field types
 -- specification, which are PostgreSQL-specific).  Minor changes might be needed
@@ -86,7 +88,7 @@ INSERT INTO lease6_types VALUES (1, 'IA_TA');   -- Temporary v6 addresses
 INSERT INTO lease6_types VALUES (2, 'IA_PD');   -- Prefix delegations
 COMMIT;
 
--- Finally, the version of the schema.  We start at 0.1 during development.
+-- Finally, the version of the schema.  We start at 1.0 during development.
 -- This table is only modified during schema upgrades.  For historical reasons
 -- (related to the names of the columns in the BIND 10 DNS database file), the
 -- first column is called "version" and not "major".

diff --git a/src/bin/admin/tests/pgsql_tests.sh.in b/src/bin/admin/tests/pgsql_tests.sh.in
index 43e04b9d37788cda9a94dbb660e657a80664b8b4..83f803edb7a6f2c8c52796f8f13eb7327f819c8d 100644 (file)
--- a/src/bin/admin/tests/pgsql_tests.sh.in
+++ b/src/bin/admin/tests/pgsql_tests.sh.in
@@ -122,7 +122,7 @@ pgsql_upgrade_test() {
     # Wipe the whole database
     pgsql_wipe
 
-    # Initialize database to scheme 1.0.
+    # Initialize database to schema 1.0.
     pgsql_execute_script @abs_top_srcdir@/src/bin/admin/tests/dhcpdb_create_1.0.pgsql
     assert_eq 0 $? "cannot initialize the database, expected exit code: %d, actual: %d"