New database and column names for Moira2.

[moira.git] / gen / zephyr.dc

diff --git a/gen/zephyr.dc b/gen/zephyr.dc
index fc4a2f68ab38a83ebe0c5290fd9c9027855fff06..9bb1fe8f061834b8c22596c8c462d16d022314b2 100644 (file)
--- a/gen/zephyr.dc
+++ b/gen/zephyr.dc
@@ -38,10 +38,10 @@ char **argv;
     sprintf(zephyr_dir, "%s/zephyr", DCM_DIR);
 
 #ifsql INGRES
-EXEC SQL CONNECT sms;
+EXEC SQL CONNECT moira;
 #endsql
 #ifsql INFORMIX
-EXEC SQL DATABASE sms;
+EXEC SQL DATABASE moira;
 #endsql
 
     changed = do_classes();
@@ -116,6 +116,10 @@ int do_classes()
     top = (struct zclass *)malloc(sizeof(struct zclass));
     next = top;
 
+    /* The following is declarative, not executed,
+     * and so is dependent on where it is in the file,
+     * not in the order of execution of statements.
+     */
     EXEC SQL WHENEVER SQLERROR GOTO sqlerr;
     EXEC SQL DECLARE classes CURSOR FOR SELECT class, xmt_type, xmt_id,
        sub_type, sub_id, iws_type, iws_id, iui_type, iui_id
@@ -218,7 +222,7 @@ char *atype;
 
     EXEC SQL DECLARE umember CURSOR FOR SELECT users.login
       FROM users, imembers
-      WHERE imembers.list_id = :zid and imembers.member_type="USER" and
+      WHERE imembers.list_id = :zid and imembers.member_type='USER' and
        imembers.member_id=users.users_id;
     EXEC SQL OPEN umember;
     while (1) {
@@ -235,7 +239,7 @@ char *atype;
     EXEC SQL DECLARE smember CURSOR FOR SELECT strings.string
       FROM strings, imembers
       WHERE imembers.list_id = :zid and imembers.member_id=strings.string_id
-       and (imembers.member_type="STRING" or imembers.member_type="KERBEROS");
+       and (imembers.member_type='STRING' or imembers.member_type='KERBEROS');
     EXEC SQL OPEN smember;
     while (1) {
        EXEC SQL FETCH smember INTO :str;