New database and field names for Moira2.

diff --git a/gen/aliases.dc b/gen/aliases.dc
index af2b3318bf16f514b767dabc82df3c8cdb6eca8f..1e730ef5876b79e42e8aa12b7a9060a4d3cb6759 100644 (file)
--- a/gen/aliases.dc
+++ b/gen/aliases.dc
@@ -43,10 +43,10 @@ char **argv;
     out = stdout;
     initialize_sms_error_table();
 #ifsql INGRES
-    EXEC SQL CONNECT sms;
+    EXEC SQL CONNECT moira;
 #endsql
 #ifsql INFORMIX
-    EXEC SQL DATABASE sms;
+    EXEC SQL DATABASE moira;
 #endsql
 
 
@@ -135,11 +135,14 @@ get_info()
     register struct member *m;
     register struct list *memberlist;
 
+    /* The following WHENEVER is declarative, not executed,
+     * and applies for the remainder of this file only.
+     */
     EXEC SQL WHENEVER SQLERROR GOTO sqlerr;
 
     /* get locks */
-    EXEC SQL SELECT modtime INTO :buf FROM list WHERE LIST_ID = 0;
-    EXEC SQL SELECT modtime INTO :buf FROM list WHERE USERS_ID = 0;
+    EXEC SQL SELECT modtime INTO :buf FROM list WHERE list_id = 0;
+    EXEC SQL SELECT modtime INTO :buf FROM list WHERE users_id = 0;
 
     fprintf(stderr, "Loading machines\n");
     machines = create_hash(1000);
@@ -212,7 +215,7 @@ get_info()
     lists = create_hash(15001);
 
     EXEC SQL DECLARE l_cursor CURSOR FOR
-      SELECT list_id, name, maillist, desc, acl_type, acl_id
+      SELECT list_id, name, maillist, description, acl_type, acl_id
        FROM list WHERE active != 0;
     EXEC SQL OPEN l_cursor;
     while (1) {