Update gudf and uudf for changed schema (two fields instead of one bitfield)

[moira.git] / server / queries2.c

diff --git a/server/queries2.c b/server/queries2.c
index 59d41ebbe48720c38a57d2874c8023f12ebd98e7..99f2458070d2dfba7fa04c8cf4ff723809fb7c4f 100644 (file)
--- a/server/queries2.c
+++ b/server/queries2.c
@@ -424,7 +424,7 @@ static char *gubm_fields[] = {
 
 static char *gudf_fields[] = {
   LOGIN,
-  "dirflags",
+  "dirsuppress", "dirremote"
 };
 
 static struct validate gudf_validate = 
@@ -598,7 +598,7 @@ static struct validate uust_validate = {
 
 static char *uudf_fields[] = {
   LOGIN,
-  "dirflags",
+  "dirsuppress", "dirremote"
 };
 
 static struct validate uudf_validate = {
@@ -2889,9 +2889,9 @@ struct query Queries2[] = {
     RETRIEVE,
     "u",
     USERS_TABLE,
-    "u.dirflags FROM users u",
+    "u.dirsuppress, u.dirremote FROM users u",
     gudf_fields,
-    1,
+    2,
     "u.users_id = %d",
     1,
     &gudf_validate,
@@ -3024,9 +3024,9 @@ struct query Queries2[] = {
     UPDATE,
     "u",
     USERS_TABLE,
-    "users SET dirflags = %s",
+    "users SET dirsuppress = %s, dirremote = %s",
     uudf_fields,
-    1,
+    2,
     "users_id = %d",
     1,
     &uudf_validate,