changes to DROPs and TRUNCATEs for Cassandra

diff --git a/src/share/database/scripts/cql/dhcpdb_drop.cql b/src/share/database/scripts/cql/dhcpdb_drop.cql
index 4f2fbee46a4f880d5da1acad8d4ad171000bd9cd..7a93e3df17db7ab0be87626c7ddb1e9acdc55ebb 100644 (file)
--- a/src/share/database/scripts/cql/dhcpdb_drop.cql
+++ b/src/share/database/scripts/cql/dhcpdb_drop.cql
@@ -18,11 +18,8 @@ DROP TABLE IF EXISTS lease4;
 DROP TABLE IF EXISTS lease6;
 DROP TABLE IF EXISTS lease6_types;
 DROP TABLE IF EXISTS lease_hwaddr_source;
-DROP TABLE IF EXISTS schema_version;
-DROP TABLE IF EXISTS ipv6_reservations;
-DROP TABLE IF EXISTS hosts;
-DROP TABLE IF EXISTS host_identifier_type;
 DROP TABLE IF EXISTS lease_state;
+DROP TABLE IF EXISTS schema_version;
 DROP TABLE IF EXISTS host_reservations;
 
 DROP INDEX IF EXISTS lease4index1;

diff --git a/src/share/database/scripts/cql/soft_wipe.cql b/src/share/database/scripts/cql/soft_wipe.cql
index e6f0723a6a0712241eefe169c2869519f8aa9a3a..5c9580843c2f70533554e64bdb85e4388ca6c062 100644 (file)
--- a/src/share/database/scripts/cql/soft_wipe.cql
+++ b/src/share/database/scripts/cql/soft_wipe.cql
@@ -19,7 +19,8 @@
 
 TRUNCATE TABLE lease4;
 TRUNCATE TABLE lease6;
-TRUNCATE TABLE hosts;
-TRUNCATE TABLE dhcp4_options;
-TRUNCATE TABLE dhcp6_options;
-TRUNCATE TABLE host_reservations;
\ No newline at end of file
+TRUNCATE TABLE lease6_types;
+TRUNCATE TABLE lease_hwaddr_source;
+TRUNCATE TABLE lease_state;
+TRUNCATE TABLE schema_version;
+TRUNCATE TABLE host_reservations;