Expunging non-nullable rows

1 files changed, 115 insertions, 106 deletions

diff --git a/src/cjr_print.sml b/src/cjr_print.sml
index 351180b7..21e53a51 100644
--- a/src/cjr_print.sml
+++ b/src/cjr_print.sml
@@ -1937,119 +1937,128 @@ fun p_decl env (dAll as (d, _) : decl) =
                             string x,
                             string " */",
                             newline]
-      | DDatabase s => box [string "static void uw_db_validate(uw_context);",
-                            newline,
-                            string "static void uw_db_prepare(uw_context);",
-                            newline,
-                            newline,
-                            string "void uw_db_init(uw_context ctx) {",
-                            newline,
-                            string "PGconn *conn = PQconnectdb(\"",
-                            string (String.toString s),
-                            string "\");",
-                            newline,
-                            string "if (conn == NULL) uw_error(ctx, BOUNDED_RETRY, ",
-                            string "\"libpq can't allocate a connection.\");",
-                            newline,
-                            string "if (PQstatus(conn) != CONNECTION_OK) {",
-                            newline,
-                            box [string "char msg[1024];",
+      | DDatabase (s, n) => box [string "static void uw_db_validate(uw_context);",
                                  newline,
-                                 string "strncpy(msg, PQerrorMessage(conn), 1024);",
+                                 string "static void uw_db_prepare(uw_context);",
                                  newline,
-                                 string "msg[1023] = 0;",
                                  newline,
-                                 string "PQfinish(conn);",
+                                 string "void uw_db_init(uw_context ctx) {",
                                  newline,
-                                 string "uw_error(ctx, BOUNDED_RETRY, ",
-                                 string "\"Connection to Postgres server failed: %s\", msg);"],
-                            newline,
-                            string "}",
-                            newline,
-                            string "uw_set_db(ctx, conn);",
-                            newline,
-                            string "uw_db_validate(ctx);",
-                            newline,
-                            string "uw_db_prepare(ctx);",
-                            newline,
-                            string "}",
-                            newline,
-                            newline,
-                            string "void uw_db_close(uw_context ctx) {",
-                            newline,
-                            string "PQfinish(uw_get_db(ctx));",
-                            newline,
-                            string "}",
-                            newline,
-                            newline,
-
-                            string "int uw_db_begin(uw_context ctx) {",
-                            newline,
-                            string "PGconn *conn = uw_get_db(ctx);",
-                            newline,
-                            string "PGresult *res = PQexec(conn, \"BEGIN ISOLATION LEVEL SERIALIZABLE\");",
-                            newline,
-                            newline,
-                            string "if (res == NULL) return 1;",
-                            newline,
-                            newline,
-                            string "if (PQresultStatus(res) != PGRES_COMMAND_OK) {",
-                            box [string "PQclear(res);",
+                                 string "PGconn *conn = PQconnectdb(\"",
+                                 string (String.toString s),
+                                 string "\");",
                                  newline,
-                                 string "return 1;",
-                                 newline],
-                            string "}",
-                            newline,
-                            string "return 0;",
-                            newline,
-                            string "}",
-                            newline,
-                            newline,
-
-                            string "int uw_db_commit(uw_context ctx) {",
-                            newline,
-                            string "PGconn *conn = uw_get_db(ctx);",
-                            newline,
-                            string "PGresult *res = PQexec(conn, \"COMMIT\");",
-                            newline,
-                            newline,
-                            string "if (res == NULL) return 1;",
-                            newline,
-                            newline,
-                            string "if (PQresultStatus(res) != PGRES_COMMAND_OK) {",
-                            box [string "PQclear(res);",
+                                 string "if (conn == NULL) uw_error(ctx, BOUNDED_RETRY, ",
+                                 string "\"libpq can't allocate a connection.\");",
                                  newline,
-                                 string "return 1;",
-                                 newline],
-                            string "}",
-                            newline,
-                            string "return 0;",
-                            newline,
-                            string "}",
-                            newline,
-                            newline,
-
-                            string "int uw_db_rollback(uw_context ctx) {",
-                            newline,
-                            string "PGconn *conn = uw_get_db(ctx);",
-                            newline,
-                            string "PGresult *res = PQexec(conn, \"ROLLBACK\");",
-                            newline,
-                            newline,
-                            string "if (res == NULL) return 1;",
-                            newline,
-                            newline,
-                            string "if (PQresultStatus(res) != PGRES_COMMAND_OK) {",
-                            box [string "PQclear(res);",
+                                 string "if (PQstatus(conn) != CONNECTION_OK) {",
                                  newline,
-                                 string "return 1;",
-                                 newline],
-                            string "}",
-                            newline,
-                            string "return 0;",
-                            newline,
-                            string "}",
-                            newline]
+                                 box [string "char msg[1024];",
+                                      newline,
+                                      string "strncpy(msg, PQerrorMessage(conn), 1024);",
+                                      newline,
+                                      string "msg[1023] = 0;",
+                                      newline,
+                                      string "PQfinish(conn);",
+                                      newline,
+                                      string "uw_error(ctx, BOUNDED_RETRY, ",
+                                      string "\"Connection to Postgres server failed: %s\", msg);"],
+                                 newline,
+                                 string "}",
+                                 newline,
+                                 string "uw_set_db(ctx, conn);",
+                                 newline,
+                                 string "uw_db_validate(ctx);",
+                                 newline,
+                                 string "uw_db_prepare(ctx);",
+                                 newline,
+                                 string "}",
+                                 newline,
+                                 newline,
+                                 string "void uw_db_close(uw_context ctx) {",
+                                 newline,
+                                 string "PQfinish(uw_get_db(ctx));",
+                                 newline,
+                                 string "}",
+                                 newline,
+                                 newline,
+
+                                 string "int uw_db_begin(uw_context ctx) {",
+                                 newline,
+                                 string "PGconn *conn = uw_get_db(ctx);",
+                                 newline,
+                                 string "PGresult *res = PQexec(conn, \"BEGIN ISOLATION LEVEL SERIALIZABLE\");",
+                                 newline,
+                                 newline,
+                                 string "if (res == NULL) return 1;",
+                                 newline,
+                                 newline,
+                                 string "if (PQresultStatus(res) != PGRES_COMMAND_OK) {",
+                                 box [string "PQclear(res);",
+                                      newline,
+                                      string "return 1;",
+                                      newline],
+                                 string "}",
+                                 newline,
+                                 string "return 0;",
+                                 newline,
+                                 string "}",
+                                 newline,
+                                 newline,
+
+                                 string "int uw_db_commit(uw_context ctx) {",
+                                 newline,
+                                 string "PGconn *conn = uw_get_db(ctx);",
+                                 newline,
+                                 string "PGresult *res = PQexec(conn, \"COMMIT\");",
+                                 newline,
+                                 newline,
+                                 string "if (res == NULL) return 1;",
+                                 newline,
+                                 newline,
+                                 string "if (PQresultStatus(res) != PGRES_COMMAND_OK) {",
+                                 box [string "PQclear(res);",
+                                      newline,
+                                      string "return 1;",
+                                      newline],
+                                 string "}",
+                                 newline,
+                                 string "return 0;",
+                                 newline,
+                                 string "}",
+                                 newline,
+                                 newline,
+
+                                 string "int uw_db_rollback(uw_context ctx) {",
+                                 newline,
+                                 string "PGconn *conn = uw_get_db(ctx);",
+                                 newline,
+                                 string "PGresult *res = PQexec(conn, \"ROLLBACK\");",
+                                 newline,
+                                 newline,
+                                 string "if (res == NULL) return 1;",
+                                 newline,
+                                 newline,
+                                 string "if (PQresultStatus(res) != PGRES_COMMAND_OK) {",
+                                 box [string "PQclear(res);",
+                                      newline,
+                                      string "return 1;",
+                                      newline],
+                                 string "}",
+                                 newline,
+                                 string "return 0;",
+                                 newline,
+                                 string "}",
+                                 newline,
+                                 newline,
+
+                                 string "void uw_expunger(uw_context ctx, uw_Basis_client cli) {",
+                                 newline,
+                                 box [p_enamed env n,
+                                      string "(ctx, cli);",
+                                      newline],
+                                 string "}",
+                                 newline]
 
       | DPreparedStatements [] =>
         box [string "static void uw_db_prepare(uw_context ctx) {",