New database and column names for Moira2.

[moira.git] / gen / sis.dc

diff --git a/gen/sis.dc b/gen/sis.dc
index 284b2c7fc6a8bf05f9f8a51fa2b6b406bdbbce73..06192c7825e7e08037e922b685667c2036b0416d 100644 (file)
--- a/gen/sis.dc
+++ b/gen/sis.dc
@@ -49,10 +49,10 @@ char **argv;
     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
 
     if (argc == 2) {
@@ -81,10 +81,14 @@ char **argv;
     gettimeofday(&now, NULL);
     cutoff = now.tv_sec - 14 * 24 * 60 * 60;
 
+    /* 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 x CURSOR FOR
-      SELECT u.login, u.mit_id, u.signature, u.sigdate, s.string
+      SELECT u.login, u.clearid, u.signature, u.sigdate, s.string
       FROM users u, strings s
        WHERE u.status = 1 and u.sigwho = s.string_id and u.sigwho != 0
          and u.secure <= :cutoff and u.secure != 0;