[1966] in Moira Commits
/svn/moira r4105 - trunk/moira/server
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Wed Apr 10 13:34:32 2013
Date: Wed, 10 Apr 2013 13:34:25 -0400
From: Garry Zacheiss <zacheiss@MIT.EDU>
Message-Id: <201304101734.r3AHYPJM000968@drugstore.mit.edu>
To: moira-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: zacheiss
Date: 2013-04-10 13:34:25 -0400 (Wed, 10 Apr 2013)
New Revision: 4105
Modified:
trunk/moira/server/queries2.c
Log:
Add missing table name in from clause.
Modified: trunk/moira/server/queries2.c
===================================================================
--- trunk/moira/server/queries2.c 2013-04-08 20:35:44 UTC (rev 4104)
+++ trunk/moira/server/queries2.c 2013-04-10 17:34:25 UTC (rev 4105)
@@ -7920,7 +7920,7 @@
MR_Q_RETRIEVE,
"pr",
PRINTERS_TABLE,
- "pr.name, pr.type, pr.hwtype, pr.duplexname, pr.duplexdefault, pr.holddefault, pr.status, m1.name, m2.name, m3.name, pr.rp, m4.name, pr.ka, pr.pc, l1.name, l2.name, l3.name, pr.banner, pr.location, pr.contact, TO_CHAR(pr.modtime, 'DD-mon-YYYY HH24:MI:SS'), pr.modby, pr.modwith FROM printers pr, machine m1, machine m2, machine m3, machine m4, list l1, list l2, list l3",
+ "pr.name, pr.type, pr.hwtype, pr.duplexname, pr.duplexdefault, pr.holddefault, pr.status, m1.name, m2.name, m3.name, pr.rp, m4.name, pr.ka, pr.pc, l1.name, l2.name, l3.name, pr.banner, pr.location, pr.contact, TO_CHAR(pr.modtime, 'DD-mon-YYYY HH24:MI:SS'), pr.modby, pr.modwith FROM printers pr, machine m1, machine m2, machine m3, machine m4, list l1, list l2, list l3, hwaddrmap hw",
gpbd_fields,
23,
"hw.hwaddr LIKE LOWER('%s') AND hw.mach_id = m1.mach_id AND m1.mach_id = pr.mach_id AND m2.mach_id = pr.loghost AND m3.mach_id = pr.rm AND m4.mach_id = pr.rq AND l1.list_id = pr.ac AND l2.list_id = pr.lpc_acl AND l3.list_id = pr.report_list",
