First pass at making the dispatch table SQL compatible.

diff --git a/server/queries2.c b/server/queries2.c
index 2a3459f414dee2402b6e61f467d17a0f27e323a1..2be55ac5055828c00ea990c21b2461204f14978b 100644 (file)
--- a/server/queries2.c
+++ b/server/queries2.c
@@ -273,7 +273,7 @@ static struct validate ausr_validate = {
   ausr_valobj,
   7,
   LOGIN,
-  "u.login = \"%s\"",
+  "users.login = \"%s\"",
   1,
   USERS_ID,
   0,
@@ -420,7 +420,7 @@ static struct validate akum_validate =
     akum_valobj,
     1,
     USERS_ID,
-    "k.users_id = %d or k.string_id = %d",
+    "kerberos.users_id = %d or kerberos.string_id = %d",
     2,
     USERS_ID,
     access_user,
@@ -433,7 +433,7 @@ static struct validate dkum_validate =
     akum_valobj,
     2,
     USERS_ID,
-    "k.users_id = %d and k.string_id = %d",
+    "kerberos.users_id = %d and kerberos.string_id = %d",
     2,
     USERS_ID,
     access_user,
@@ -488,7 +488,7 @@ static struct validate gpob_validate = {
   VOuser0,
   1,
   "potype",
-  "u.potype != \"NONE\" and u.users_id=%d",
+  "users.potype != \"NONE\" and users.users_id=%d",
   1,
   0,
   access_user,
@@ -580,7 +580,7 @@ static struct validate amac_validate = {
   amac_valobj,
   3,
   NAME,
-  "m.name = uppercase(\"%s\")",
+  "imembers.name = uppercase(\"%s\")",
   1,
   MACH_ID,
   0,
@@ -652,7 +652,7 @@ static struct validate aclu_validate =      /* for aclu  */
   aclu_valobj,
   2,
   NAME,
-  "c.name = \"%s\"",
+  "clusters.name = \"%s\"",
   1,
   "clu_id",
   0,
@@ -715,7 +715,7 @@ static struct validate amtc_validate = /* for amtc and dmfc */
   amtc_valobj,
   2,
   MACH_ID,
-  "m.mach_id = %d and m.clu_id = %d",
+  "imembers.mach_id = %d and imembers.clu_id = %d",
   2,
   0,
   0,
@@ -743,7 +743,7 @@ static struct validate acld_validate =      /* ADD_CLUSTER_DATA */
   acld_valobj,
   2,
   CLU_ID,
-  "s.clu_id = %d and s.serv_label = \"%s\" and s.serv_cluster = \"%s\"",
+  "svc.clu_id = %d and svc.serv_label = \"%s\" and svc.serv_cluster = \"%s\"",
   3,
   0,
   0,
@@ -812,7 +812,7 @@ static struct validate asin_validate =      /* for asin, usin */
   asin_valobj,
   5,
   NAME,
-  "s.name = uppercase(\"%s\")",
+  "services.name = uppercase(\"%s\")",
   1,
   0,
   0,
@@ -824,7 +824,7 @@ static struct validate rsve_validate = {
   asin_valobj,
   1,
   NAME,
-  "s.name = uppercase(\"%s\")",
+  "services.name = uppercase(\"%s\")",
   1,
   0,
   access_service,
@@ -840,7 +840,7 @@ static struct validate ssif_validate = {
   asin_valobj,
   1,
   NAME,
-  "s.name = uppercase(\"%s\")",
+  "services.name = uppercase(\"%s\")",
   1,
   0,
   0,
@@ -856,7 +856,7 @@ static struct validate dsin_validate = {
   asin_valobj,
   1,
   NAME,
-  "s.name = uppercase(\"%s\")",
+  "services.name = uppercase(\"%s\")",
   1,
   0,
   0,
@@ -923,7 +923,7 @@ static struct validate ashi_validate = /* ashi & ushi */
   ashi_valobj,
   3,
   SERVICE,
-  "sh.service = uppercase(\"%s\") and sh.mach_id = %d",
+  "serverhosts.service = uppercase(\"%s\") and serverhosts.mach_id = %d",
   2,
   0,
   access_service,
@@ -936,7 +936,7 @@ static struct validate rshe_validate =
   ashi_valobj,
   3,
   SERVICE,
-  "sh.service = uppercase(\"%s\") and sh.mach_id = %d",
+  "serverhosts.service = uppercase(\"%s\") and serverhosts.mach_id = %d",
   2,
   0,
   access_service,
@@ -949,7 +949,7 @@ static struct validate ssho_validate =
   ashi_valobj,
   3,
   SERVICE,
-  "sh.service = uppercase(\"%s\") and sh.mach_id = %d",
+  "serverhosts.service = uppercase(\"%s\") and serverhosts.mach_id = %d",
   2,
   0,
   access_service,
@@ -988,7 +988,7 @@ static struct validate dshi_validate =
   ashi_valobj,
   3,
   SERVICE,
-  "sh.service = uppercase(\"%s\") and sh.mach_id = %d",
+  "serverhosts.service = uppercase(\"%s\") and serverhosts.mach_id = %d",
   2,
   0,
   access_service,
@@ -1029,7 +1029,7 @@ static struct validate asha_validate =
   asha_valobj,
   3,
   MACH_ID,
-  "ha.mach_id = %d",
+  "hostaccess.mach_id = %d",
   1,
   MACH_ID,
   0,
@@ -1110,7 +1110,7 @@ static struct validate afil_validate = {
   afil_valobj,
   8,
   LABEL,
-  "fs.label = \"%s\"",
+  "filesys.label = \"%s\"",
   1,
   FILSYS_ID,
   0,
@@ -1139,7 +1139,7 @@ static struct validate ufil_validate = {
   ufil_valobj,
   9,
   LABEL,
-  "fs.filsys_id = %d",
+  "filesys.filsys_id = %d",
   1,
   FILSYS_ID,
   0,
@@ -1160,7 +1160,7 @@ static struct validate dfil_validate = {
   dfil_valobj,
   2,
   "label",
-  "fs.filsys_id = %d",
+  "filesys.filsys_id = %d",
   1,
   0,
   0,
@@ -1200,7 +1200,7 @@ static struct validate aftg_validate = {
     aftg_valobj,
     3,
     "group_id",
-    "fg.group_id = %d and fg.filsys_id = %d",
+    "fsgroup.group_id = %d and fsgroup.filsys_id = %d",
     2,
     0,
     0,
@@ -1238,7 +1238,7 @@ static struct validate anfp_validate = {
   anfp_valobj,
   2,
   DIR,
-  "np.mach_id = %d and np.dir = \"%s\"",
+  "nfsphys.mach_id = %d and nfsphys.dir = \"%s\"",
   2,
   "nfsphys_id",
   0,
@@ -1254,7 +1254,7 @@ static struct validate dnfp_validate = {
   VOmach0,
   1,
   DIR,
-  "np.mach_id = %d and np.dir = \"%s\"",
+  "nfsphys.mach_id = %d and nfsphys.dir = \"%s\"",
   2,
   "nfsphys_id",
   0,
@@ -1317,7 +1317,7 @@ static struct validate aqot_validate = {
   aqot_valobj,
   4,
   FILSYS_ID,
-  "q.filsys_id = %d and q.type = \"%s\" and q.entity_id = %d",
+  "quota.filsys_id = %d and quota.type = \"%s\" and quota.entity_id = %d",
   3,
   0,
   0,
@@ -1329,7 +1329,7 @@ static struct validate uqot_validate = {
   aqot_valobj,
   4,
   FILSYS_ID,
-  "q.filsys_id = %d and q.type = \"%s\" and q.entity_id = %d",
+  "quota.filsys_id = %d and quota.type = \"%s\" and quota.entity_id = %d",
   3,
   0,
   0,
@@ -1341,7 +1341,7 @@ static struct validate dqot_validate = {
   aqot_valobj,
   4,
   FILSYS_ID,
-  "q.filsys_id = %d and q.type = \"%s\" and q.entity_id = %d",
+  "quota.filsys_id = %d and quota.type = \"%s\" and quota.entity_id = %d",
   3,
   0,
   0,
@@ -1379,7 +1379,7 @@ static struct validate anfq_validate = {
   VOfilsys0user1,
   3,
   FILSYS_ID,
-  "q.filsys_id = %d and q.type = \"USER\" and q.entity_id = %d",
+  "quota.filsys_id = %d and quota.type = \"USER\" and quota.entity_id = %d",
   2,
   0,
   0,
@@ -1391,7 +1391,7 @@ static struct validate unfq_validate = {
   VOfilsys0user1,
   3,
   FILSYS_ID,
-  "q.filsys_id = %d and q.type = \"USER\" and q.entity_id = %d",
+  "quota.filsys_id = %d and quota.type = \"USER\" and quota.entity_id = %d",
   2,
   0,
   0,
@@ -1403,7 +1403,7 @@ static struct validate dnfq_validate = {
   VOfilsys0user1,
   3,
   FILSYS_ID,
-  "q.filsys_id = %d and q.entity_id = %d",
+  "quota.filsys_id = %d and quota.entity_id = %d",
   2,
   0,
   0,
@@ -1413,7 +1413,7 @@ static struct validate dnfq_validate = {
 
 static char *glin_fields[] = {
   NAME,
-  NAME, "active", "public", "hidden", "maillist", "group", "gid",
+  NAME, "active", "public", "hidden", "maillist", "isgroup", "gid",
   ACE_TYPE, ACE_NAME, DESC, MOD1, MOD2, MOD3,
 };
 
@@ -1430,7 +1430,7 @@ static struct validate glin_validate = {
 };
 
 static char *alis_fields[] = {
-  NAME, "active", "public", "hidden", "maillist", "group", "gid",
+  NAME, "active", "public", "hidden", "maillist", "isgroup", "gid",
   ACE_TYPE, ACE_NAME, DESC,
 };
 
@@ -1445,7 +1445,7 @@ static struct validate alis_validate = {
   alis_valobj,
   4,
   NAME,
-  "l.name = \"%s\"",
+  "list.name = \"%s\"",
   1,
   LIST_ID,
   0,
@@ -1455,7 +1455,7 @@ static struct validate alis_validate = {
 
 static char *ulis_fields[] = {
   NAME,
-  "newname", "active", "public", "hidden", "maillist", "group", "gid",
+  "newname", "active", "public", "hidden", "maillist", "isgroup", "gid",
   ACE_TYPE, ACE_NAME, DESC,
 };
 
@@ -1471,7 +1471,7 @@ static struct validate ulis_validate = {
   ulis_valobj,
   5,
   NAME,
-  "l.list_id = %d",
+  "list.list_id = %d",
   1,
   LIST_ID,
   access_list,
@@ -1487,7 +1487,7 @@ static struct validate dlis_validate = {
   VOlist0,
   1,
   NAME,
-  "l.list_id = %d",
+  "list.list_id = %d",
   1,
   0,
   access_list,
@@ -1555,7 +1555,7 @@ static struct validate gaus_validate = {
 };
 
 static char *qgli_fields[] = {
-    "active", "public", "hidden", "maillist", "group",
+    "active", "public", "hidden", "maillist", "isgroup",
     "list",
 };
 
@@ -1598,7 +1598,7 @@ static struct validate gmol_validate = {
 
 static char *glom_fields[] = {
   "member_type", "member_name",
-  "list_name", "active", "public", "hidden", "maillist", "group",
+  "list_name", "active", "public", "hidden", "maillist", "isgroup",
 };
 
 static struct valobj glom_valobj[] = {
@@ -1673,9 +1673,9 @@ static struct valobj azcl_valobj[] = {
 
 static struct validate azcl_validate = {
   azcl_valobj,
-  8,
+  9,
   CLASS,
-  "z.class = \"%s\"",
+  "zephyr.class = \"%s\"",
   1,
   0,
   0,
@@ -1704,7 +1704,7 @@ static struct validate uzcl_validate = {
   uzcl_valobj,
   9,
   CLASS,
-  "z.class = \"%s\"",
+  "zephyr.class = \"%s\"",
   1,
   0,
   0,
@@ -1716,7 +1716,7 @@ static struct validate dzcl_validate = {
   0,
   0,
   CLASS,
-  "z.class = \"%s\"",
+  "zephyr.class = \"%s\"",
   1,
   0,
   0,
@@ -1737,7 +1737,7 @@ static struct validate asvc_validate = {
   VOchar0,
   1,
   NAME,
-  "s.name = \"%s\"",
+  "services.name = \"%s\"",
   1,
   0,
   0,
@@ -1780,7 +1780,7 @@ static struct validate apce_validate = {
   apce_valobj,
   3,
   NAME,
-  "p.name = \"%s\"",
+  "printcap.name = \"%s\"",
   1,
   0,
   0,
@@ -1792,7 +1792,7 @@ static struct validate dpce_validate = {
   0,
   0,
   NAME,
-  "p.name = \"%s\"",
+  "printcap.name = \"%s\"",
   1,
   0,
   0,
@@ -1824,7 +1824,7 @@ static struct validate apdm_validate = {
   apdm_valobj,
   2,
   NAME,
-  "p.name = \"%s\"",
+  "palladium.name = \"%s\"",
   1,
   0,
   0,
@@ -1836,7 +1836,7 @@ static struct validate dpdm_validate = {
   0,
   0,
   NAME,
-  "p.name = \"%s\"",
+  "palladium.name = \"%s\"",
   1,
   0,
   0,
@@ -1863,7 +1863,7 @@ static struct validate aali_validate = {
   aali_valobj,
   3,
   "trans",
-  "a.name = \"%s\" and a.type = \"%s\" and a.trans = \"%s\"",
+  "alias.name = \"%s\" and alias.type = \"%s\" and alias.trans = \"%s\"",
   3,
   0,
   0,
@@ -1876,7 +1876,7 @@ static struct validate dali_validate =    /* DELETE_ALIAS */
   0,
   0,
   "trans",
-  "a.name = \"%s\" and a.type = \"%s\" and a.trans = \"%s\"",
+  "alias.name = \"%s\" and alias.type = \"%s\" and alias.trans = \"%s\"",
   3,
   0,
   0,
@@ -1889,7 +1889,7 @@ static char *gval_fields[] = {
 };
 
 static struct valobj gval_valobj[] = {
-  {V_NAME, 0, "values", NAME, 0, MR_NO_MATCH},
+  {V_NAME, 0, "values_tbl", NAME, 0, MR_NO_MATCH},
 };
 
 static struct validate gval_validate = {
@@ -1913,7 +1913,7 @@ static struct validate aval_validate =    /* for aval, uval, and dval */
   VOchar0,
   1,
   NAME,
-  "v.name = \"%s\"",
+  "values_tbl.name = \"%s\"",
   1,
   0,
   0,
@@ -1926,7 +1926,7 @@ static char *dval_fields[] = {
 };
 
 static char *gats_fields[] = {
-  "table", "retrieves", "appends", "updates", "deletes", MOD1, MOD2, MOD3,
+  "tbl", "retrieves", "appends", "updates", "deletes", MOD1, MOD2, MOD3,
 };
 
 
@@ -1941,7 +1941,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "u",
     USERS,
-    "%c = u.login, %c = text(u.uid), %c = u.shell, %c = u.last, %c = u.first, %c = u.middle",
+    "u.login, text(u.uid), u.shell, u.last, u.first, u.middle",
     galo_fields,
     6,
     "u.users_id != 0",
@@ -1956,7 +1956,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "u",
     USERS,
-    "%c = u.login, %c = text(u.uid), %c = u.shell, %c = u.last, %c = u.first, %c = u.middle",
+    "u.login, text(u.uid), u.shell, u.last, u.first, u.middle",
     galo_fields,
     6,
     "u.status = 1",
@@ -1971,10 +1971,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "u",
     USERS,
-    "%c = u.login, %c = text(u.uid), %c = u.shell, %c = u.last, %c = u.first, %c = u.middle, %c = text(u.status), %c = u.mit_id, %c = u.mit_year, %c = u.modtime, %c = text(u.modby), %c = u.modwith",
+    "u.login, text(u.uid), u.shell, u.last, u.first, u.middle, text(u.status), u.mit_id, u.mit_year, u.modtime, text(u.modby), u.modwith",
     gubl_fields,
     12,
-    "u.login = \"%s\" and u.users_id != 0",
+    "u.login = '%s' and u.users_id != 0",
     1,
     &gubx_validate,
   },
@@ -1986,7 +1986,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "u",
     USERS,
-    "%c = u.login, %c = text(u.uid), %c = u.shell, %c = u.last, %c = u.first, %c = u.middle, %c = text(u.status), %c = u.mit_id, %c = u.mit_year, %c = u.modtime, %c = text(u.modby), %c = u.modwith",
+    "u.login, text(u.uid), u.shell, u.last, u.first, u.middle, text(u.status), u.mit_id, u.mit_year, u.modtime, text(u.modby), u.modwith",
     gubu_fields,
     12,
     "u.uid = %s and u.users_id != 0",
@@ -2001,10 +2001,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "u",
     USERS,
-    "%c = u.login, %c = text(u.uid), %c = u.shell, %c = u.last, %c = u.first, %c = u.middle, %c = text(u.status), %c = u.mit_id, %c = u.mit_year, %c = u.modtime, %c = text(u.modby), %c = u.modwith",
+    "u.login, text(u.uid), u.shell, u.last, u.first, u.middle, text(u.status), u.mit_id, u.mit_year, u.modtime, text(u.modby), u.modwith",
     gubn_fields,
     12,
-    "u.first = \"%s\" and u.last = \"%s\" and u.users_id != 0",
+    "u.first = '%s' and u.last = '%s' and u.users_id != 0",
     2,
     &VDsortf,
   },
@@ -2016,10 +2016,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "u",
     USERS,
-    "%c = u.login, %c = text(u.uid), %c = u.shell, %c = u.last, %c = u.first, %c = u.middle, %c = text(u.status), %c = u.mit_id, %c = u.mit_year, %c = u.modtime, %c = text(u.modby), %c = u.modwith",
+    "u.login, text(u.uid), u.shell, u.last, u.first, u.middle, text(u.status), u.mit_id, u.mit_year, u.modtime, text(u.modby), u.modwith",
     gubc_fields,
     12,
-    "u.mit_year = uppercase(\"%s\") and u.users_id != 0",
+    "u.mit_year = uppercase('%s') and u.users_id != 0",
     1,
     &VDsortf,
   },
@@ -2031,25 +2031,25 @@ struct query Queries2[] = {
     RETRIEVE,
     "u",
     USERS,
-    "%c = u.login, %c = text(u.uid), %c = u.shell, %c = u.last, %c = u.first, %c = u.middle, %c = text(u.status), %c = u.mit_id, %c = u.mit_year, %c = u.modtime, %c = text(u.modby), %c = u.modwith",
+    "u.login, text(u.uid), u.shell, u.last, u.first, u.middle, text(u.status), u.mit_id, u.mit_year, u.modtime, text(u.modby), u.modwith",
     gubm_fields,
     12,
-    "u.mit_id = \"%s\" and u.users_id != 0",
+    "u.mit_id = '%s' and u.users_id != 0",
     1,
     &VDsortf,
   },
 
   {
-    /* Q_AUSR - ADD_USER */
+    /* Q_AUSR - ADD_USER */  /** Problems with two refs to values_tbl */
     "add_user",
     "ausr",
     APPEND,
     "u",
     USERS,
-    "login = %c, users_id = values.value, uid = int4(%c), shell = %c, last = %c, first = %c, middle = %c, status = int4(%c), mit_id = %c, mit_year = %c",
+    "(login, users_id, uid, shell, last, first, middle, status, mit_id, mit_year) VALUES ( '%s', values_tbl.value, %s, '%s', '%s',  '%s',  '%s',  %s, '%s',  '%s')",
     ausr_fields,
     9,
-    "values.name = \"users_id\"",
+    "values_tbl.name = \"users_id\"",
     0,
     &ausr_validate,
   },
@@ -2076,7 +2076,7 @@ struct query Queries2[] = {
     UPDATE,
     "u",
     USERS,
-    "login = %c, uid = int4(%c), shell = %c, last = %c, first = %c, middle = %c, status = int4(%c), mit_id = %c, mit_year = %c",
+    "SET login = '%s', uid = %s, shell = '%s', last = '%s', first = '%s', middle = '%s', status = %s, mit_id = '%s',  mit_year = '%s'",
     uusr_fields,
     9,
     "u.users_id = %d",
@@ -2091,7 +2091,7 @@ struct query Queries2[] = {
     UPDATE,
     "u",
     USERS,
-    "shell = %c",
+    "SET shell = '%s'",  
     uush_fields,
     1,
     "u.users_id = %d",
@@ -2106,7 +2106,7 @@ struct query Queries2[] = {
     UPDATE,
     "u",
     USERS,
-    "status = int4(%c)",
+    "status = %s",
     uust_fields,
     1,
     "u.users_id = %d",
@@ -2151,10 +2151,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "k",
     "krbmap",
-    "%c = users.login, %c = strings.string",
+    "users.login, strings.string",
     gkum_fields,
     2,
-    "users.login = \"%s\" and strings.string = \"%s\" and k.users_id = users.users_id and k.string_id = strings.string_id",
+    "users.login = '%s' and strings.string = '%s' and k.users_id = users.users_id and k.string_id = strings.string_id",
     2,
     &VDsort2,
   },
@@ -2166,7 +2166,7 @@ struct query Queries2[] = {
     APPEND,
     "k",
     "krbmap",
-    "users_id = %i4, string_id = %i4",
+    "(users_id, string_id) VALUES (%s, %s)",
     akum_fields,
     2,
     0,
@@ -2196,7 +2196,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "u",
     USERS,
-    "%c = u.login,%c=u.fullname,%c=u.nickname,%c=u.home_addr,%c=u.home_phone,%c=u.office_addr,%c=u.office_phone,%c=u.mit_dept,%c=u.mit_affil,%c=u.fmodtime,%c=text(u.fmodby),%c=u.fmodwith",
+    "u.login, u.fullname, u.nickname, u.home_addr, u.home_phone, u.office_addr, u.office_phone, u.mit_dept, u.mit_affil, u.fmodtime, text(u.fmodby), u.fmodwith",
     gfbl_fields,
     12,
     "u.users_id = %d",
@@ -2211,7 +2211,7 @@ struct query Queries2[] = {
     UPDATE,
     "u",
     USERS,
-    "fullname=%c,nickname=%c,home_addr=%c,home_phone=%c,office_addr=%c,office_phone=%c,mit_dept=%c,mit_affil=%c",
+    "SET fullname= '%s',nickname= '%s',home_addr= '%s',home_phone= '%s',office_addr= '%s',office_phone= '%s',mit_dept= '%s',mit_affil= '%s'",
     ufbl_fields,
     8,
     "u.users_id = %d",
@@ -2226,7 +2226,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "u",
     USERS,
-    "%c = u.login, %c = u.potype, %c = text(u.pop_id) + \":\" + text(u.box_id), %c = u.pmodtime, %c = text(u.pmodby), %c = u.pmodwith",
+    "u.login, u.potype, text(u.pop_id) + \":\" + text(u.box_id), u.pmodtime, text(u.pmodby), u.pmodwith",
     gpob_fields,
     6,
     "u.users_id = %d",
@@ -2241,10 +2241,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "u",
     USERS,
-    "%c = u.login, %c = u.potype, %c = text(u.pop_id) + \":\" + text(u.box_id)",
+    "u.login, u.potype, text(u.pop_id) + \":\" + text(u.box_id)",
     gpox_fields,
     3,
-    "u.potype != \"NONE\"",
+    "u.potype != 'NONE'",
     0,
     &gpox_validate,
   },
@@ -2256,10 +2256,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "u",
     USERS,
-    "%c = u.login, %c = u.potype, %c = text(u.pop_id) + \":\" + text(u.box_id)",
+    "u.login, u.potype, text(u.pop_id) + \":\" + text(u.box_id)",
     gpox_fields,
     3,
-    "u.potype = \"POP\"",
+    "u.potype = 'POP'",
     0,
     &gpox_validate
   },
@@ -2271,10 +2271,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "u",
     USERS,
-    "%c = u.login, %c = u.potype, %c = text(u.pop_id) + \":\" + text(u.box_id)",
+    "u.login, u.potype, text(u.pop_id) + \":\" + text(u.box_id)",
     gpox_fields,
     3,
-    "u.potype = \"SMTP\"",
+    "u.potype = 'SMTP'",
     0,
     &gpox_validate
   },
@@ -2301,7 +2301,7 @@ struct query Queries2[] = {
     UPDATE,
     "u",
     USERS,
-    "potype = \"POP\"",
+    "SET potype = 'POP'",
     spob_fields,
     0,
     "u.users_id = %d",
@@ -2316,7 +2316,7 @@ struct query Queries2[] = {
     UPDATE,
     "u",
     USERS,
-    "potype = \"NONE\"",
+    "SET potype = 'NONE'",
     spob_fields,
     0,
     "u.users_id = %d",
@@ -2331,10 +2331,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "m",
     MACHINE,
-    "%c = m.name, %c = m.type, %c = m.modtime, %c = text(m.modby), %c =m.modwith",
+    "m.name, m.type, m.modtime, text(m.modby), m.modwith",
     gmac_fields,
     5,
-    "m.name = uppercase(\"%s\") and m.mach_id != 0",
+    "m.name = uppercase('%s') and m.mach_id != 0",
     1,
     &VDsortf,
   },
@@ -2346,10 +2346,10 @@ struct query Queries2[] = {
     APPEND,
     "m",
     MACHINE,
-    "name = uppercase(%c), mach_id = values.value, type = %c",
+    "(name, mach_id, type) VALUES (uppercase('%s'),values_tbl.value,'%s')",
     amac_fields,
     2,
-    "values.name = \"mach_id\"",
+    "values_tbl.name = 'mach_id'",
     0,
     &amac_validate,
   },
@@ -2361,7 +2361,7 @@ struct query Queries2[] = {
     UPDATE,
     "m",
     MACHINE,
-    "name = uppercase(%c), type = %c",
+    "SET name = uppercase('%s'), type = '%s'",
     umac_fields,
     2,
     "m.mach_id = %d",
@@ -2391,10 +2391,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "c",
     CLUSTER,
-    "%c = c.name, %c = c.desc, %c = c.location, %c = c.modtime, %c = text(c.modby), %c = c.modwith",
+    "c.name, c.desc, c.location, c.modtime, text(c.modby), c.modwith",
     gclu_fields,
     6,
-    "c.name = \"%s\" and c.clu_id != 0",
+    "c.name = '%s' and c.clu_id != 0",
     1,
     &VDsortf,
   },
@@ -2406,10 +2406,10 @@ struct query Queries2[] = {
     APPEND,
     "c",
     CLUSTER,
-    "name = %c, clu_id = values.value, desc = %c, location = %c",
+    "(name, clu_id, desc, location) VALUES ('%s',values_tbl.value,'%s','%s')",
     aclu_fields,
     3,
-    "values.name = \"clu_id\"",
+    "values_tbl.name = 'clu_id'",
     0,
     &aclu_validate,
   },
@@ -2421,7 +2421,7 @@ struct query Queries2[] = {
     UPDATE,
     "c",
     CLUSTER,
-    "name = %c, desc = %c, location = %c",
+    "SET name = '%s', desc = '%s', location = '%s'",
     uclu_fields,
     3,
     "c.clu_id = %d",
@@ -2451,10 +2451,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "m",
     "mcmap",
-    "%c = machine.name, %c = cluster.name",
+    "machine.name, cluster.name",
     gmcm_fields,
     2,
-    "machine.name = uppercase(\"%s\") and cluster.name = \"%s\" and m.clu_id = cluster.clu_id and m.mach_id = machine.mach_id",
+    "machine.name = uppercase('%s') and cluster.name = '%s' and m.clu_id = cluster.clu_id and m.mach_id = machine.mach_id",
     2,
     &VDsort2,
   },
@@ -2466,7 +2466,7 @@ struct query Queries2[] = {
     APPEND,
     "m",
     "mcmap",
-    "mach_id = %i4, clu_id = %i4",
+    "(mach_id, clu_id) VALUES (%d, %d)",
     gmcm_fields,
     2,
     0,
@@ -2496,10 +2496,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "s",
     "svc",
-    "%c = cluster.name, %c = s.serv_label, %c = s.serv_cluster",
+    "cluster.name, s.serv_label, s.serv_cluster",
     gcld_fields,
     3,
-    "cluster.clu_id = s.clu_id and cluster.name = \"%s\" and s.serv_label = \"%s\"",
+    "cluster.clu_id = s.clu_id and cluster.name = '%s' and s.serv_label = '%s'",
     2,
     &VDsort2,
   },
@@ -2511,7 +2511,7 @@ struct query Queries2[] = {
     APPEND,
     "s",
     "svc",
-    "clu_id = %i4, serv_label = %c, serv_cluster = %c",
+    "(clu_id, serv_label, serv_cluster) VALUES (%d,'%s','%s')",
     acld_fields,
     3,
     (char *)0,
@@ -2529,7 +2529,7 @@ struct query Queries2[] = {
     (char *)0,
     acld_fields,
     0,
-    "s.clu_id = %d and s.serv_label = \"%s\" and s.serv_cluster = \"%s\"",
+    "s.clu_id = %d and s.serv_label = '%s' and s.serv_cluster = '%s'",
     3,
     &acld_validate,
   },
@@ -2541,10 +2541,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "s",
     "servers",
-    "%c = s.name, %c = text(s.update_int), %c = s.target_file, %c = s.script, %c = text(s.dfgen), %c = text(s.dfcheck), %c = s.type, %c = text(s.enable), %c = text(s.inprogress), %c = text(s.harderror), %c = s.errmsg, %c = s.acl_type, %c = text(s.acl_id), %c = s.modtime, %c = text(s.modby), %c = s.modwith",
+    "s.name, text(s.update_int), s.target_file, s.script, text(s.dfgen), text(s.dfcheck), s.type, text(s.enable), text(s.inprogress), text(s.harderror), s.errmsg, s.acl_type, text(s.acl_id), s.modtime, text(s.modby), s.modwith",
     gsin_fields,
     16,
-    "s.name = uppercase(\"%s\")",
+    "s.name = uppercase('%s')",
     1,
     &gsin_validate,
   },
@@ -2571,7 +2571,7 @@ struct query Queries2[] = {
     APPEND,
     "s",
     "servers",
-    "name = uppercase(%c), update_int = int4(%c), target_file = %c, script = %c, type = %c, enable = int1(%c), acl_type = %c, acl_id = %i4",
+    "(name, update_int, target_file, script, type, enable, acl_type, acl_id) VALUES (uppercase('%s'),%s,'%s','%s','%s',%s,'%s',%d)",
     asin_fields,
     8,
     (char *)0,
@@ -2586,10 +2586,10 @@ struct query Queries2[] = {
     UPDATE,
     "s",
     "servers",
-    "update_int = int4(%c), target_file = %c, script = %c, type = %c, enable = int1(%c), acl_type = %c, acl_id = %i4",
+    "SET update_int = %s, target_file = '%s', script = '%s', type = '%s', enable = %s, acl_type = '%s', acl_id = %d",
     asin_fields,
     7,
-    "s.name = uppercase(\"%s\")",
+    "s.name = uppercase('%s')",
     1,
     &asin_validate,
   },
@@ -2601,10 +2601,10 @@ struct query Queries2[] = {
     UPDATE,
     "s",
     "servers",
-    "harderror = 0, dfcheck = s.dfgen",
+    "SET harderror = 0, dfcheck = s.dfgen",
     dsin_fields,
     0,
-    "s.name = uppercase(\"%s\")",
+    "s.name = uppercase('%s')",
     1,
     &rsve_validate,
   },
@@ -2616,10 +2616,10 @@ struct query Queries2[] = {
     UPDATE,
     "s",
     "servers",
-    "dfgen = int4(%c), dfcheck = int4(%c), inprogress = int1(%c), harderror = int1(%c), errmsg = %c",
+    "SET dfgen = %s, dfcheck = %s, inprogress = %s, harderror = %s, errmsg = '%s'",
     ssif_fields,
     5,
-    "s.name = uppercase(\"%s\")",
+    "s.name = uppercase('%s')",
     1,
     &ssif_validate,
   },
@@ -2634,7 +2634,7 @@ struct query Queries2[] = {
     (char *)0,
     dsin_fields,
     0,
-    "s.name = uppercase(\"%s\")",
+    "s.name = uppercase('%s')",
     1,
     &dsin_validate,
   },
@@ -2646,10 +2646,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "sh",
     "serverhosts",
-    "%c = sh.service, %c = machine.name, %c = text(sh.enable), %c = text(sh.override), %c = text(sh.success), %c = text(sh.inprogress), %c = text(sh.hosterror), %c = sh.hosterrmsg, %c = text(sh.ltt), %c = text(sh.lts), %c = text(sh.value1), %c = text(sh.value2), %c = sh.value3, %c = sh.modtime, %c = text(sh.modby), %c = sh.modwith",
+    "sh.service, machine.name, text(sh.enable), text(sh.override), text(sh.success), text(sh.inprogress), text(sh.hosterror), sh.hosterrmsg, text(sh.ltt), text(sh.lts), text(sh.value1), text(sh.value2), sh.value3, sh.modtime, text(sh.modby), sh.modwith",
     gshi_fields,
     16,
-    "sh.service = uppercase(\"%s\") and machine.name = uppercase(\"%s\") and machine.mach_id = sh.mach_id",
+    "sh.service = uppercase('%s') and machine.name = uppercase('%s') and machine.mach_id = sh.mach_id",
     2,
     &gshi_validate,
   },
@@ -2676,7 +2676,7 @@ struct query Queries2[] = {
     APPEND,
     "sh",
     "serverhosts",
-    "service = uppercase(%c), mach_id = %i4, enable = int1(%c), value1 = int4(%c), value2 = int4(%c), value3 = %c",
+    "(service, mach_id, enable, value1, value2, value3) VALUES (uppercase('%s'), %d, %s, %s, %s, '%s')",
     ashi_fields,
     6,
     (char *)0,
@@ -2691,10 +2691,10 @@ struct query Queries2[] = {
     UPDATE,
     "sh",
     "serverhosts",
-    "enable = int1(%c), value1 = int4(%c), value2 = int4(%c), value3 = %c",
+    "SET enable = %s, value1 = %s, value2 = %s, value3 = '%s'",
     ashi_fields,
     4,
-    "sh.service = uppercase(\"%s\") and sh.mach_id = %d",
+    "sh.service = uppercase('%s') and sh.mach_id = %d",
     2,
     &ashi_validate,
   },
@@ -2706,10 +2706,10 @@ struct query Queries2[] = {
     UPDATE,
     "sh",
     "serverhosts",
-    "hosterror = 0",
+    "SET hosterror = 0",
     dshi_fields,
     0,
-    "sh.service = uppercase(\"%s\") and sh.mach_id = %d",
+    "sh.service = uppercase('%s') and sh.mach_id = %d",
     2,
     &rshe_validate,
   },
@@ -2721,10 +2721,10 @@ struct query Queries2[] = {
     UPDATE,
     "sh",
     "serverhosts",
-    "override = 1",
+    "SET override = 1",
     dshi_fields,
     0,
-    "sh.service = uppercase(\"%s\") and sh.mach_id = %d",
+    "sh.service = uppercase('%s') and sh.mach_id = %d",
     2,
     &ssho_validate,
   },
@@ -2736,10 +2736,10 @@ struct query Queries2[] = {
     UPDATE,
     "s",
     "serverhosts",
-    "override = int1(%c), success = int1(%c), inprogress = int1(%c), hosterror = int1(%c), hosterrmsg = %c, ltt = int4(%c), lts = int4(%c)",
+    "SET override = %s, success = %s, inprogress = %s, hosterror = %s, hosterrmsg = '%s', ltt = %s, lts = %s",
     sshi_fields,
     7,
-    "s.service = uppercase(\"%s\") and s.mach_id = machine.mach_id and machine.name = \"%s\"",
+    "s.service = uppercase('%s') and s.mach_id = machine.mach_id and machine.name = '%s'",
     2,
     &sshi_validate,
   },
@@ -2754,7 +2754,7 @@ struct query Queries2[] = {
     (char *)0,
     dshi_fields,
     0,
-    "sh.service = uppercase(\"%s\") and sh.mach_id = %d",
+    "sh.service = uppercase('%s') and sh.mach_id = %d",
     2,
     &dshi_validate,
   },
@@ -2766,10 +2766,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "ha",
     "hostaccess",
-    "%c = machine.name, %c = ha.acl_type, %c = text(ha.acl_id), %c = ha.modtime, %c = text(ha.modby), %c = ha.modwith",
+    "machine.name, ha.acl_type, text(ha.acl_id), ha.modtime, text(ha.modby), ha.modwith",
     gsha_fields,
     6,
-    "machine.name = uppercase(\"%s\") and ha.mach_id = machine.mach_id",
+    "machine.name = uppercase('%s') and ha.mach_id = machine.mach_id",
     1,
     &gsha_validate,
   },
@@ -2781,7 +2781,7 @@ struct query Queries2[] = {
     APPEND,
     "ha",
     "hostaccess",
-    "mach_id = %i4, acl_type = %c, acl_id = %i4",
+    "(mach_id,acl_type,acl_id) VALUES (%d,'%s',%d)",
     asha_fields,
     3,
     0,
@@ -2796,7 +2796,7 @@ struct query Queries2[] = {
     UPDATE,
     "ha",
     "hostaccess",
-    "acl_type = %c, acl_id = %i4",
+    "SET acl_type = '%s', acl_id = %d",
     asha_fields,
     2,
     "ha.mach_id = %d",
@@ -2826,10 +2826,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "sh",
     "serverhosts",
-    "%c = sh.service, %c = machine.name",
+    "sh.service, machine.name",
     gslo_fields,
     2,
-    "sh.service = uppercase(\"%s\") and sh.mach_id = machine.mach_id",
+    "sh.service = uppercase('%s') and sh.mach_id = machine.mach_id",
     1,
     0,
   },
@@ -2841,10 +2841,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "fs",
     FILESYS,
-    "%c = fs.label, %c = fs.type, %c = machine.name, %c = fs.name, %c = fs.mount, %c = fs.access, %c = fs.comments, %c = users.login, %c = list.name, %c = text(fs.createflg), %c = fs.lockertype, %c = fs.modtime, %c = text(fs.modby), %c = fs.modwith",
+    "fs.label, fs.type, machine.name, fs.name, fs.mount, fs.access, fs.comments, users.login, list.name, text(fs.createflg), fs.lockertype, fs.modtime, text(fs.modby), fs.modwith",
     gfsl_fields,
     14,
-    "fs.label = \"%s\" and fs.mach_id = machine.mach_id and fs.owner = users.users_id and fs.owners = list.list_id",
+    "fs.label = '%s' and fs.mach_id = machine.mach_id and fs.owner = users.users_id and fs.owners = list.list_id",
     1,
     &VDsortf,
   },
@@ -2856,7 +2856,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "fs",
     FILESYS,
-    "%c = fs.label, %c = fs.type, %c = machine.name, %c = fs.name, %c = fs.mount, %c = fs.access, %c = fs.comments, %c = users.login, %c = list.name, %c = text(fs.createflg), %c = fs.lockertype, %c = fs.modtime, %c = text(fs.modby), %c = fs.modwith",
+    "fs.label, fs.type, machine.name, fs.name, fs.mount, fs.access, fs.comments, users.login, list.name, text(fs.createflg), fs.lockertype, fs.modtime, text(fs.modby), fs.modwith",
     gfsm_fields,
     14,
     "fs.mach_id = %d and machine.mach_id = fs.mach_id and fs.owner = users.users_id and fs.owners = list.list_id",
@@ -2871,10 +2871,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "fs",
     FILESYS,
-    "%c = fs.label, %c = fs.type, %c = machine.name, %c = fs.name, %c = fs.mount, %c = fs.access, %c = fs.comments, %c = users.login, %c = list.name, %c = text(fs.createflg), %c = fs.lockertype, %c = fs.modtime, %c = text(fs.modby), %c = fs.modwith",
+    "fs.label, fs.type, machine.name, fs.name, fs.mount, fs.access, fs.comments, users.login, list.name, text(fs.createflg), fs.lockertype, fs.modtime, text(fs.modby), fs.modwith",
     gfsn_fields,
     14,
-    "fs.mach_id = %d and machine.mach_id = fs.mach_id and fs.owner = users.users_id and fs.owners = list.list_id and nfsphys.nfsphys_id = fs.phys_id and nfsphys.dir = \"%s\" and fs.type = \"NFS\"",
+    "fs.mach_id = %d and machine.mach_id = fs.mach_id and fs.owner = users.users_id and fs.owners = list.list_id and nfsphys.nfsphys_id = fs.phys_id and nfsphys.dir = '%s' and fs.type = 'NFS'",
     2,
     &gfsm_validate,
   },
@@ -2886,7 +2886,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "fs",
     FILESYS,
-    "%c = fs.label, %c = fs.type, %c = machine.name, %c = fs.name, %c = fs.mount, %c = fs.access, %c = fs.comments, %c = users.login, %c = list.name, %c = text(fs.createflg), %c = fs.lockertype, %c = fs.modtime, %c = text(fs.modby), %c = fs.modwith",
+    "fs.label, fs.type, machine.name, fs.name, fs.mount, fs.access, fs.comments, users.login, list.name, text(fs.createflg), fs.lockertype, fs.modtime, text(fs.modby), fs.modwith",
     gfsg_fields,
     14,
     "fs.owners = %d and machine.mach_id = fs.mach_id and fs.owner = users.users_id and fs.owners = list.list_id",
@@ -2901,10 +2901,10 @@ struct query Queries2[] = {
     APPEND,
     "fs",
     FILESYS,
-    "filsys_id = values.value, label = %c, type = %c, mach_id = %i4, name = %c, mount = %c, access = %c, comments = %c, owner = %i4, owners = %i4, createflg = int1(%c), lockertype = %c",
+    "(filsys_id, label, type, mach_id, name, mount, access, comments, owner, owners, createflg, lockertype) VALUES (values_tbl.value,'%s','%s',%d,'%s','%s','%s','%s',%d,%d,%s,'%s')",
     afil_fields,
     11,
-    "values.name = \"filsys_id\"",
+    "values_tbl.name = 'filsys_id'",
     0,
     &afil_validate,
   },
@@ -2916,12 +2916,12 @@ struct query Queries2[] = {
     UPDATE,
     "fs",
     FILESYS,
-    "label = %c, type = %c, mach_id = %i4, name = %c, mount = %c, access = %c, comments = %c, owner = %i4, owners = %i4, createflg = int1(%c), lockertype = %c",
+    "SET label = '%s', type = '%s', mach_id = %d, name = '%s', mount = '%s', access = '%s', comments = '%s', owner = %d, owners = %d, createflg = %s, lockertype = '%s'",
     ufil_fields,
     11,
     "fs.filsys_id = %d",
     1,
-    &ufil_validate,
+    &ufil_validate,      
   },
 
   {
@@ -2946,7 +2946,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "fg",
     "fsgroup",
-    "%c = filesys.label, %c = fg.key",
+    "filesys.label, fg.key",
     gfgm_fields,
     2,
     "fg.group_id = %d and filesys.filsys_id = fg.filsys_id",
@@ -2961,10 +2961,10 @@ struct query Queries2[] = {
     APPEND,
     "fg",
     "fsgroup",
-    "group_id = filesys.filsys_id, filsys_id = %i4, key = %c",
+    "(group_id,filsys_id,key) VALUES (filesys.filsys_id, %d, '%s')",
     gfgm_fields,
     2,
-    "filesys.filsys_id = %d and filesys.type = \"FSGROUP\"",
+    "filesys.filsys_id = %d and filesys.type = 'FSGROUP'",
     1,
     &aftg_validate,
   },
@@ -2991,7 +2991,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "np",
     "nfsphys",
-    "%c = machine.name, %c = np.dir, %c = np.device, %c = text(np.status), %c = text(np.allocated), %c = text(np.size), %c = np.modtime, %c = text(np.modby), %c = np.modwith",
+    "machine.name, np.dir, np.device, text(np.status), text(np.allocated), text(np.size), np.modtime, text(np.modby), np.modwith",
     ganf_fields,
     9,
     "machine.mach_id = np.mach_id",
@@ -3006,10 +3006,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "np",
     "nfsphys",
-    "%c = machine.name, %c = np.dir, %c = np.device, %c = text(np.status), %c = text(np.allocated), %c = text(np.size), %c = np.modtime, %c = text(np.modby), %c = np.modwith",
+    "machine.name, np.dir, np.device, text(np.status), text(np.allocated), text(np.size), np.modtime, text(np.modby), np.modwith",
     gnfp_fields,
     9,
-    "np.mach_id = %d and np.dir = \"%s\" and machine.mach_id = np.mach_id",
+    "np.mach_id = %d and np.dir = '%s' and machine.mach_id = np.mach_id",
     2,
     &gnfp_validate,
   },
@@ -3021,10 +3021,10 @@ struct query Queries2[] = {
     APPEND,
     "np",
     "nfsphys",
-    "nfsphys_id = values.value, mach_id = %i4, dir = %c, device = %c, status = int4(%c), allocated = int4(%c), size = int4(%c)",
+    "(nfsphys_id, mach_id, dir, device, status, allocated, size) VALUES (values_tbl.value, %d, '%s', '%s', %s, %s, %s)",
     ganf_fields,
     6,
-    "values.name = \"nfsphys_id\"",
+    "values_tbl.name = 'nfsphys_id'",
     0,
     &anfp_validate,
   },
@@ -3036,10 +3036,10 @@ struct query Queries2[] = {
     UPDATE,
     "np",
     "nfsphys",
-    "device = %c, status = int4(%c), allocated = int4(%c), size = int4(%c)",
+    "SET device = '%s', status = '%s', allocated = %s, size = %s",
     gnfp_fields,
     4,
-    "np.mach_id = %d and np.dir = \"%s\"",
+    "np.mach_id = %d and np.dir = '%s'",
     2,
     &anfp_validate,
   },
@@ -3051,10 +3051,10 @@ struct query Queries2[] = {
     UPDATE,
     "np",
     "nfsphys",
-    "allocated = np.allocated + int4(%c)",
+    "SET np.allocated = np.allocated + %s",
     dnfp_fields,
     1,
-    "np.mach_id = %d and np.dir = \"%s\"",
+    "np.mach_id = %d and np.dir = '%s'",
     2,
     &anfp_validate,
   },
@@ -3069,7 +3069,7 @@ struct query Queries2[] = {
     (char *)0,
     dnfp_fields,
     0,
-    "np.mach_id = %d and np.dir = \"%s\"",
+    "np.mach_id = %d and np.dir = '%s'",
     2,
     &dnfp_validate,
   },
@@ -3081,10 +3081,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "q",
     QUOTA,
-    "%c = filesys.label, %c = q.type, %c = text(q.entity_id), %c = text(q.quota), %c = text(q.phys_id), %c = machine.name, %c = q.modtime, %c = text(q.modby), %c = q.modwith",
+    "filesys.label, q.type, text(q.entity_id), text(q.quota), text(q.phys_id), machine.name, q.modtime, text(q.modby), q.modwith",
     gqot_fields,
     9,
-    "filesys.label = \"%s\" and q.type = \"%s\" and q.entity_id = %d and filesys.filsys_id = q.filsys_id and machine.mach_id = filesys.mach_id",
+    "filesys.label = '%s' and q.type = '%s' and q.entity_id = %d and filesys.filsys_id = q.filsys_id and machine.mach_id = filesys.mach_id",
     3,
     &gqot_validate,
   },
@@ -3096,10 +3096,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "q",
     QUOTA,
-    "%c = filesys.label, %c = q.type, %c = text(q.entity_id), %c = text(q.quota), %c = text(q.phys_id), %c = machine.name, %c = q.modtime, %c = text(q.modby), %c = q.modwith",
+    "filesys.label, q.type, text(q.entity_id), text(q.quota), text(q.phys_id), machine.name, q.modtime, text(q.modby), q.modwith",
     gqbf_fields,
     9,
-    "filesys.label = \"%s\" and filesys.filsys_id = q.filsys_id and machine.mach_id = filesys.mach_id",
+    "filesys.label = '%s' and filesys.filsys_id = q.filsys_id and machine.mach_id = filesys.mach_id",
     1,
     &gqbf_validate,
   },
@@ -3111,7 +3111,7 @@ struct query Queries2[] = {
     APPEND,
     "q",
     QUOTA,
-    "filsys_id = filesys.filsys_id, type  = %c, entity_id = %i4, quota = int4(%c), phys_id = filesys.phys_id",
+    "(filsys_id, type, entity_id, quota, phys_id) VALUES (filesys.filsys_id, '%s', %d, %s, filesys.phys_id)",
     aqot_fields,
     3,
     "filesys.filsys_id = %d",
@@ -3126,10 +3126,10 @@ struct query Queries2[] = {
     UPDATE,
     "q",
     QUOTA,
-    "quota = int4(%c)",
+    "SET quota = %s",
     aqot_fields,
     1,
-    "q.filsys_id = %d and q.type = \"%s\" and q.entity_id = %d",
+    "q.filsys_id = %d and q.type = '%s' and q.entity_id = %d",
     3,
     &uqot_validate,
   },
@@ -3144,7 +3144,7 @@ struct query Queries2[] = {
     (char *)0,
     aqot_fields,
     0,
-    "q.filsys_id = %d and q.type = \"%s\" and q.entity_id = %d",
+    "q.filsys_id = %d and q.type = '%s' and q.entity_id = %d",
     3,
     &dqot_validate,
   },
@@ -3156,10 +3156,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "q",
     QUOTA,
-    "%c = filesys.label, %c = users.login, %c = text(q.quota), %c = text(q.phys_id), %c = machine.name, %c = q.modtime, %c = text(q.modby), %c = q.modwith",
+    "filesys.label, users.login, text(q.quota), text(q.phys_id), machine.name, q.modtime, text(q.modby), q.modwith",
     gnfq_fields,
     8,
-    "filesys.label = \"%s\" and q.type = \"USER\" and q.entity_id = users.users_id and filesys.filsys_id = q.filsys_id and machine.mach_id = filesys.mach_id and users.login = \"%s\"",
+    "filesys.label = '%s' and q.type = 'USER' and q.entity_id = users.users_id and filesys.filsys_id = q.filsys_id and machine.mach_id = filesys.mach_id and users.login = '%s'",
     2,
     &gnfq_validate,
   },
@@ -3171,10 +3171,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "q",
     QUOTA,
-    "%c = filesys.label, %c = users.login, %c = text(q.quota), %c = nfsphys.dir, %c = machine.name",
+    "filesys.label, users.login, text(q.quota), nfsphys.dir, machine.name",
     gnqp_fields,
     5,
-    "nfsphys.mach_id = %d and nfsphys.dir = \"%s\" and q.phys_id = nfsphys.nfsphys_id and filesys.filsys_id = q.filsys_id and q.type = \"USER\" and users.users_id = q.entity_id and machine.mach_id = nfsphys.mach_id",
+    "nfsphys.mach_id = %d and nfsphys.dir = '%s' and q.phys_id = nfsphys.nfsphys_id and filesys.filsys_id = q.filsys_id and q.type = 'USER' and users.users_id = q.entity_id and machine.mach_id = nfsphys.mach_id",
     2,
     &VDmach,
   },
@@ -3186,7 +3186,7 @@ struct query Queries2[] = {
     APPEND,
     "q",
     QUOTA,
-    "filsys_id = filesys.filsys_id, type = \"USER\", entity_id = %i4, quota = int4(%c), phys_id = filesys.phys_id",
+    "(filsys_id, type, entity_id, quota, phys_id) VALUES (filesys.filsys_id, 'USER', %d, %s, filesys.phys_id)",
     anfq_fields,
     2,
     "filesys.filsys_id = %d",
@@ -3201,10 +3201,10 @@ struct query Queries2[] = {
     UPDATE,
     "q",
     QUOTA,
-    "quota = int4(%c)",
+    "SET quota = %s",
     anfq_fields,
     1,
-    "q.filsys_id = %d and q.type = \"USER\" and q.entity_id = %d",
+    "q.filsys_id = %d and q.type = 'USER' and q.entity_id = %d",
     2,
     &unfq_validate,
   },
@@ -3219,7 +3219,7 @@ struct query Queries2[] = {
     (char *)0,
     anfq_fields,
     0,
-    "q.filsys_id = %d and q.type = \"USER\" and q.entity_id = %d",
+    "q.filsys_id = %d and q.type = 'USER' and q.entity_id = %d",
     2,
     &dnfq_validate,
   },
@@ -3246,10 +3246,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "l",
     LIST,
-    "%c = l.name",
+    "list.name",
     glin_fields,
     1,
-    "l.name = \"%s\" and l.list_id != 0",
+    "list.name = '%s' and list.list_id != 0",
     1,
     0
   },
@@ -3260,11 +3260,11 @@ struct query Queries2[] = {
     "alis",
     APPEND,
     "l",
-    LIST,
-    "list_id=values.value, name=%c, active=int1(%c), public=int1(%c), hidden=int1(%c), maillist=int1(%c), group=int1(%c), gid=int2(%c), acl_type=%c, acl_id=%i4, desc=%c",
+    LIST, 
+    "(list_id, name, active, public, hidden, maillist, isgroup, gid, acl_type, acl_id, desc) VALUES (values_tbl.value,'%s',%s,%s,%s,%s,%s,%s,'%s',%d,'%s')",
     alis_fields,
     10,
-    "values.name = \"list_id\"",
+    "values_tbl.name = 'list_id'",
     0,
     &alis_validate,
   },
@@ -3276,10 +3276,10 @@ struct query Queries2[] = {
     UPDATE,
     "l",
     LIST,
-    "name=%c, active=int1(%c), public=int1(%c), hidden=int1(%c), maillist=int1(%c), group=int1(%c), gid=int2(%c), acl_type=%c, acl_id=%i4, desc=%c",
+    "SET name='%s', active=%s, public=%s, hidden=%s, maillist=%s, isgroup=%s, gid=%s, acl_type='%s', acl_id=%d, desc='%s'",
     ulis_fields,
     10,
-    "l.list_id = %d",
+    "list.list_id = %d",
     1,
     &ulis_validate,
   },
@@ -3294,7 +3294,7 @@ struct query Queries2[] = {
     (char *)0,
     dlis_fields,
     0,
-    "l.list_id = %d",
+    "list.list_id = %d",
     1,
     &dlis_validate,
   },
@@ -3411,10 +3411,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "z",
     "zephyr",
-    "%c = z.class, %c = z.xmt_type, %c = text(z.xmt_id),%c = z.sub_type, %c = text(z.sub_id),%c = z.iws_type, %c = text(z.iws_id),%c = z.iui_type, %c = text(z.iui_id), %c=z.modtime, %c = text(z.modby), %c = z.modwith",
+    "z.class, z.xmt_type, text(z.xmt_id),z.sub_type, text(z.sub_id),z.iws_type, text(z.iws_id),z.iui_type, text(z.iui_id), z.modtime, text(z.modby), z.modwith",
     gzcl_fields,
     12,
-    "z.class = \"%s\"",
+    "z.class = '%s'",
     1,
     &gzcl_validate,
   },    
@@ -3426,7 +3426,7 @@ struct query Queries2[] = {
     APPEND,
     "z",
     "zephyr",
-    "class = %c, xmt_type = %c, xmt_id = %i4, sub_type = %c, sub_id = %i4, iws_type = %c, iws_id = %i4, iui_type = %c, iui_id = %i4",
+    "(class, xmt_type, xmt_id, sub_type, sub_id, iws_type, iws_id, iui_type, iui_id) VALUES ('%s','%s',%d,'%s',%d,'%s',%d,'%s',%d)",
     azcl_fields,
     9,
     0,
@@ -3441,10 +3441,10 @@ struct query Queries2[] = {
     UPDATE,
     "z",
     "zephyr",
-    "class = %c, xmt_type = %c, xmt_id = %i4, sub_type = %c, sub_id = %i4, iws_type = %c, iws_id = %i4, iui_type = %c, iui_id = %i4",
+    "SET class = '%s', xmt_type = '%d', xmt_id = %d, sub_type = '%s', sub_id = %d, iws_type = '%s', iws_id = %d, iui_type = '%s', iui_id = %d",
     uzcl_fields,
     9,
-    "z.class = \"%s\"",
+    "z.class = '%s'",
     1,
     &uzcl_validate,
   },    
@@ -3459,7 +3459,7 @@ struct query Queries2[] = {
     0,
     uzcl_fields,
     0,
-    "z.class = \"%s\"",
+    "z.class = '%s'",
     1,
     &dzcl_validate,
   },    
@@ -3471,10 +3471,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "s",
     "services",
-    "%c = s.name, %c = s.protocol, %c = text(s.port), %c = s.desc, %c = s.modtime, %c = text(s.modby), %c = s.modwith",
+    "s.name, s.protocol, text(s.port), s.desc, s.modtime, text(s.modby), s.modwith",
     gsvc_fields,
     7,
-    "s.name = \"%s\"",
+    "s.name = '%s'",
     1,
     &VDsortf,
   },
@@ -3486,7 +3486,7 @@ struct query Queries2[] = {
     APPEND,
     "s",
     "services",
-    "name = %c, protocol = %c, port = int2(%c), desc = %c",
+    "(name, protocol, port, desc) VALUES ('%s','%s',%s,'%s')",
     asvc_fields,
     4,
     (char *)0,
@@ -3504,7 +3504,7 @@ struct query Queries2[] = {
     0,
     asvc_fields,
     0,
-    "s.name = \"%s\"",
+    "s.name = '%s'",
     1,
     &asvc_validate,
   },
@@ -3516,10 +3516,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "p",
     "printcap",
-    "%c = p.name, %c = machine.name, %c = p.dir, %c = p.rp, %c = text(p.quotaserver), %c = text(p.auth), %c = text(p.price), %c = p.comments, %c = p.modtime, %c = text(p.modby), %c = p.modwith",
+    "p.name, machine.name, p.dir, p.rp, text(p.quotaserver), text(p.auth), text(p.price), p.comments, p.modtime, text(p.modby), p.modwith",
     gpce_fields,
     11,
-    "p.name = \"%s\" and machine.mach_id = p.mach_id",
+    "p.name = '%s' and machine.mach_id = p.mach_id",
     1,
     &gpce_validate,
   },
@@ -3531,7 +3531,7 @@ struct query Queries2[] = {
     APPEND,
     "p",
     "printcap",
-    "name = %c, mach_id = %i4, dir = %c, rp = %c, quotaserver = %i4, auth = int1(%c), price = int2(%c), comments = %c",
+    "(name, mach_id, dir, rp, quotaserver, auth, price, comments) VALUES ('%s',%d,'%s','%s',%d,%s,%s,'%s')",
     apce_fields,
     8,
     0,
@@ -3549,7 +3549,7 @@ struct query Queries2[] = {
     0,
     apce_fields,
     0,
-    "p.name = \"%s\"",
+    "p.name = '%s'",
     1,
     &dpce_validate,
   },
@@ -3561,10 +3561,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "p",
     "printcap",
-    "%c = p.name, %c = machine.name, %c = p.dir, %c = p.rp, %c = p.comments, %c = p.modtime, %c = text(p.modby), %c = p.modwith",
+    "p.name, machine.name, p.dir, p.rp, p.comments, p.modtime, text(p.modby), p.modwith",
     gpcp_fields,
     8,
-    "p.name = \"%s\" and machine.mach_id = p.mach_id",
+    "p.name = '%s' and machine.mach_id = p.mach_id",
     1,
     &VDsortf,
   },
@@ -3579,7 +3579,7 @@ struct query Queries2[] = {
     0,
     apce_fields,
     0,
-    "p.name = \"%s\"",
+    "p.name = '%s'",
     1,
     &dpce_validate,
   },
@@ -3591,10 +3591,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "p",
     "palladium",
-    "%c = p.name, %c = text(p.ident), %c = machine.name, %c = p.modtime, %c = text(p.modby), %c = p.modwith",
+    "p.name, text(p.ident), machine.name, p.modtime, text(p.modby), p.modwith",
     gpdm_fields,
     6,
-    "p.name = \"%s\" and machine.mach_id = p.mach_id",
+    "p.name = '%s' and machine.mach_id = p.mach_id",
     1,
     &VDsortf,
   },
@@ -3606,7 +3606,7 @@ struct query Queries2[] = {
     APPEND,
     "p",
     "palladium",
-    "name = %c, ident = int4(%c), mach_id = %i4",
+    "(name, ident, mach_id) VALUES ('%s',%s,%d)",
     apdm_fields,
     3,
     0,
@@ -3624,7 +3624,7 @@ struct query Queries2[] = {
     0,
     apdm_fields,
     0,
-    "p.name = \"%s\"",
+    "p.name = '%s'",
     1,
     &dpdm_validate,
   },
@@ -3636,10 +3636,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "a",
     "alias",
-    "%c = a.name, %c = a.type, %c = a.trans",
+    "a.name, a.type, a.trans",
     gali_fields,
     3,
-    "a.name = \"%s\" and a.type = \"%s\" and a.trans = \"%s\"",
+    "a.name = '%s' and a.type = '%s' and a.trans = '%s'",
     3,
     0,
   },
@@ -3651,7 +3651,7 @@ struct query Queries2[] = {
     APPEND,
     "a",
     "alias",
-    "name = %c, type = %c, trans = %c",
+    "(name, type, trans) VALUES ('%s', '%s', '%s')",
     aali_fields,
     3,
     (char *)0,
@@ -3669,7 +3669,7 @@ struct query Queries2[] = {
     (char *)0,
     aali_fields,
     0,
-    "a.name = \"%s\" and a.type = \"%s\" and a.trans = \"%s\"",
+    "a.name = '%s' and a.type = '%s' and a.trans = '%s'",
     3,
     &dali_validate,
   },
@@ -3681,10 +3681,10 @@ struct query Queries2[] = {
     RETRIEVE,
     "v",
     "values",
-    "%c = text(v.value)",
+    "text(v.value)",
     gval_fields,
     1,
-    "v.name = \"%s\"",
+    "v.name = '%s'",
     1,
     &gval_validate,
   },
@@ -3695,8 +3695,8 @@ struct query Queries2[] = {
     "aval",
     APPEND,
     "v",
-    "values",
-    "name = %c, value = int4(%c)",
+    "values_tbl",
+    "(name, value) VALUES ('%s', %s)",
     aval_fields,
     2,
     (char *)0,
@@ -3710,11 +3710,11 @@ struct query Queries2[] = {
     "uval",
     UPDATE,
     "v",
-    "values",
-    "value = int4(%c)",
+    "values_tbl",
+    "SET value = %s",
     aval_fields,
     1,
-    "v.name = \"%s\"",
+    "v.name = '%s'",
     1,
     &aval_validate,
   },
@@ -3725,11 +3725,11 @@ struct query Queries2[] = {
     "dval",
     DELETE,
     "v",
-    "values",
+    "values_tbl",
     (char *)0,
     dval_fields,
     0,
-    "v.name = \"%s\"",
+    "v.name = '%s'",
     1,
     &aval_validate,
   },
@@ -3741,7 +3741,7 @@ struct query Queries2[] = {
     RETRIEVE,
     "tbs",
     "tblstats",
-    "%c = tbs.table, %c = text(tbs.retrieves), %c = text(tbs.appends), %c = text(tbs.updates), %c = text(tbs.deletes), %c = tbs.modtime",
+    "tbs.table, text(tbs.retrieves), text(tbs.appends), text(tbs.updates), text(tbs.deletes), tbs.modtime",
     gats_fields,
     6,
     (char *)0,