Log Message:
-----------
Updates to pgAgent to run without OIDs. Still buggy at this point, but getting
there!
Modified Files:
--------------
pgadmin3/src:
pgAdmin3.dsp (r1.123 -> r1.124)
pgadmin3/src/agent:
dlgJob.cpp (r1.11 -> r1.12)
dlgSchedule.cpp (r1.12 -> r1.13)
dlgStep.cpp (r1.11 -> r1.12)
pgaAgent.cpp (r1.9 -> r1.10)
pgaJob.cpp (r1.9 -> r1.10)
pgaSchedule.cpp (r1.11 -> r1.12)
pgaStep.cpp (r1.10 -> r1.11)
pgadmin3/src/agent/include:
dlgJob.h (r1.7 -> r1.8)
dlgSchedule.h (r1.9 -> r1.10)
dlgStep.h (r1.8 -> r1.9)
pgaJob.h (r1.8 -> r1.9)
pgaSchedule.h (r1.8 -> r1.9)
pgaStep.h (r1.7 -> r1.8)
pgadmin3/src/include:
dlgProperty.h (r1.43 -> r1.44)
pgadmin3/src/ui:
dlgProperty.cpp (r1.111 -> r1.112)
Index: pgAdmin3.dsp
===================================================================
RCS file: /projects/pgadmin3/src/pgAdmin3.dsp,v
retrieving revision 1.123
retrieving revision 1.124
diff -Lsrc/pgAdmin3.dsp -Lsrc/pgAdmin3.dsp -u -w -r1.123 -r1.124
--- src/pgAdmin3.dsp
+++ src/pgAdmin3.dsp
@@ -45,8 +45,7 @@
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include/" /I
"c:/wxWidgets-2.5.4/include" /I "c:/wxWidgets-2.5.4/contrib/include" /I
"c:/wxWidgets-2.5.4/lib/mswd" /I "c:/postgresql/include" /D "WIN32" /D "_DEBUG"
/D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D
"__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D wxUSE_UNICODE=1 /D
"_UNICODE" /D "UNICODE" /FAcs /FR /FD /c
# SUBTRACT BASE CPP /YX /Yc /Yu
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "c:/wxWidgets-2.5.4/include" /I
"c:/wxWidgets-2.5.4/contrib/include" /I "c:/program
files/postgresql/8.0/include" /I "include/" /I "agent/include" /I
"slony/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D
"__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D
WINVER=0x0400 /D "STRICT" /D wxUSE_UNICODE=1 /D "_UNICODE" /D "UNICODE" /D
"SSL" /FAcs /Yu"pgadmin3.h" /FD /c
-# SUBTRACT CPP /Fr
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "c:/wxWidgets-2.5.4/include" /I
"c:/wxWidgets-2.5.4/contrib/include" /I "c:/program
files/postgresql/8.0/include" /I "include/" /I "agent/include" /I
"slony/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D
"__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D
WINVER=0x0400 /D "STRICT" /D wxUSE_UNICODE=1 /D "_UNICODE" /D "UNICODE" /D
"SSL" /FAcs /Fr /Yu"pgadmin3.h" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x809 /i "c:/wxWidgets-2.5.4/include" /i
"c:/wxWidgets-2.5.4/contrib/include" /d "_DEBUG"
Index: pgaSchedule.cpp
===================================================================
RCS file: /projects/pgadmin3/src/agent/pgaSchedule.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -Lsrc/agent/pgaSchedule.cpp -Lsrc/agent/pgaSchedule.cpp -u -w -r1.11 -r1.12
--- src/agent/pgaSchedule.cpp
+++ src/agent/pgaSchedule.cpp
@@ -62,7 +62,7 @@
bool pgaSchedule::DropObject(wxFrame *frame, wxTreeCtrl *browser)
{
- return GetDatabase()->ExecuteVoid(wxT("DELETE FROM
pg_admin.pga_jobschedule WHERE oid=") + GetOidStr());
+ return GetDatabase()->ExecuteVoid(wxT("DELETE FROM pgadmin.pga_jobschedule
WHERE jscid=") + NumToStr(GetId()));
}
@@ -78,7 +78,7 @@
CreateListColumns(properties);
properties->AppendItem(_("Name"), GetName());
- properties->AppendItem(_("OID"), GetOid());
+ properties->AppendItem(_("ID"), GetId());
properties->AppendItem(_("Enabled"), GetEnabled());
properties->AppendItem(_("Type"), GetKind());
if (kindChar == 'n' || kindChar == 's')
@@ -120,10 +120,10 @@
pgaSchedule *schedule=0;
pgSet *schedules= job->GetDatabase()->ExecuteSet(
- wxT("SELECT sc.oid, * FROM pg_admin.pga_schedule sc\n")
- wxT(" WHERE sc.jscjoboid=") + job->GetOidStr() + wxT("\n")
+ wxT("SELECT * FROM pgadmin.pga_schedule\n")
+ wxT(" WHERE jscjobid=") + NumToStr(job->GetId()) + wxT("\n")
+ restriction +
- wxT(" ORDER BY sc.oid"));
+ wxT(" ORDER BY jscid"));
if (schedules)
{
@@ -131,7 +131,7 @@
{
schedule = new pgaSchedule(job, schedules->GetVal(wxT("jscname")));
- schedule->iSetOid(schedules->GetOid(wxT("oid")));
+ schedule->iSetId(schedules->GetLong(wxT("jscid")));
schedule->iSetDatabase(job->GetDatabase());
schedule->iSetStart(schedules->GetDateTime(wxT("jscstart")));
schedule->iSetEnd(schedules->GetDateTime(wxT("jscend")));
Index: dlgStep.cpp
===================================================================
RCS file: /projects/pgadmin3/src/agent/dlgStep.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -Lsrc/agent/dlgStep.cpp -Lsrc/agent/dlgStep.cpp -u -w -r1.11 -r1.12
--- src/agent/dlgStep.cpp
+++ src/agent/dlgStep.cpp
@@ -32,7 +32,7 @@
#define CTL_SQLBOX 188
-BEGIN_EVENT_TABLE(dlgStep, dlgOidProperty)
+BEGIN_EVENT_TABLE(dlgStep, dlgAgentProperty)
EVT_CHECKBOX(XRCID("chkEnabled"), dlgProperty::OnChange)
EVT_COMBOBOX(XRCID("cbDatabase"), dlgProperty::OnChange)
EVT_RADIOBOX(XRCID("rbxKind"), dlgProperty::OnChange)
@@ -42,16 +42,16 @@
dlgStep::dlgStep(frmMain *frame, pgaStep *node, pgaJob *j)
-: dlgOidProperty(frame, wxT("dlgStep"))
+: dlgAgentProperty(frame, wxT("dlgStep"))
{
SetIcon(wxIcon(step_xpm));
objectType=PGA_STEP;
step=node;
job=j;
if (job)
- jobOid=job->GetOid();
+ jobId=job->GetId();
else
- jobOid=0;
+ jobId=0;
sqlBox=new ctlSQLBox(pnlDefinition, CTL_SQLBOX, wxDefaultPosition,
wxDefaultSize, wxTE_MULTILINE | wxSUNKEN_BORDER | wxTE_RICH2);
@@ -112,7 +112,7 @@
{
wxString name=GetName();
- pgObject *obj=pgaStep::ReadObjects(job, 0, wxT(" AND st.oid=") +
NumToStr(oid) + wxT("\n"));
+ pgObject *obj=pgaStep::ReadObjects(job, 0, wxT(" AND jstid=") +
NumToStr(id) + wxT("\n"));
return obj;
}
@@ -159,19 +159,19 @@
wxString kind = wxT("sb")[rbxKind->GetSelection()];
wxString onerror = wxT("fsi")[rbxOnError->GetSelection()];
wxString db;
- wxString jstjoboid;
- if (jobOid)
- jstjoboid = NumToStr(jobOid);
+ wxString jstjobid;
+ if (jobId)
+ jstjobid = NumToStr(jobId);
else
- jstjoboid = wxT("<Oid>");
+ jstjobid = wxT("<id>");
if (!cbDatabase->GetSelection())
db = wxT("NULL");
else
- db = wxT(" oid FROM pg_database WHERE datname=") +
qtString(cbDatabase->GetValue());
+ db = qtString(cbDatabase->GetValue());
- sql = wxT("INSERT INTO pg_admin.pga_jobstep (jstjoboid, jstname,
jstdesc, jstenabled, jstkind, jstonerror, jstcode, jstdboid)\n")
- wxT("SELECT ") + jstjoboid + wxT(", ") + qtString(name) + wxT(",
") + qtString(txtComment->GetValue()) + wxT(", ")
+ sql = wxT("INSERT INTO pgadmin.pga_jobstep (jstjobid, jstname,
jstdesc, jstenabled, jstkind, jstonerror, jstcode, jstdbname)\n")
+ wxT("SELECT ") + jstjobid + wxT(", ") + qtString(name) + wxT(",
") + qtString(txtComment->GetValue()) + wxT(", ")
+ BoolToStr(chkEnabled->GetValue()) + wxT(", ") +
qtString(kind) + wxT(", ")
+ qtString(onerror) + wxT(", ") + qtString(sqlBox->GetText())
+ wxT(", ") + db;
}
@@ -208,9 +208,9 @@
vars.Append(wxT(", "));
if (!cbDatabase->GetSelection())
- vars.Append(wxT("jstdatoid=NULL"));
+ vars.Append(wxT("jstdbname=NULL"));
else
- vars.Append(wxT("jstdboid=(SELECT oid FROM pg_database WHERE
datname=") + qtString(cbDatabase->GetValue()) + wxT(")"));
+ vars.Append(wxT("jstdbname=") +
qtString(cbDatabase->GetValue()) + wxT(")"));
}
if (rbxKind->GetSelection() !=
wxString(wxT("sb")).Find(step->GetKindChar()))
{
@@ -230,7 +230,7 @@
{
if (!vars.IsEmpty())
vars.Append(wxT(", "));
- vars.Append(wxT("jstdescr=") + qtString(txtComment->GetValue()));
+ vars.Append(wxT("jstdesc=") + qtString(txtComment->GetValue()));
}
if (sqlBox->GetText() != step->GetCode())
{
@@ -242,9 +242,9 @@
}
if (!vars.IsEmpty())
- sql = wxT("UPDATE pg_admin.pga_jobstep\n")
+ sql = wxT("UPDATE pgadmin.pga_jobstep\n")
wxT(" SET ") + vars + wxT("\n")
- wxT(" WHERE oid=") + step->GetOidStr();
+ wxT(" WHERE jstid=") + NumToStr(step->GetId());
}
else
{
Index: pgaStep.cpp
===================================================================
RCS file: /projects/pgadmin3/src/agent/pgaStep.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lsrc/agent/pgaStep.cpp -Lsrc/agent/pgaStep.cpp -u -w -r1.10 -r1.11
--- src/agent/pgaStep.cpp
+++ src/agent/pgaStep.cpp
@@ -37,7 +37,7 @@
bool pgaStep::DropObject(wxFrame *frame, wxTreeCtrl *browser)
{
- return GetDatabase()->ExecuteVoid(wxT("DELETE FROM pg_admin.pga_jobstep
WHERE oid=") + GetOidStr());
+ return GetDatabase()->ExecuteVoid(wxT("DELETE FROM pgadmin.pga_jobstep
WHERE jstid=") + NumToStr(GetId()));
}
@@ -53,7 +53,7 @@
CreateListColumns(properties);
properties->AppendItem(_("Name"), GetName());
- properties->AppendItem(_("OID"), GetOid());
+ properties->AppendItem(_("ID"), GetId());
properties->AppendItem(_("Enabled"), GetEnabled());
properties->AppendItem(_("Kind"), GetKind());
properties->AppendItem(_("Database"), GetDbname());
@@ -86,11 +86,10 @@
pgaStep *step=0;
pgSet *steps= job->GetDatabase()->ExecuteSet(
- wxT("SELECT st.oid, st.*, datname FROM pg_admin.pga_jobstep st\n")
- wxT(" LEFT OUTER JOIN pg_database db ON db.oid=st.jstdboid")
- wxT(" WHERE st.jstjoboid=") + job->GetOidStr() + wxT("\n")
+ wxT("SELECT * FROM pgadmin.pga_jobstep\n")
+ wxT(" WHERE jstjobid=") + NumToStr(job->GetId()) + wxT("\n")
+ restriction +
- wxT(" ORDER BY st.oid"));
+ wxT(" ORDER BY jstid"));
if (steps)
{
@@ -98,9 +97,9 @@
{
step = new pgaStep(job, steps->GetVal(wxT("jstname")));
- step->iSetOid(steps->GetOid(wxT("oid")));
+ step->iSetId(steps->GetLong(wxT("jstid")));
step->iSetDatabase(job->GetDatabase());
- step->iSetDbname(steps->GetVal(wxT("datname")));
+ step->iSetDbname(steps->GetVal(wxT("jstdbname")));
step->iSetCode(steps->GetVal(wxT("jstcode")));
step->iSetEnabled(steps->GetBool(wxT("jstenabled")));
Index: pgaJob.cpp
===================================================================
RCS file: /projects/pgadmin3/src/agent/pgaJob.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lsrc/agent/pgaJob.cpp -Lsrc/agent/pgaJob.cpp -u -w -r1.9 -r1.10
--- src/agent/pgaJob.cpp
+++ src/agent/pgaJob.cpp
@@ -49,7 +49,7 @@
bool pgaJob::DropObject(wxFrame *frame, wxTreeCtrl *browser)
{
- return GetDatabase()->ExecuteVoid(wxT("DELETE FROM pg_admin.pga_job WHERE
oid=") + GetOidStr());
+ return GetDatabase()->ExecuteVoid(wxT("DELETE FROM pgadmin.pga_job WHERE
jobid=") + NumToStr(GetId()));
}
@@ -73,7 +73,7 @@
CreateListColumns(properties);
properties->AppendItem(_("Name"), GetName());
- properties->AppendItem(_("OID"), GetOid());
+ properties->AppendItem(_("ID"), GetId());
properties->AppendItem(_("Enabled"), GetEnabled());
properties->AppendItem(_("Job class"), GetJobclass());
properties->AppendItem(_("Created"), GetCreated());
@@ -110,8 +110,8 @@
pgaJob *job=0;
pgSet *jobs= agent->GetDatabase()->ExecuteSet(
- wxT("SELECT j.oid, *, ''::text AS joblastresult FROM pg_admin.pga_job
j\n")
- wxT(" JOIN pg_admin.pga_jobclass cl ON cl.oid=jobjcloid\n")
+ wxT("SELECT *, ''::text AS joblastresult FROM pgadmin.pga_job j\n")
+ wxT(" JOIN pgadmin.pga_jobclass cl ON cl.jclid=jobjclid\n")
+ restriction +
wxT(" ORDER BY jobname"));
@@ -121,7 +121,7 @@
{
job = new pgaJob(jobs->GetVal(wxT("jobname")));
- job->iSetOid(jobs->GetOid(wxT("oid")));
+ job->iSetId(jobs->GetLong(wxT("jobid")));
job->iSetDatabase(agent->GetDatabase());
job->iSetComment(jobs->GetVal(wxT("jobdesc")));
Index: dlgSchedule.cpp
===================================================================
RCS file: /projects/pgadmin3/src/agent/dlgSchedule.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -Lsrc/agent/dlgSchedule.cpp -Lsrc/agent/dlgSchedule.cpp -u -w -r1.12 -r1.13
--- src/agent/dlgSchedule.cpp
+++ src/agent/dlgSchedule.cpp
@@ -41,7 +41,7 @@
#define btnRemoveInterval CTRL_BUTTON("btnRemoveInterval")
-BEGIN_EVENT_TABLE(dlgSchedule, dlgOidProperty)
+BEGIN_EVENT_TABLE(dlgSchedule, dlgAgentProperty)
EVT_CHECKBOX(XRCID("chkEnabled"), dlgProperty::OnChange)
EVT_COMBOBOX(XRCID("cbKind"), dlgSchedule::OnChangeKind)
EVT_SPIN(XRCID("timInterval"), dlgSchedule::OnChangeSpin)
@@ -59,16 +59,16 @@
dlgSchedule::dlgSchedule(frmMain *frame, pgaSchedule *node, pgaJob *j)
-: dlgOidProperty(frame, wxT("dlgSchedule"))
+: dlgAgentProperty(frame, wxT("dlgSchedule"))
{
SetIcon(wxIcon(schedule_xpm));
objectType=PGA_SCHEDULE;
schedule=node;
job=j;
if (job)
- jobOid=job->GetOid();
+ jobId=job->GetId();
else
- jobOid=0;
+ jobId=0;
timInterval->SetMax(365*24*60*60 -1, true);
@@ -119,7 +119,7 @@
{
wxString name=GetName();
- pgObject *obj=pgaSchedule::ReadObjects(job, 0, wxT(" AND sc.oid=") +
NumToStr(oid) + wxT("\n"));
+ pgObject *obj=pgaSchedule::ReadObjects(job, 0, wxT(" AND jscid=") +
NumToStr(id) + wxT("\n"));
return obj;
}
@@ -234,14 +234,14 @@
{
wxString name=GetName();
wxString kind = wxT("nsdwmy")[cbKind->GetSelection()];
- wxString jscjoboid, list=wxT("NULL");
- if (jobOid)
- jscjoboid = NumToStr(jobOid);
+ wxString jscjobid, list=wxT("NULL");
+ if (jobId)
+ jscjobid = NumToStr(jobId);
else
- jscjoboid = wxT("<Oid>");
- sql = wxT("INSERT INTO pg_admin.pga_jobschedule (jscjoboid, jscname,
jscdesc, jscenabled, jsckind, ")
+ jscjobid = wxT("<id>");
+ sql = wxT("INSERT INTO pgadmin.pga_jobschedule (jscjobid, jscname,
jscdesc, jscenabled, jsckind, ")
wxT("jscstart, jscend, jscschedule, jsclist)\n")
- wxT("VALUES(") + jscjoboid + wxT(", ") + qtString(name) + wxT(",
") + qtString(txtComment->GetValue()) + wxT(", ")
+ wxT("VALUES(") + jscjobid + wxT(", ") + qtString(name) + wxT(",
") + qtString(txtComment->GetValue()) + wxT(", ")
+ BoolToStr(chkEnabled->GetValue()) + wxT(", ") +
qtString(kind) + wxT(", ")
+ DateToAnsiStr(calStart->GetDate() + timStart->GetValue()) +
wxT(", ")
+ DateToAnsiStr(calEnd->GetDate() + timEnd->GetValue()) +
wxT(", ")
Index: pgaAgent.cpp
===================================================================
RCS file: /projects/pgadmin3/src/agent/pgaAgent.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lsrc/agent/pgaAgent.cpp -Lsrc/agent/pgaAgent.cpp -u -w -r1.9 -r1.10
--- src/agent/pgaAgent.cpp
+++ src/agent/pgaAgent.cpp
@@ -68,8 +68,8 @@
pgSet *props = GetDatabase()->ExecuteSet(
wxT("SELECT station, jagpid, logintime, jobname\n")
- wxT(" FROM pg_admin.pga_jobagent\n")
- wxT(" JOIN pg_admin.pga_job ON jobagentid=jagpid\n")
+ wxT(" FROM pgadmin.pga_jobagent\n")
+ wxT(" JOIN pgadmin.pga_job ON jobagentid=jagpid\n")
wxT(" ORDER BY jagpid"));
if (props)
@@ -112,7 +112,7 @@
wxString exists = database->ExecuteScalar(
wxT("SELECT cl.oid FROM pg_class cl JOIN pg_namespace ns ON
ns.oid=relnamespace\n")
- wxT(" WHERE relname='pga_job' AND nspname='pg_admin'"));
+ wxT(" WHERE relname='pga_job' AND nspname='pgadmin'"));
if (!exists.IsNull())
{
Index: dlgJob.cpp
===================================================================
RCS file: /projects/pgadmin3/src/agent/dlgJob.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -Lsrc/agent/dlgJob.cpp -Lsrc/agent/dlgJob.cpp -u -w -r1.11 -r1.12
--- src/agent/dlgJob.cpp
+++ src/agent/dlgJob.cpp
@@ -47,7 +47,7 @@
#define btnRemoveSchedule CTRL_BUTTON("btnRemoveSchedule")
-BEGIN_EVENT_TABLE(dlgJob, dlgOidProperty)
+BEGIN_EVENT_TABLE(dlgJob, dlgAgentProperty)
EVT_CHECKBOX(XRCID("chkEnabled"), dlgProperty::OnChange)
EVT_COMBOBOX(XRCID("cbJobclass"), dlgProperty::OnChange)
@@ -64,7 +64,7 @@
dlgJob::dlgJob(frmMain *frame, pgaJob *node)
-: dlgOidProperty(frame, wxT("dlgJob"))
+: dlgAgentProperty(frame, wxT("dlgJob"))
{
SetIcon(wxIcon(job_xpm));
job=node;
@@ -76,11 +76,11 @@
txtLastresult->Disable();
lstSteps->CreateColumns(frame, _("Step"), _("Definition"), 90);
lstSteps->AddColumn(wxT("cmd"), 0);
- lstSteps->AddColumn(wxT("oid"), 0);
+ lstSteps->AddColumn(wxT("id"), 0);
lstSchedules->CreateColumns(frame, _("Schedule"), _("Definition"), 90);
lstSchedules->AddColumn(wxT("cmd"), 0);
- lstSchedules->AddColumn(wxT("oid"), 0);
+ lstSchedules->AddColumn(wxT("id"), 0);
btnChangeStep->Disable();
btnRemoveStep->Disable();
btnChangeSchedule->Disable();
@@ -96,7 +96,7 @@
int dlgJob::Go(bool modal)
{
- pgSet *jcl=connection->ExecuteSet(wxT("SELECT jclname FROM
pg_admin.pga_jobclass"));
+ pgSet *jcl=connection->ExecuteSet(wxT("SELECT jclname FROM
pgadmin.pga_jobclass"));
if (jcl)
{
while (!jcl->Eof())
@@ -118,7 +118,6 @@
txtLastrun->SetValue(DateToStr(job->GetLastrun()));
txtLastresult->SetValue(job->GetLastresult());
-
wxCookieType cookie;
pgObject *data=0;
wxTreeItemId item=mainForm->GetBrowser()->GetFirstChild(job->GetId(),
cookie);
@@ -157,7 +156,7 @@
pgObject *dlgJob::CreateObject(pgCollection *collection)
{
- pgObject *obj=pgaJob::ReadObjects((pgaAgent*)collection, 0, wxT(" AND
j.oid=") + NumToStr(oid) + wxT("\n"));
+ pgObject *obj=pgaJob::ReadObjects((pgaAgent*)collection, 0, wxT(" AND
jobid=") + NumToStr(id) + wxT("\n"));
return obj;
}
@@ -304,10 +303,10 @@
if (!job)
{
- sql = wxT("INSERT INTO pg_admin.pga_job (jobjcloid, jobname, jobdesc,
jobenabled)\n")
- wxT("SELECT jcl.oid, ") + qtString(GetName()) +
+ sql = wxT("INSERT INTO pgadmin.pga_job (jobid, jobjclid, jobname,
jobdesc, jobenabled)\n")
+ wxT("SELECT <id>, jcl.jclid, ") + qtString(GetName()) +
wxT(", ") + qtString(txtComment->GetValue()) + wxT(", ") +
BoolToStr(chkEnabled->GetValue()) + wxT("\n")
- wxT(" FROM pg_admin.pga_jobclass jcl WHERE jclname=") +
qtString(cbJobclass->GetValue());
+ wxT(" FROM pgadmin.pga_jobclass jcl WHERE jclname=") +
qtString(cbJobclass->GetValue());
}
return sql;
}
@@ -333,7 +332,7 @@
{
if (!vars.IsEmpty())
vars.Append(wxT(", "));
- vars.Append(wxT("jobjcloid= (SELECT oid FROM pg_admin.pga_jobclass
WHERE jclname=") + qtString(cbJobclass->GetValue()) + wxT(")"));
+ vars.Append(wxT("jobjclid= (SELECT jclid FROM pgadmin.pga_jobclass
WHERE jclname=") + qtString(cbJobclass->GetValue()) + wxT(")"));
}
if (chkEnabled->GetValue() != job->GetEnabled())
{
@@ -345,12 +344,12 @@
{
if (!vars.IsEmpty())
vars.Append(wxT(", "));
- vars.Append(wxT("jobdesc = ") + qtString(job->GetComment()));
+ vars.Append(wxT("jobdesc = ") + qtString(txtComment->GetValue()));
}
if (!vars.IsEmpty())
- sql = wxT("UPDATE pg_admin.pga_job SET ") + vars + wxT("\n")
- wxT(" WHERE oid=") + job->GetOidStr();
+ sql = wxT("UPDATE pgadmin.pga_job SET ") + vars + wxT("\n")
+ wxT(" WHERE jobid=") + NumToStr(job->GetId());
}
else
@@ -378,8 +377,8 @@
for (index = 0 ; index < (int)tmpSteps.GetCount() ; index++)
{
- sql += wxT("DELETE FROM pg_admin.pga_jobstep WHERE oid=")
- + ((pgaStep*)StrToLong(tmpSteps.Item(index)))->GetOidStr() +
wxT(";\n");
+ sql += wxT("DELETE FROM pgadmin.pga_jobstep WHERE jobid=")
+ + NumToStr(((pgaStep*)StrToLong(tmpSteps.Item(index)))->GetId()) +
wxT(";\n");
}
wxArrayString tmpSchedules = previousSchedules;
@@ -399,11 +398,12 @@
for (index = 0 ; index < (int)tmpSchedules.GetCount() ; index++)
{
- sql += wxT("DELETE FROM pg_admin.pga_jobschedule WHERE oid=")
- + ((pgaStep*)StrToLong(tmpSchedules.Item(index)))->GetOidStr() +
wxT(";\n");
+ sql += wxT("DELETE FROM pgadmin.pga_jobschedule WHERE jobid=")
+ +
NumToStr(((pgaStep*)StrToLong(tmpSchedules.Item(index)))->GetId()) + wxT(";\n");
}
return sql;
+
}
Index: pgaStep.h
===================================================================
RCS file: /projects/pgadmin3/src/agent/include/pgaStep.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lsrc/agent/include/pgaStep.h -Lsrc/agent/include/pgaStep.h -u -w -r1.7
-r1.8
--- src/agent/include/pgaStep.h
+++ src/agent/include/pgaStep.h
@@ -50,11 +50,14 @@
void iSetOnError(const wxString &s) { onError=s; }
wxChar GetOnErrorChar() const { return onErrorChar; }
void iSetOnErrorChar(const wxChar c) { onErrorChar = c; }
+ long GetId() const { return id; }
+ void iSetId(const long l) { id=l; }
private:
bool enabled;
wxString kind, code, dbname, onError;
wxChar kindChar, onErrorChar;
+ long id;
};
#endif
Index: pgaSchedule.h
===================================================================
RCS file: /projects/pgadmin3/src/agent/include/pgaSchedule.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -Lsrc/agent/include/pgaSchedule.h -Lsrc/agent/include/pgaSchedule.h -u -w
-r1.8 -r1.9
--- src/agent/include/pgaSchedule.h
+++ src/agent/include/pgaSchedule.h
@@ -53,6 +53,8 @@
wxString GetIntervalListString() const { return intervalListString; }
void iSetIntervalList(const wxString &s);
wxArrayTimeSpan GetIntervalList() const { return intervalList; }
+ long GetId() const { return id; }
+ void iSetId(const long l) { id=l; }
private:
bool enabled;
@@ -60,6 +62,7 @@
wxArrayTimeSpan intervalList;
wxDateTime start, end, schedule;
wxChar kindChar;
+ long id;
};
#endif
Index: dlgStep.h
===================================================================
RCS file: /projects/pgadmin3/src/agent/include/dlgStep.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -Lsrc/agent/include/dlgStep.h -Lsrc/agent/include/dlgStep.h -u -w -r1.8
-r1.9
--- src/agent/include/dlgStep.h
+++ src/agent/include/dlgStep.h
@@ -18,7 +18,7 @@
class pgaStep;
class pgaJob;
-class dlgStep : public dlgOidProperty
+class dlgStep : public dlgAgentProperty
{
public:
dlgStep(frmMain *frame, pgaStep *s, pgaJob *j);
@@ -31,10 +31,10 @@
wxString GetComment();
pgObject *CreateObject(pgCollection *collection);
pgObject *GetObject();
- void SetJobOid(OID oid) { jobOid = oid; }
+ void SetJobId(long id) { jobId = id; }
private:
- OID jobOid;
+ long jobId;
ctlSQLBox *sqlBox;
pgaStep *step;
pgaJob *job;
Index: dlgJob.h
===================================================================
RCS file: /projects/pgadmin3/src/agent/include/dlgJob.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lsrc/agent/include/dlgJob.h -Lsrc/agent/include/dlgJob.h -u -w -r1.7 -r1.8
--- src/agent/include/dlgJob.h
+++ src/agent/include/dlgJob.h
@@ -17,7 +17,7 @@
class pgaJob;
-class dlgJob : public dlgOidProperty
+class dlgJob : public dlgAgentProperty
{
public:
dlgJob(frmMain *frame, pgaJob *j);
Index: dlgSchedule.h
===================================================================
RCS file: /projects/pgadmin3/src/agent/include/dlgSchedule.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lsrc/agent/include/dlgSchedule.h -Lsrc/agent/include/dlgSchedule.h -u -w
-r1.9 -r1.10
--- src/agent/include/dlgSchedule.h
+++ src/agent/include/dlgSchedule.h
@@ -20,7 +20,7 @@
class pgaSchedule;
class pgaJob;
-class dlgSchedule : public dlgOidProperty
+class dlgSchedule : public dlgAgentProperty
{
public:
dlgSchedule(frmMain *frame, pgaSchedule *s, pgaJob *j);
@@ -33,10 +33,10 @@
wxString GetInsertSql();
pgObject *CreateObject(pgCollection *collection);
pgObject *GetObject();
- void SetJobOid(OID oid) { jobOid = oid; }
+ void SetJobId(long id) { jobId = id; }
private:
- OID jobOid;
+ long jobId;
pgaSchedule *schedule;
pgaJob *job;
Index: pgaJob.h
===================================================================
RCS file: /projects/pgadmin3/src/agent/include/pgaJob.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -Lsrc/agent/include/pgaJob.h -Lsrc/agent/include/pgaJob.h -u -w -r1.8 -r1.9
--- src/agent/include/pgaJob.h
+++ src/agent/include/pgaJob.h
@@ -51,6 +51,8 @@
void iSetLastresult(const wxString &s) { lastresult = s; }
long GetAgentId() const { return agentId; }
void iSetAgentId(const long l) { agentId=l; }
+ long GetId() const { return id; }
+ void iSetId(const long l) { id=l; }
wxMenu *GetNewMenu();
bool CanCreate() { return true; }
@@ -63,7 +65,7 @@
bool enabled;
wxDateTime created, changed, nextrun, lastrun;
wxString lastresult, jobclass;
- long agentId;
+ long agentId, id;
};
@@ -71,7 +73,7 @@
{
public:
pgaJobObject(pgaJob *job, int newType, const wxString& newName);
- OID GetJoboid() const { return job->GetOid(); }
+ long GetJobId() const { return job->GetId(); }
pgaJob *GetJob() { return job; }
bool CanCreate() { return job->CanCreate(); }
Index: dlgProperty.h
===================================================================
RCS file: /projects/pgadmin3/src/include/dlgProperty.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -Lsrc/include/dlgProperty.h -Lsrc/include/dlgProperty.h -u -w -r1.43 -r1.44
--- src/include/dlgProperty.h
+++ src/include/dlgProperty.h
@@ -181,12 +181,12 @@
-class dlgOidProperty : public dlgProperty
+class dlgAgentProperty : public dlgProperty
{
public:
protected:
- dlgOidProperty(frmMain *frame, const wxString &resName);
+ dlgAgentProperty(frmMain *frame, const wxString &resName);
void OnOK(wxCommandEvent &ev);
bool executeSql();
virtual wxString GetInsertSql() =0;
@@ -195,7 +195,7 @@
DECLARE_EVENT_TABLE();
- OID oid;
+ long id;
};
Index: dlgProperty.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgProperty.cpp,v
retrieving revision 1.111
retrieving revision 1.112
diff -Lsrc/ui/dlgProperty.cpp -Lsrc/ui/dlgProperty.cpp -u -w -r1.111 -r1.112
--- src/ui/dlgProperty.cpp
+++ src/ui/dlgProperty.cpp
@@ -1274,18 +1274,18 @@
/////////////////////////////////////////////////////////////////////////////
-BEGIN_EVENT_TABLE(dlgOidProperty, dlgProperty)
- EVT_BUTTON (wxID_OK, dlgOidProperty::OnOK)
+BEGIN_EVENT_TABLE(dlgAgentProperty, dlgProperty)
+ EVT_BUTTON (wxID_OK, dlgAgentProperty::OnOK)
END_EVENT_TABLE();
-dlgOidProperty::dlgOidProperty(frmMain *frame, const wxString &resName)
+dlgAgentProperty::dlgAgentProperty(frmMain *frame, const wxString &resName)
: dlgProperty(frame, resName)
{
- oid=0;
+ id=0;
}
-wxString dlgOidProperty::GetSql()
+wxString dlgAgentProperty::GetSql()
{
wxString str=GetInsertSql();
if (!str.IsEmpty())
@@ -1295,7 +1295,7 @@
-bool dlgOidProperty::executeSql()
+bool dlgAgentProperty::executeSql()
{
wxString sql;
bool dataChanged=false;
@@ -1303,13 +1303,23 @@
sql=GetInsertSql();
if (!sql.IsEmpty())
{
+ // We should only need to get an ID if inserting a new Job
+ if (sql.Contains(wxT("<id>")) && sql.StartsWith(wxT("INSERT
INTO pgadmin.pga_job")))
+ {
+
+ id=StrToLong(connection->ExecuteScalar(wxT("SELECT
nextval('pgadmin.pga_job_jobid_seq');")));
+
+ int pos;
+ while ((pos=sql.Find(wxT("<id>"))) >= 0)
+ sql = sql.Left(pos) + NumToStr(id) + sql.Mid(pos+4);
+ }
+
pgSet *set=connection->ExecuteSet(sql);
if (set)
{
- oid = set->GetInsertedOid();
delete set;
}
- if (!set || !oid)
+ if (!set)
{
return false;
}
@@ -1320,8 +1330,8 @@
if (!sql.IsEmpty())
{
int pos;
- while ((pos=sql.Find(wxT("<Oid>"))) >= 0)
- sql = sql.Left(pos) + NumToStr(oid) + wxT("::oid") +
sql.Mid(pos+5);
+ while ((pos=sql.Find(wxT("<id>"))) >= 0)
+ sql = sql.Left(pos) + NumToStr(id) + sql.Mid(pos+4);
if (!connection->ExecuteVoid(sql))
{
@@ -1335,7 +1345,7 @@
}
-void dlgOidProperty::OnOK(wxCommandEvent &ev)
+void dlgAgentProperty::OnOK(wxCommandEvent &ev)
{
if (IsModal())
{
---------------------------(end of broadcast)---------------------------
TIP 1: subscribe and unsubscribe commands go to [EMAIL PROTECTED]
