Merge pull request #2294 from APriestman/fix90update

Fixes for db update code.

bindings/java/src/org/sleuthkit/datamodel/OsAccountManager.java

@@ -209,9 +209,9 @@ public OsAccount newWindowsOsAccount(String sid, String loginName, String realmN
 				}
 
 				// create failed for some other reason, throw an exception
-				throw new TskCoreException(String.format("Error creating OsAccount with sid = %s, loginName = %s, realm = %s, referring host = %d",
+				throw new TskCoreException(String.format("Error creating OsAccount with sid = %s, loginName = %s, realm = %s, referring host = %s",
 						(sid != null) ? sid : "Null", (loginName != null) ? loginName : "Null",
-						(realmName != null) ? realmName : "Null", referringHost), ex);
+						(realmName != null) ? realmName : "Null", referringHost.getName()), ex);
 
 			}
 		} finally {

bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java

@@ -2446,7 +2446,7 @@ private CaseDbSchemaVersionNumber updateFromSchema8dot6toSchema9dot0(CaseDbSchem
 				+ "realm_addr TEXT DEFAULT NULL, "		// a sid/uid or some some other identifier, may be null
 				+ "realm_signature TEXT NOT NULL, "		// Signature exists only to prevent duplicates. It is  made up of realm address/name and scope host
 				+ "scope_host_id " + bigIntDataType + " DEFAULT NULL, " // if the realm scope is a single host
-				+ "name_type INTEGER, "	// indicates whether we know for sure the realm scope or if we are inferring it
+				+ "scope_confidence INTEGER, "	// indicates whether we know for sure the realm scope or if we are inferring it
 				+ "db_status INTEGER DEFAULT 0, " // active/merged/deleted
 				+ "merged_into " + bigIntDataType + " DEFAULT NULL, "	
 				+ "UNIQUE(realm_signature), "
@@ -2486,7 +2486,7 @@ private CaseDbSchemaVersionNumber updateFromSchema8dot6toSchema9dot0(CaseDbSchem
 					+ "status INTEGER, " // enabled/disabled/deleted
 					+ "type INTEGER, " // service/interactive
 					+ "created_date " + bigIntDataType + " DEFAULT NULL, "
-					+ "db_status INTEGER, " // active/merged/deleted
+					+ "db_status INTEGER DEFAULT 0, " // active/merged/deleted
 			        + "merged_into " + bigIntDataType + " DEFAULT NULL, "
 					+ "UNIQUE(signature, realm_id), "
 					+ "FOREIGN KEY(os_account_obj_id) REFERENCES tsk_objects(obj_id) ON DELETE CASCADE, "