From 968f523cfe43ee6c627bbe39ae837262b898e3a0 Mon Sep 17 00:00:00 2001
From: mar <mar>
Date: Mon, 21 Dec 1992 17:57:53 +0000
Subject: [PATCH] fixup SQL

---
 gen/pobox.dc  | 17 +++++++++++------
 gen/stats.dc  | 13 +++++++++----
 gen/zephyr.dc | 17 +++++++++++------
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/gen/pobox.dc b/gen/pobox.dc
index 0c1d3296..2be2e2a3 100644
--- a/gen/pobox.dc
+++ b/gen/pobox.dc
@@ -33,10 +33,11 @@ char **argv;
     EXEC SQL END DECLARE SECTION;
 
 #ifsql INGRES
-    EXEC SQL CONNECT sms;
+    EXEC SQL CONNECT moira;
+    EXEC SQL SET LOCKMODE SESSION WHERE LEVEL=TABLE, READLOCK=SHARED;
 #endsql
 #ifsql INFORMIX
-    EXEC SQL DATABASE sms;
+    EXEC SQL DATABASE moira;
 #endsql
 
     if (argc == 2) {
@@ -62,11 +63,15 @@ char **argv;
 	outf = NULL;
     }
 
+    /* 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 
-      mit_id, login
-	FROM users WHERE status != 3 and potype="POP";
+      clearid, login
+	FROM users WHERE status != 3 and potype='POP';
     EXEC SQL OPEN x;
     while (1) {
 	EXEC SQL FETCH x INTO :id, :login;
@@ -80,9 +85,9 @@ char **argv;
     EXEC SQL CLOSE x;
 
     EXEC SQL DECLARE y CURSOR FOR SELECT 
-      u.mit_id, s.string
+      u.clearid, s.string
 	FROM users u, strings s
-	WHERE u.status != 3 and u.potype="SMTP" and u.box_id = s.string_id;
+	WHERE u.status != 3 and u.potype='SMTP' and u.box_id = s.string_id;
     EXEC SQL OPEN y;
     while (1) {
 	EXEC SQL FETCH y INTO :id, :string;
diff --git a/gen/stats.dc b/gen/stats.dc
index 4e8dd9a5..feea0f57 100644
--- a/gen/stats.dc
+++ b/gen/stats.dc
@@ -37,10 +37,11 @@ char **argv;
     EXEC SQL END DECLARE SECTION;
 
 #ifsql INGRES
-    EXEC SQL CONNECT sms;
+    EXEC SQL CONNECT moira;
+    EXEC SQL SET LOCKMODE SESSION WHERE LEVEL=TABLE, READLOCK=SHARED;
 #endsql
 #ifsql INFORMIX
-    EXEC SQL DATABASE sms;
+    EXEC SQL DATABASE moira;
 #endsql
 
     if (argc == 2) {
@@ -67,6 +68,10 @@ char **argv;
 	outf = NULL;
     }
 
+    /* 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;
 
     machines = create_hash(1000);
@@ -85,13 +90,13 @@ char **argv;
     EXEC SQL DECLARE x CURSOR FOR
       SELECT DISTINCT f.mach_id, count(f.filsys_id)
       FROM filesys f
-	WHERE f.type="NFS"
+	WHERE f.type='NFS'
       GROUP BY f.mach_id;
     EXEC SQL OPEN x;
     while (1) {
 	EXEC SQL FETCH x INTO :id, :n;
 	if (sqlca.sqlcode != 0) break;
-	fprintf(out, "%s %d\n", hash_lookup(machines, id), n);
+	fprintf(out, "%-32s %d\n", hash_lookup(machines, id), n);
     }
     EXEC SQL CLOSE x;
 
diff --git a/gen/zephyr.dc b/gen/zephyr.dc
index fc4a2f68..e6fca3ee 100644
--- a/gen/zephyr.dc
+++ b/gen/zephyr.dc
@@ -38,19 +38,20 @@ char **argv;
     sprintf(zephyr_dir, "%s/zephyr", DCM_DIR);
 
 #ifsql INGRES
-EXEC SQL CONNECT sms;
+    EXEC SQL CONNECT moira;
+    EXEC SQL SET LOCKMODE SESSION WHERE LEVEL=TABLE, READLOCK=SHARED;
 #endsql
 #ifsql INFORMIX
-EXEC SQL DATABASE sms;
+    EXEC SQL DATABASE moira;
 #endsql
 
     changed = do_classes();
 
 #ifsql INGRES
-EXEC SQL DISCONNECT;
+    EXEC SQL DISCONNECT;
 #endsql    
 #ifsql INFORMIX
-EXEC SQL CLOSE DATABASE;
+    EXEC SQL CLOSE DATABASE;
 #endsql
 
     if (!changed) {
@@ -116,6 +117,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 +223,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 +240,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;
-- 
2.45.2