From d0e03f2454792eb244d2e430b7ca8edaec294234 Mon Sep 17 00:00:00 2001
From: Ann Priestman <apriestman@basistech.com>
Date: Tue, 5 Feb 2019 14:51:38 -0500
Subject: [PATCH] Remove version update/typo fix
---
.../sleuthkit/datamodel/SleuthkitCase.java | 44 +------------------
tsk/auto/db_sqlite.cpp | 4 +-
tsk/auto/tsk_db.h | 2 +-
3 files changed, 4 insertions(+), 46 deletions(-)
diff --git a/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java b/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java
index 43dc114c5..a32ba6302 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java
@@ -94,7 +94,7 @@ public class SleuthkitCase {
* tsk/auto/tsk_db.h.
*/
private static final CaseDbSchemaVersionNumber CURRENT_DB_SCHEMA_VERSION
- = new CaseDbSchemaVersionNumber(8, 3);
+ = new CaseDbSchemaVersionNumber(8, 2);
private static final long BASE_ARTIFACT_ID = Long.MIN_VALUE; // Artifact ids will start at the lowest negative value
private static final Logger logger = Logger.getLogger(SleuthkitCase.class.getName());
@@ -862,11 +862,8 @@ private void updateDatabaseSchema(String dbPath) throws Exception {
dbSchemaVersion = updateFromSchema7dot2toSchema8dot0(dbSchemaVersion, connection);
dbSchemaVersion = updateFromSchema8dot0toSchema8dot1(dbSchemaVersion, connection);
dbSchemaVersion = updateFromSchema8dot1toSchema8dot2(dbSchemaVersion, connection);
- dbSchemaVersion = updateFromSchema8dot2toSchema8dot3(dbSchemaVersion, connection);
statement = connection.createStatement();
connection.executeUpdate(statement, "UPDATE tsk_db_info SET schema_ver = " + dbSchemaVersion.getMajor() + ", schema_minor_ver = " + dbSchemaVersion.getMinor()); //NON-NLS
- connection.executeUpdate(statement, "UPDATE tsk_db_info_extended SET value='8' WHERE name='" + SCHEMA_MAJOR_VERSION_KEY + "'");
- connection.executeUpdate(statement, "UPDATE tsk_db_info_extended SET value='3' WHERE name='" + SCHEMA_MINOR_VERSION_KEY + "'");
statement.close();
statement = null;
}
@@ -1670,45 +1667,6 @@ private CaseDbSchemaVersionNumber updateFromSchema8dot1toSchema8dot2(CaseDbSchem
}
}
- /**
- * Updates a schema version 8.2 database to a schema version 8.3 database.
- *
- * @param schemaVersion The current schema version of the database.
- * @param connection A connection to the case database.
- *
- * @return The new database schema version.
- *
- * @throws SQLException If there is an error completing a database
- * operation.
- * @throws TskCoreException If there is an error completing a database
- * operation via another SleuthkitCase method.
- */
- private CaseDbSchemaVersionNumber updateFromSchema8dot2toSchema8dot3(CaseDbSchemaVersionNumber schemaVersion, CaseDbConnection connection) throws SQLException, TskCoreException {
- if (schemaVersion.getMajor() != 8) {
- return schemaVersion;
- }
-
- if (schemaVersion.getMinor() != 2) {
- return schemaVersion;
- }
- Statement statement = connection.createStatement();
- acquireSingleUserCaseWriteLock();
- try {
-
- // Fix typo in 8.2 Sqlite databases
- statement.execute("UPDATE tsk_db_info_extended SET name='" + CREATION_SCHEMA_MAJOR_VERSION_KEY +
- "' WHERE name='CREATED_SCHEMA_MAJOR_VERSION'");
- statement.execute("UPDATE tsk_db_info_extended SET name='" + CREATION_SCHEMA_MINOR_VERSION_KEY +
- "' WHERE name='CREATED_SCHEMA_MINOR_VERSION'");
-
- return new CaseDbSchemaVersionNumber(8, 3);
-
- } finally {
- closeStatement(statement);
- releaseSingleUserCaseWriteLock();
- }
- }
-
/**
* Extract the extension from a file name.
*
diff --git a/tsk/auto/db_sqlite.cpp b/tsk/auto/db_sqlite.cpp
index 7275689c8..2e660729a 100755
--- a/tsk/auto/db_sqlite.cpp
+++ b/tsk/auto/db_sqlite.cpp
@@ -266,12 +266,12 @@ int
return 1;
}
- snprintf(foo, 1024, "INSERT INTO tsk_db_info_extended (name, value) VALUES ('CREATION_SCHEMA_MAJOR_VERSION', '%d');", TSK_SCHEMA_VER);
+ snprintf(foo, 1024, "INSERT INTO tsk_db_info_extended (name, value) VALUES ('CREATED_SCHEMA_MAJOR_VERSION', '%d');", TSK_SCHEMA_VER);
if (attempt_exec(foo, "Error adding data to tsk_db_info table: %s\n")) {
return 1;
}
- snprintf(foo, 1024, "INSERT INTO tsk_db_info_extended (name, value) VALUES ('CREATION_SCHEMA_MINOR_VERSION', '%d');", TSK_SCHEMA_MINOR_VER);
+ snprintf(foo, 1024, "INSERT INTO tsk_db_info_extended (name, value) VALUES ('CREATED_SCHEMA_MINOR_VERSION', '%d');", TSK_SCHEMA_MINOR_VER);
if (attempt_exec(foo, "Error adding data to tsk_db_info table: %s\n")) {
return 1;
}
diff --git a/tsk/auto/tsk_db.h b/tsk/auto/tsk_db.h
index f5d4ca246..621eec3bc 100755
--- a/tsk/auto/tsk_db.h
+++ b/tsk/auto/tsk_db.h
@@ -29,7 +29,7 @@ using std::vector;
using std::string;
#define TSK_SCHEMA_VER 8
-#define TSK_SCHEMA_MINOR_VER 3
+#define TSK_SCHEMA_MINOR_VER 2
/**
* Values for the type column in the tsk_objects table.
--
GitLab