v0.2.52..v0.2.53 changeset OsmApiDb.cpp - ngageoint/hootenanny GitHub Wiki

diff --git a/hoot-core/src/main/cpp/hoot/core/io/OsmApiDb.cpp b/hoot-core/src/main/cpp/hoot/core/io/OsmApiDb.cpp
index f5f9165..530cf8b 100644
--- a/hoot-core/src/main/cpp/hoot/core/io/OsmApiDb.cpp
+++ b/hoot-core/src/main/cpp/hoot/core/io/OsmApiDb.cpp
@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. DigitalGlobe
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2016, 2017, 2018, 2019 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2016, 2017, 2018, 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
  */
 #include "OsmApiDb.h"
 
@@ -102,55 +102,31 @@ void OsmApiDb::deleteData()
 {
   LOG_TRACE("Deleting all data...");
 
-  DbUtils::execNoPrepare(
-    _db,
-    "DELETE FROM " + ApiDb::getCurrentRelationMembersTableName() + " CASCADE");
-  DbUtils::execNoPrepare(
-    _db, "DELETE FROM " + ApiDb::getCurrentRelationTagsTableName() + " CASCADE");
-  DbUtils::execNoPrepare(
-    _db, "DELETE FROM " + ApiDb::getCurrentRelationsTableName() + " CASCADE");
-  DbUtils::execNoPrepare(
-    _db, "ALTER SEQUENCE " + ApiDb::getCurrentRelationsSequenceName() + " RESTART WITH 1");
-  DbUtils::execNoPrepare(
-    _db, "DELETE FROM " + ApiDb::getRelationMembersTableName() + " CASCADE");
-  DbUtils::execNoPrepare(
-    _db, "DELETE FROM " + ApiDb::getRelationTagsTableName() + " CASCADE");
-  DbUtils::execNoPrepare(_db, "DELETE FROM " + ApiDb::getRelationsTableName() + " CASCADE");
-
-  DbUtils::execNoPrepare(
-    _db, "DELETE FROM " + ApiDb::getCurrentWayNodesTableName() + " CASCADE");
-  DbUtils::execNoPrepare(
-    _db, "DELETE FROM " + ApiDb::getCurrentWayTagsTableName() + " CASCADE");
-  DbUtils::execNoPrepare(
-    _db, "DELETE FROM " + ApiDb::getCurrentWaysTableName() + " CASCADE");
-  DbUtils::execNoPrepare(
-    _db, "ALTER SEQUENCE " + ApiDb::getCurrentWaysSequenceName() + " RESTART WITH 1");
-  DbUtils::execNoPrepare(_db, "DELETE FROM " + ApiDb::getWayNodesTableName() + " CASCADE");
-  DbUtils::execNoPrepare(_db, "DELETE FROM " + ApiDb::getWayTagsTableName() + " CASCADE");
-  DbUtils::execNoPrepare(_db, "DELETE FROM " + ApiDb::getWaysTableName() + " CASCADE");
-
-  DbUtils::execNoPrepare(
-    _db, "DELETE FROM " + ApiDb::getCurrentNodeTagsTableName() + " CASCADE");
-  DbUtils::execNoPrepare(
-    _db, "DELETE FROM " + ApiDb::getCurrentNodesTableName() + " CASCADE");
-  DbUtils::execNoPrepare(
-    _db, "ALTER SEQUENCE " + ApiDb::getCurrentNodesSequenceName() + " RESTART WITH 1");
-  DbUtils::execNoPrepare(_db, "DELETE FROM " + ApiDb::getNodeTagsTableName() + " CASCADE");
-  DbUtils::execNoPrepare(_db, "DELETE FROM " + ApiDb::getNodesTableName() + " CASCADE");
-
-  DbUtils::execNoPrepare(
-    _db, "DELETE FROM " + ApiDb::getChangesetsSubscribersTableName() + " CASCADE");
-  DbUtils::execNoPrepare(
-    _db, "DELETE FROM " + ApiDb::getChangesetTagsTableName() + " CASCADE");
-  DbUtils::execNoPrepare(
-    _db, "DELETE FROM " + ApiDb::getChangesetsTableName() + " CASCADE");
-  DbUtils::execNoPrepare(
-    _db, "ALTER SEQUENCE " + ApiDb::getChangesetsSequenceName() + " RESTART WITH 1");
+  DbUtils::execNoPrepare(_db, "TRUNCATE TABLE " + ApiDb::getCurrentRelationMembersTableName() + " CASCADE");
+  DbUtils::execNoPrepare(_db, "TRUNCATE TABLE " + ApiDb::getCurrentRelationTagsTableName() + " CASCADE");
+  DbUtils::execNoPrepare(_db, "TRUNCATE TABLE " + ApiDb::getCurrentRelationsTableName() + " RESTART IDENTITY CASCADE");
+  DbUtils::execNoPrepare(_db, "TRUNCATE TABLE " + ApiDb::getRelationMembersTableName() + " CASCADE");
+  DbUtils::execNoPrepare(_db, "TRUNCATE TABLE " + ApiDb::getRelationTagsTableName() + " CASCADE");
+  DbUtils::execNoPrepare(_db, "TRUNCATE TABLE " + ApiDb::getRelationsTableName() + " CASCADE");
+
+  DbUtils::execNoPrepare(_db, "TRUNCATE TABLE " + ApiDb::getCurrentWayNodesTableName() + " CASCADE");
+  DbUtils::execNoPrepare(_db, "TRUNCATE TABLE " + ApiDb::getCurrentWayTagsTableName() + " CASCADE");
+  DbUtils::execNoPrepare(_db, "TRUNCATE TABLE " + ApiDb::getCurrentWaysTableName() + " RESTART IDENTITY CASCADE");
+  DbUtils::execNoPrepare(_db, "TRUNCATE TABLE " + ApiDb::getWayNodesTableName() + " CASCADE");
+  DbUtils::execNoPrepare(_db, "TRUNCATE TABLE " + ApiDb::getWayTagsTableName() + " CASCADE");
+  DbUtils::execNoPrepare(_db, "TRUNCATE TABLE " + ApiDb::getWaysTableName() + " CASCADE");
+
+  DbUtils::execNoPrepare(_db, "TRUNCATE TABLE " + ApiDb::getCurrentNodeTagsTableName() + " CASCADE");
+  DbUtils::execNoPrepare(_db, "TRUNCATE TABLE " + ApiDb::getCurrentNodesTableName() + " RESTART IDENTITY CASCADE");
+  DbUtils::execNoPrepare(_db, "TRUNCATE TABLE " + ApiDb::getNodeTagsTableName() + " CASCADE");
+  DbUtils::execNoPrepare(_db, "TRUNCATE TABLE " + ApiDb::getNodesTableName() + " CASCADE");
+
+  DbUtils::execNoPrepare(_db, "TRUNCATE TABLE " + ApiDb::getChangesetsSubscribersTableName() + " CASCADE");
+  DbUtils::execNoPrepare(_db, "TRUNCATE TABLE " + ApiDb::getChangesetTagsTableName() + " CASCADE");
+  DbUtils::execNoPrepare(_db, "TRUNCATE TABLE " + ApiDb::getChangesetsTableName() + " RESTART IDENTITY CASCADE");
 
   // delete users
-  DbUtils::execNoPrepare(_db, "DELETE FROM " + ApiDb::getUsersTableName() + " CASCADE");
-  DbUtils::execNoPrepare(
-    _db, "ALTER SEQUENCE " + ApiDb::getUsersSequenceName() + " RESTART WITH 1");
+  DbUtils::execNoPrepare(_db, "TRUNCATE TABLE " + ApiDb::getUsersTableName() + " RESTART IDENTITY CASCADE");
 }
 
 bool OsmApiDb::isSupported(const QUrl& url)