check for error after setting up each cursor

diff --git a/dbck/phase1.dc b/dbck/phase1.dc
index f42942f45c59ee20f8b5d60e21df5f57acd73780..a1a6096b58cabceac2c58f79975ad696be5ca9d5 100644 (file)
--- a/dbck/phase1.dc
+++ b/dbck/phase1.dc
@@ -202,6 +202,7 @@ phase1()
 
     EXEC SQL DECLARE csr101 CURSOR FOR
       SELECT string_id, string FROM strings ORDER BY string_id;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr101;
     while(1) {
        EXEC SQL FETCH csr101 INTO :id, :buf;
@@ -232,6 +233,7 @@ phase1()
     EXEC SQL DECLARE csr102 CURSOR FOR 
       SELECT users_id, login, last, first, status, potype, pop_id, box_id,
          modby, fmodby, pmodby, comment, sigwho FROM users ORDER BY users_id;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr102;
     while(1) {
        EXEC SQL FETCH csr102 INTO :id, :name, :last, :first, :status,
@@ -285,6 +287,7 @@ phase1()
        EXEC SQL DECLARE csr103 CURSOR FOR 
            SELECT u1.users_id FROM users u1, users u2
            WHERE u1.login = u2.login and u1.tid != u2.tid;
+       if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
        EXEC SQL OPEN csr103;
        while(1) {
            EXEC SQL FETCH csr103 INTO :id;
@@ -304,6 +307,7 @@ phase1()
 
     EXEC SQL DECLARE csr104 CURSOR FOR
        SELECT mach_id, name, modby FROM machine ORDER BY mach_id;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr104;
     while(1) {
        EXEC SQL FETCH csr104 INTO :id, :name, :sid;
@@ -334,6 +338,7 @@ phase1()
        EXEC SQL DECLARE csr105 CURSOR FOR
            SELECT m1.mach_id FROM machine m1, machine m2
                WHERE m1.name = m2.name AND m1.tid != m2.tid;
+       if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
        EXEC SQL OPEN csr105;
        while(1) {
            EXEC SQL FETCH csr105 INTO :id;
@@ -354,6 +359,7 @@ phase1()
 
     EXEC SQL DECLARE csr106 CURSOR FOR
        SELECT clu_id, name, modby FROM cluster;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr106;
     while(1) {
        EXEC SQL FETCH csr106 INTO :id, :name, :sid;
@@ -383,6 +389,7 @@ phase1()
        EXEC SQL DECLARE csr107 CURSOR FOR
            SELECT c1.clu_id FROM cluster c1, cluster c2
                WHERE c1.name=c2.name AND c1.tid != c2.tid;
+       if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
        EXEC SQL OPEN csr107;
        while(1) {
            EXEC SQL FETCH csr107 INTO :id;
@@ -404,6 +411,7 @@ phase1()
     EXEC SQL DECLARE csr108 CURSOR FOR
        SELECT list_id, name, acl_id, acl_type, modby  FROM list 
        ORDER BY list_id;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr108;
     while(1) {
        EXEC SQL FETCH csr108 INTO :id, :name, :aid, :buf, :sid;
@@ -435,6 +443,7 @@ phase1()
        EXEC SQL DECLARE csr109 CURSOR FOR
            SELECT l1.list_id FROM list l1, list l2
                WHERE l1.name=l2.name AND l1.tid != l2.tid;
+       if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
        EXEC SQL OPEN csr109;
        while(1) {
            EXEC SQL FETCH csr109 INTO :id;
@@ -456,6 +465,7 @@ phase1()
     EXEC SQL DECLARE csr110 CURSOR FOR
        SELECT filsys_id, label, owner, owners, phys_id, mach_id,
                type, name, modby FROM filesys ORDER BY filsys_id;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr110;
     while(1) {
        EXEC SQL FETCH csr110 INTO :id, :name, :aid, :aid2, :id2, :id3, 
@@ -493,6 +503,7 @@ phase1()
 
     EXEC SQL DECLARE csr111 CURSOR FOR
        SELECT nfsphys_id, dir, mach_id, allocated, modby FROM nfsphys;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr111;
     while(1) {
        EXEC SQL FETCH csr111 INTO :id, :name, :id2, :id3, :sid;
@@ -525,6 +536,7 @@ phase1()
        EXEC SQL DECLARE csr112 CURSOR FOR
            SELECT s1.string_id, s1.string FROM strings s1, strings s2
                WHERE s1.string=s2.string AND s1.tid != s2.tid;
+       if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
        EXEC SQL OPEN csr112;
        while(1) {
            EXEC SQL FETCH csr112 INTO :id, :buf;
@@ -545,6 +557,7 @@ phase1()
        EXEC SQL DECLARE csr113 CURSOR FOR
            SELECT k1.users_id FROM krbmap k1, krbmap k2
                WHERE k1.users_id = k2.users_id AND k1.tid != k2.tid;
+       if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
        EXEC SQL OPEN csr113;
        while(1) {
            EXEC SQL FETCH csr113 INTO :id;
@@ -561,6 +574,7 @@ phase1()
        EXEC SQL DECLARE csr114 CURSOR FOR
            SELECT k1.string_id FROM krbmap k1, krbmap k2
                WHERE k1.string_id = k2.string_id AND k1.tid != k2.tid;
+       if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
        EXEC SQL OPEN csr114;
        while(1) {
            EXEC SQL FETCH csr114 INTO :id;

diff --git a/dbck/phase2.dc b/dbck/phase2.dc
index 28f6f92b6d9d73b0de69a95d349750305082892f..c5b977bc3abf97529851f6e31e33cfe6908d3d51 100644 (file)
--- a/dbck/phase2.dc
+++ b/dbck/phase2.dc
@@ -25,6 +25,7 @@ int id;
     EXEC SQL DECLARE csr201 CURSOR FOR
       SELECT cluster.name FROM cluster, mcmap
         WHERE cluster.clu_id=mcmap.clu_id AND mcmap.mach_id = :iid;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr201;
     while(1) {
        EXEC SQL FETCH csr201 INTO :name;
@@ -52,6 +53,7 @@ int id;
     EXEC SQL DECLARE csr202 CURSOR FOR
        SELECT machine.name FROM machine, mcmap
            WHERE machine.mach_id=mcmap.mach_id AND mcmap.clu_id=:iid;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr202;
     while(1) {
        EXEC SQL FETCH csr202 INTO :name;
@@ -127,6 +129,7 @@ int id;
     EXEC SQL DECLARE csr203 CURSOR FOR
        SELECT serv_label, serv_cluster FROM svc
            WHERE clu_id = :iid;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr203;
     while(1) {
        EXEC SQL FETCH csr203 INTO :label, :data;
@@ -199,6 +202,7 @@ int id;
     EXEC SQL DECLARE csr204 CURSOR FOR
        SELECT member_type, member_id FROM imembers
            WHERE list_id = :iid AND direct=1;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr204;
     while(1) {
        EXEC SQL FETCH csr204 INTO :mtype, :mid;
@@ -232,6 +236,7 @@ int id;
     EXEC SQL DECLARE csr205 CURSOR FOR
       SELECT list_id FROM imembers
        WHERE member_id = :iid AND member_type='USER' AND direct=1;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr205;
     while(1) {
        EXEC SQL FETCH csr205 INTO :lid;
@@ -259,6 +264,7 @@ int id;
     EXEC SQL DECLARE csr206 CURSOR FOR
        SELECT list_id FROM imembers
            WHERE member_id = :iid AND member_type='LIST' AND direct=1;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr206;
     while(1) {
        EXEC SQL FETCH csr206 INTO :lid;
@@ -286,6 +292,7 @@ int id;
     EXEC SQL DECLARE csr207 CURSOR FOR
        SELECT list_id FROM imembers
            WHERE member_id = :iid AND member_type='STRING' AND direct=1;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr207;
     while(1) {
        EXEC SQL FETCH csr207 INTO :lid;
@@ -314,6 +321,7 @@ int id;
     EXEC SQL DECLARE csr208 CURSOR FOR
        SELECT list_id FROM imembers
            WHERE member_id = :iid AND member_type='KERBEROS' AND direct=1;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr208;
     while(1) {
        EXEC SQL FETCH csr208 INTO :lid;
@@ -422,6 +430,7 @@ EXEC SQL END DECLARE SECTION;
     EXEC SQL DECLARE csr209 CURSOR FOR
        SELECT service FROM serverhosts
            WHERE mach_id = :id;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr209;
     while(1) {
        EXEC SQL FETCH csr209 INTO :name;
@@ -615,6 +624,7 @@ EXEC SQL END DECLARE SECTION;
     EXEC SQL DECLARE csr210 CURSOR FOR
        SELECT filsys_id FROM fsgroup
            WHERE group_id = :id;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr210;
     while(1) {
        EXEC SQL FETCH csr210 INTO :id1;
@@ -693,6 +703,7 @@ EXEC SQL END DECLARE SECTION;
     EXEC SQL DECLARE csr211 CURSOR FOR
        SELECT group_id FROM fsgroup
            WHERE filsys_id = :id;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr211;
     while(1) {
        EXEC SQL FETCH csr211 INTO :id1;
@@ -723,6 +734,7 @@ EXEC SQL END DECLARE SECTION;
     EXEC SQL DECLARE csr212 CURSOR FOR
        SELECT filsys_id FROM quota
            WHERE entity_id = :id AND type='USER';
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr212;
     while(1) {
        EXEC SQL FETCH csr212 INTO :id1;
@@ -750,6 +762,7 @@ EXEC SQL END DECLARE SECTION;
     EXEC SQL DECLARE csr213 CURSOR FOR
        SELECT filsys_id FROM quota 
            WHERE entity_id = :id AND type='GROUP';
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr213;
     while(1) {
        EXEC SQL FETCH csr213 INTO :id1;
@@ -817,6 +830,7 @@ EXEC SQL END DECLARE SECTION;
     EXEC SQL DECLARE csr214 CURSOR FOR
        SELECT entity_id, type FROM quota
            WHERE filsys_id = :id;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr214;
     while(1) {
        EXEC SQL FETCH csr214 INTO :id1, :type;
@@ -853,6 +867,7 @@ EXEC SQL END DECLARE SECTION;
     EXEC SQL DECLARE csr215 CURSOR FOR
        SELECT entity_id, type FROM quota
            WHERE filsys_id = :id;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr215;
     while(1) {
        EXEC SQL FETCH csr215 INTO :id1, :type;
@@ -902,6 +917,7 @@ EXEC SQL END DECLARE SECTION;
     EXEC SQL DECLARE csr216 CURSOR FOR
        SELECT name FROM servers
            WHERE acl_type='USER' and acl_id = :id;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr216;
     while(1) {
        EXEC SQL FETCH csr216 INTO :name;
@@ -931,6 +947,7 @@ EXEC SQL END DECLARE SECTION;
     EXEC SQL DECLARE csr217 CURSOR FOR
        SELECT name FROM servers
            WHERE acl_type='LIST' AND acl_id = :id;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr217;
     while(1) {
        EXEC SQL FETCH csr217 INTO :name;
@@ -1000,6 +1017,7 @@ EXEC SQL END DECLARE SECTION;
     EXEC SQL DECLARE csr218 CURSOR FOR
        SELECT string_id FROM krbmap
            WHERE users_id = :id ;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr218;
     while(1) {
        EXEC SQL FETCH csr218 INTO :id1;
@@ -1035,6 +1053,7 @@ EXEC SQL END DECLARE SECTION;
     EXEC SQL DECLARE csr219 CURSOR FOR
        SELECT users_id FROM krbmap
            WHERE string_id = :id;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr219;
     while(1) {
        EXEC SQL FETCH csr219 INTO :id1;
@@ -1069,6 +1088,7 @@ EXEC SQL END DECLARE SECTION;
     EXEC SQL DECLARE csr220 CURSOR FOR
        SELECT name FROM palladium
            WHERE mach_id = :id;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr220;
     while(1) {
        EXEC SQL FETCH csr220 INTO :name;
@@ -1109,6 +1129,7 @@ phase2()
     sq2 = sq_create();
     EXEC SQL DECLARE csr221 CURSOR FOR
        SELECT mach_id, clu_id FROM mcmap;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr221;
     while(1) {
        EXEC SQL FETCH csr221 INTO :id1, :id2;
@@ -1131,6 +1152,7 @@ phase2()
     sq1 = sq_create();
     EXEC SQL DECLARE csr222 CURSOR FOR
        SELECT clu_id FROM svc;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr222;
     while(1) {
        EXEC SQL FETCH csr222 INTO :id1;
@@ -1158,6 +1180,7 @@ phase2()
     EXEC SQL DECLARE csr223 CURSOR FOR
        SELECT list_id, member_type, member_id, ref_count, direct 
        FROM imembers ORDER BY list_id;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr223;
     while(1) {
        EXEC SQL FETCH csr223 INTO :id1, :type, :id2, :id3, :id4;
@@ -1191,6 +1214,7 @@ phase2()
     sq2 = sq_create();
     EXEC SQL DECLARE csr224 CURSOR FOR
        SELECT name, acl_type, acl_id FROM servers;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr224;
     while(1) {
        EXEC SQL FETCH csr224 INTO :name, :type, :id1;
@@ -1214,6 +1238,7 @@ phase2()
     sq = sq_create();
     EXEC SQL DECLARE csr225 CURSOR FOR
        SELECT mach_id FROM serverhosts;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr225;
     while(1) {
        EXEC SQL FETCH csr225 INTO :id1;
@@ -1240,6 +1265,7 @@ phase2()
     sq3 = sq_create();
     EXEC SQL DECLARE csr226 CURSOR FOR
        SELECT group_id, filsys_id FROM fsgroup;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr226;
     while(1) {
        EXEC SQL FETCH csr226 INTO :id1, :id2;
@@ -1264,6 +1290,7 @@ phase2()
     sq4 = sq_create();
     EXEC SQL DECLARE csr227 CURSOR FOR
        SELECT entity_id, type, filsys_id, phys_id, quota FROM quota;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr227;
     while(1) {
        EXEC SQL FETCH csr227 INTO :id1, :type, :id2, :id3, :id4;
@@ -1296,6 +1323,7 @@ phase2()
     dprintf("Checking hostaccess...\n");
     EXEC SQL DECLARE csr228 CURSOR FOR
        SELECT mach_id, acl_type, acl_id FROM hostaccess;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr228;
     while(1) {
        EXEC SQL FETCH csr228 INTO :id1, :type, :id2;
@@ -1323,6 +1351,7 @@ phase2()
     sq1 = sq_create();
     EXEC SQL DECLARE csr229 CURSOR FOR
        SELECT mach_id FROM palladium;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr229;
     while(1) {
        EXEC SQL FETCH csr229 INTO :id1;
@@ -1343,6 +1372,7 @@ phase2()
     sq2 = sq_create();
     EXEC SQL DECLARE csr230 CURSOR FOR
        SELECT users_id, string_id FROM krbmap;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr230;
     while(1) {
        EXEC SQL FETCH csr230 INTO :id1, :id2;
@@ -1363,6 +1393,7 @@ phase2()
     dprintf("Checking capacls...\n");
     EXEC SQL DECLARE csr231 CURSOR FOR
        SELECT list_id, tag FROM capacls;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr231;
     while(1) {
        EXEC SQL FETCH csr231 INTO :id1, :name;

diff --git a/dbck/phase4.dc b/dbck/phase4.dc
index 66c4a085e24806f96a837a52e5ef8894568ccb7e..f90586556408c6e024c9e634281f8efe1d8ba4c3 100644 (file)
--- a/dbck/phase4.dc
+++ b/dbck/phase4.dc
@@ -106,6 +106,7 @@ phase4()
     EXEC SQL DECLARE csr401 CURSOR FOR
        SELECT mach_id, value1 FROM serverhosts
            WHERE service='POP';
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr401;
     while(1) {
        EXEC SQL FETCH csr401 INTO :id, :cnt;
@@ -143,6 +144,7 @@ count_only_setup()
        SELECT users_id, login, last, first, status, 
               potype, pop_id, box_id FROM users
            WHERE potype='POP';
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr402;
     while(1) {
        EXEC SQL FETCH csr402 INTO :id, :name, :last, :first, :status, 
@@ -179,6 +181,7 @@ count_only_setup()
     machines = create_hash(1000);
     EXEC SQL DECLARE csr403 CURSOR FOR
        SELECT mach_id, name FROM machine;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr403;
     while(1) {
        EXEC SQL FETCH csr403 INTO :id, :name;
@@ -200,6 +203,7 @@ count_only_setup()
     nfsphys = create_hash(500);
     EXEC SQL DECLARE csr404 CURSOR FOR
        SELECT nfsphys_id, dir, mach_id, allocated FROM nfsphys;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr404;
     while(1) {
        EXEC SQL FETCH csr404 INTO :id, :name, :id2, :id3;
@@ -223,6 +227,7 @@ count_only_setup()
     dprintf("Counting quotas...\n");
     EXEC SQL DECLARE csr405 CURSOR FOR
        SELECT phys_id, quota FROM quota;
+    if (sqlca.sqlcode != 0) ingerr(&sqlca.sqlcode);
     EXEC SQL OPEN csr405;
     while(1) {
        EXEC SQL FETCH csr405 INTO :id, :id2;