mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-12 16:06:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

4361 add datasource_id column

Browse Source
This commit is contained in:
William Schaefer 2018-11-08 16:42:04 -05:00
parent 67a2dbb294
commit b01596afc9
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/AbstractSqlEamDb.java
View File

@ -3217,7 +3217,7 @@ abstract class AbstractSqlEamDb implements EamDb {
if (dbSchemaVersion.compareTo(new CaseDbSchemaVersionNumber(1, 2)) < 0) { if (dbSchemaVersion.compareTo(new CaseDbSchemaVersionNumber(1, 2)) < 0) {
EamDbPlatformEnum selectedPlatform = EamDbPlatformEnum.getSelectedPlatform(); EamDbPlatformEnum selectedPlatform = EamDbPlatformEnum.getSelectedPlatform();
final String addObjectIdColumnTemplate = "ALTER TABLE %s ADD COLUMN object_id INTEGER;"; //NON-NLS final String addIntegerColumnTemplate = "ALTER TABLE %s ADD COLUMN %s INTEGER;"; //NON-NLS
final String addSsidTableTemplate; final String addSsidTableTemplate;
final String addCaseIdIndexTemplate; final String addCaseIdIndexTemplate;
final String addDataSourceIdIndexTemplate; final String addDataSourceIdIndexTemplate;
@ -3249,11 +3249,19 @@ abstract class AbstractSqlEamDb implements EamDb {
throw new EamDbException("Currently selected database platform \"" + selectedPlatform.name() + "\" can not be upgraded."); throw new EamDbException("Currently selected database platform \"" + selectedPlatform.name() + "\" can not be upgraded.");
} }
String instance_type_dbname; String instance_type_dbname;
final String dataSourcesTableName = "data_sources";
final String dataSourceIdColumnName = "data_source_id";
if (!doesColumnExist(conn, dataSourcesTableName, dataSourceIdColumnName)) {
statement.execute(String.format(addIntegerColumnTemplate, dataSourcesTableName, dataSourceIdColumnName)); //NON-NLS
}
//WJS-TODO add index on datasource id column
//add object_id column to existing _instances table //add object_id column to existing _instances table
final String objectIdColumnName = "object_id";
for (CorrelationAttributeInstance.Type type : CorrelationAttributeInstance.getDefaultCorrelationTypes()) { for (CorrelationAttributeInstance.Type type : CorrelationAttributeInstance.getDefaultCorrelationTypes()) {
instance_type_dbname = EamDbUtil.correlationTypeToInstanceTableName(type); instance_type_dbname = EamDbUtil.correlationTypeToInstanceTableName(type);
if (!doesColumnExist(conn, instance_type_dbname, "object_id")) { if (!doesColumnExist(conn, instance_type_dbname, objectIdColumnName)) {
statement.execute(String.format(addObjectIdColumnTemplate, instance_type_dbname)); //NON-NLS statement.execute(String.format(addIntegerColumnTemplate, instance_type_dbname, objectIdColumnName)); //NON-NLS
} }
statement.execute(String.format(addObjectIdIndexTemplate, instance_type_dbname, instance_type_dbname)); statement.execute(String.format(addObjectIdIndexTemplate, instance_type_dbname, instance_type_dbname));
} }

1
Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/PostgresEamDbSettings.java
View File

@ -344,6 +344,7 @@ public final class PostgresEamDbSettings {
createDataSourcesTable.append("case_id integer NOT NULL,"); createDataSourcesTable.append("case_id integer NOT NULL,");
createDataSourcesTable.append("device_id text NOT NULL,"); createDataSourcesTable.append("device_id text NOT NULL,");
createDataSourcesTable.append("name text NOT NULL,"); createDataSourcesTable.append("name text NOT NULL,");
createDataSourcesTable.append("datasource_id integer,");
createDataSourcesTable.append("foreign key (case_id) references cases(id) ON UPDATE SET NULL ON DELETE SET NULL,"); createDataSourcesTable.append("foreign key (case_id) references cases(id) ON UPDATE SET NULL ON DELETE SET NULL,");
createDataSourcesTable.append("CONSTRAINT datasource_unique UNIQUE (case_id, device_id, name)"); createDataSourcesTable.append("CONSTRAINT datasource_unique UNIQUE (case_id, device_id, name)");
createDataSourcesTable.append(")"); createDataSourcesTable.append(")");

1
Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/SqliteEamDbSettings.java
View File

@ -287,6 +287,7 @@ public final class SqliteEamDbSettings {
createDataSourcesTable.append("case_id integer NOT NULL,"); createDataSourcesTable.append("case_id integer NOT NULL,");
createDataSourcesTable.append("device_id text NOT NULL,"); createDataSourcesTable.append("device_id text NOT NULL,");
createDataSourcesTable.append("name text NOT NULL,"); createDataSourcesTable.append("name text NOT NULL,");
createDataSourcesTable.append("datasource_id integer,");
createDataSourcesTable.append("foreign key (case_id) references cases(id) ON UPDATE SET NULL ON DELETE SET NULL,"); createDataSourcesTable.append("foreign key (case_id) references cases(id) ON UPDATE SET NULL ON DELETE SET NULL,");
createDataSourcesTable.append("CONSTRAINT datasource_unique UNIQUE (case_id, device_id, name)"); createDataSourcesTable.append("CONSTRAINT datasource_unique UNIQUE (case_id, device_id, name)");
createDataSourcesTable.append(")"); createDataSourcesTable.append(")");