SAK-23634 - Add User Auditing Log that tracks when users were added/r…

…emoved/updated from a site - edited the sql in the code to match the case sensitivity of the SQL git-svn-id: https://source.sakaiproject.org/svn/userauditservice/trunk@133336 66ffb92e-73f9-0310-93c1-f5514f145a0a
axxter99 · Jan 16, 2014 · 4453975 · 4453975
1 parent c9b050f
commit 4453975
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/userauditservice/tool/src/java/org/sakaiproject/userauditservice/tool/UserAuditEventLog.java b/userauditservice/tool/src/java/org/sakaiproject/userauditservice/tool/UserAuditEventLog.java
@@ -306,16 +306,16 @@ private void getEvents()
 			{
 				conn = sqlService.borrowConnection();
 				statement = conn.createStatement();
-				sql = "select USER_ID, ROLE_NAME, ACTION_TAKEN, AUDIT_STAMP, SOURCE, ACTION_USER_ID from USER_AUDITS_LOG where SITE_ID = '" + siteId + "' order by AUDIT_STAMP desc";
+				sql = "select user_id, role_name, action_taken, audit_stamp, source, action_user_id from user_audits_log where site_id = '" + siteId + "' order by audit_stamp desc";
 				result = statement.executeQuery(sql);
 				while (result.next())
 				{
-					String userId = result.getString("USER_ID");
-					String roleName = result.getString("ROLE_NAME");
-					String actionTaken = result.getString("ACTION_TAKEN");
-					Timestamp auditStamp = result.getTimestamp("AUDIT_STAMP");
-					String source = result.getString("SOURCE");
-					String actionUserId = result.getString("ACTION_USER_ID");
+					String userId = result.getString("user_id");
+					String roleName = result.getString("role_name");
+					String actionTaken = result.getString("action_taken");
+					Timestamp auditStamp = result.getTimestamp("audit_stamp");
+					String source = result.getString("source");
+					String actionUserId = result.getString("action_user_id");
 
 					User cachedUser;
 					if (userMap.containsKey(userId))

diff --git a/...rvice/util/src/java/org/sakaiproject/userauditservice/util/UserAuditRegistrationUtil.java b/...rvice/util/src/java/org/sakaiproject/userauditservice/util/UserAuditRegistrationUtil.java
@@ -163,11 +163,11 @@ public void addToUserAuditing(List<String[]> userAuditList)
 			Object fields[] = new Object[7];
 			if ("oracle".equals(sqlVendor))
 			{
-				sql = "insert into USER_AUDITS_LOG (ID,SITE_ID,USER_ID,ROLE_NAME,ACTION_TAKEN,AUDIT_STAMP,SOURCE,ACTION_USER_ID) values (USER_AUDITS_LOG_SEQ.nextval,?,?,?,?,to_date(?,'YYYY-MM-DD HH24:MI:SS'),?,?)";
+				sql = "insert into user_audits_log (id,site_id,user_id,role_name,action_taken,audit_stamp,source,action_user_id) values (user_audits_log_seq.nextval,?,?,?,?,to_date(?,'YYYY-MM-DD HH24:MI:SS'),?,?)";
 			}
 			else
 			{
-				sql = "insert into USER_AUDITS_LOG (SITE_ID,USER_ID,ROLE_NAME,ACTION_TAKEN,AUDIT_STAMP,SOURCE,ACTION_USER_ID) values (?,?,?,?,?,?,?)";
+				sql = "insert into user_audits_log (site_id,user_id,role_name,action_taken,audit_stamp,source,action_user_id) values (?,?,?,?,?,?,?)";
 			}
 			fields[0] = siteId;
 			fields[1] = username;
@@ -186,7 +186,7 @@ public void addToUserAuditing(List<String[]> userAuditList)
 	/** Method to delete all the user auditing log entries for a site.  Used when deleting a site */
 	public void deleteUserAuditingFromSite(String siteId)
 	{
-		String sql = "delete from USER_AUDITS_LOG where SITE_ID = ?";
+		String sql = "delete from user_audits_log where site_id = ?";
 
 		Object fields[] = new Object[1];