SVN Commit by dpage: r4239 - in trunk/pgadmin3: src/agent xtra/pgagent

Author: dpage
Date: 2005-05-23 19:58:42 +0100 (Mon, 23 May 2005)
New Revision: 4239

Modified:
trunk/pgadmin3/src/agent/pgaJob.cpp
trunk/pgadmin3/xtra/pgagent/pgagent.sql
Log:
Report job status' correctly

Modified: trunk/pgadmin3/src/agent/pgaJob.cpp
===================================================================
--- trunk/pgadmin3/src/agent/pgaJob.cpp 2005-05-23 18:47:57 UTC (rev 4238)
+++ trunk/pgadmin3/src/agent/pgaJob.cpp 2005-05-23 18:58:42 UTC (rev 4239)
@@ -201,6 +201,8 @@
status = _("Successful");
else if (stats->GetVal(1) == wxT("f"))
status = _("Failed");
+ else if (stats->GetVal(1) == wxT("d"))
+ status = _("Aborted");
else if (stats->GetVal(1) == wxT("i"))
status = _("No steps");
else

Modified: trunk/pgadmin3/xtra/pgagent/pgagent.sql
===================================================================
--- trunk/pgadmin3/xtra/pgagent/pgagent.sql 2005-05-23 18:47:57 UTC (rev 4238)
+++ trunk/pgadmin3/xtra/pgagent/pgagent.sql 2005-05-23 18:58:42 UTC (rev 4239)
@@ -114,13 +114,13 @@
CREATE TABLE pgagent.pga_joblog (
jlgid serial NOT NULL PRIMARY KEY,
jlgjobid int4 NOT NULL REFERENCES pgagent.pga_job (jobid) ON DELETE CASCADE ON UPDATE RESTRICT,
-jlgstatus char NOT NULL CHECK (jlgstatus IN ('r', 's', 'f', 'i')) DEFAULT 'r', -- running, success, failed, internal failure
+jlgstatus char NOT NULL CHECK (jlgstatus IN ('r', 's', 'f', 'i', 'd')) DEFAULT 'r', -- running, success, failed, internal failure, aborted
jlgstart timestamptz NOT NULL DEFAULT current_timestamp,
jlgduration interval NULL
) WITHOUT OIDS;
CREATE INDEX pga_joblog_jobid ON pgagent.pga_joblog(jlgjobid);
COMMENT ON TABLE pgagent.pga_joblog IS 'Job run logs.';
-COMMENT ON COLUMN pgagent.pga_joblog.jlgstatus IS 'Status of job: r=running, s=successfully finished, f=failed, i=no steps to execute';
+COMMENT ON COLUMN pgagent.pga_joblog.jlgstatus IS 'Status of job: r=running, s=successfully finished, f=failed, i=no steps to execute, d=aborted';