better error checking

diff --git a/db/newmoira.dc b/db/newmoira.dc
index 4c7e4429a21046c98e6ecabc66bd44a2177a97cb..dbe90f79d8d046df9049a5e89838da0a18b194e9 100644 (file)
--- a/db/newmoira.dc
+++ b/db/newmoira.dc
@@ -124,6 +124,7 @@ char **argv;
     char buffer[256];
     char *db, *tbl, *value, *user, *query, *trans, *type;
     int i, list;
+    char stmt_buf[256];
     EXEC SQL END DECLARE SECTION;
 
     if (argc == 2)
@@ -131,7 +132,7 @@ char **argv;
     else
       db = "sms";
 #ifsql INGRES
-    EXEC SQL CONNECT db;
+    EXEC SQL CONNECT :db;
 #endsql
 #ifsql INFORMIX
     EXEC SQL DATABASE db;
@@ -143,7 +144,8 @@ char **argv;
     while (buffer[0]) {
        for (i = 0; tbl = tables[i]; i++) {
 #ifsql INGRES
-/*         EXEC SQL define permit all on table to user; */
+           sprintf(stmt_buf,"GRANT ALL PRIVILEGES ON TABLE %s TO %s",tbl,user);
+           EXEC SQL EXECUTE IMMEDIATE :stmt_buf;
 #endsql
            if (ingres_errno) {
                printf("Unable to give %s permission to access table %s\n",
@@ -174,6 +176,8 @@ char **argv;
          VALUES (:value, 1);
        if (ingres_errno) {
            printf("Unable to install initial value of %s\n", value);
+           EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+           printf("SQL error: %s\n",buffer);
            exit(1);
        }
     }
@@ -186,6 +190,8 @@ char **argv;
       VALUES ('uid', :i);
     if (ingres_errno) {
        printf("Unable to install value for uid\n");
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
 
@@ -197,6 +203,8 @@ char **argv;
       VALUES ('gid', :i);
     if (ingres_errno) {
        printf("Unable to install value for gid\n");
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
 
@@ -208,6 +216,8 @@ char **argv;
       VALUES ('def_quota', :i);
     if (ingres_errno) {
        printf("Unable to install value for def_quota\n");
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);       
        exit(1);
     }
 
@@ -216,36 +226,48 @@ char **argv;
       VALUES ('[nobody]', 'NONE', 0);
     if (ingres_errno) {
        printf("Unable to install 0 user\n");
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
     EXEC SQL INSERT INTO machine (name, type)
       VALUES ('[NONE]', 'NONE');
     if (ingres_errno) {
        printf("Unable to install 0 machine\n");
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
     EXEC SQL INSERT INTO cluster (name)
       VALUES ('[unassigned]');
     if (ingres_errno) {
        printf("Unable to install 0 cluster\n");
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
     EXEC SQL INSERT INTO list (name, acl_type)
       VALUES ('[none]', 'NONE');
     if (ingres_errno) {
        printf("Unable to install 0 list\n");
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
     EXEC SQL INSERT INTO filesys (label, type)
       VALUES ('[none]', 'NONE');
     if (ingres_errno) {
        printf("Unable to install 0 filesys\n");
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
     EXEC SQL INSERT INTO nfsphys (device)
       VALUES ('/dev/null');
     if (ingres_errno) {
        printf("Unable to install 0 nfsphys\n");
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
 
@@ -254,12 +276,16 @@ char **argv;
       VALUES ('default', 1, 'NONE');
     if (ingres_errno) {
        printf("Unable to install default user\n");
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
     EXEC SQL INSERT INTO list (name, list_id, acl_type)
       VALUES ('default', 1, 'NONE');
     if (ingres_errno) {
        printf("Unable to install default list\n");
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
     EXEC SQL INSERT INTO imembers
@@ -267,6 +293,8 @@ char **argv;
       VALUES (1, 'USER', 1, 1, 1);
     if (ingres_errno) {
        printf("Unable to install default user on default list\n");
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
 
@@ -275,12 +303,16 @@ char **argv;
       VALUES ('root', 2, 'NONE');
     if (ingres_errno) {
        printf("Unable to install root user\n");
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
     EXEC SQL INSERT INTO list (name, list_id, acl_type, acl_id)
       VALUES ('dbadmin', 2, 'LIST', 2);
     if (ingres_errno) {
        printf("Unable to install default dbadmin list\n");
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
 
@@ -292,6 +324,8 @@ char **argv;
       VALUES (:user, 3, 'NONE');
     if (ingres_errno) {
        printf("Unable to install user %s\n", buffer);
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
     EXEC SQL INSERT INTO imembers
@@ -299,6 +333,8 @@ char **argv;
       VALUES (2, 'USER', 2, 1, 1);
     if (ingres_errno) {
        printf("Unable to put user root on list dbadmin\n");
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
     EXEC SQL INSERT INTO imembers
@@ -306,6 +342,8 @@ char **argv;
       VALUES (2, 'USER', 3, 1, 1);
     if (ingres_errno) {
        printf("Unable to put user %s on list dbadmin\n", buffer);
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
 
@@ -321,6 +359,8 @@ char **argv;
          VALUES (:query, :value, :list);
        if (ingres_errno) {
            printf("Unable to install query ACL for %s (%s)\n", query, value);
+           EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+           printf("SQL error: %s\n",buffer);
            exit(1);
        }
     }
@@ -336,6 +376,11 @@ char **argv;
          VALUES (:value, :type, :trans);
     }
 
+    printf("\nNow committing work... ");
+#ifsql INGRES
+    EXEC SQL COMMIT WORK;
+#endsql
+
     printf("done.\n");
     exit(0);
 }
@@ -414,3 +459,9 @@ int count_members_of_list() {}
 int get_lists_of_member() {}
 int register_user() {}
 int followup_gpce() {}
+int prefetch_value() {}
+int prefetch_filesys() {}
+int followup_dqot() {}
+int followup_guax() {}
+int followup_uuac() {}
+int get_end_members_of_list() {}