diff options
author | Adam Chlipala <adamc@hcoop.net> | 2010-05-27 16:36:17 -0400 |
---|---|---|
committer | Adam Chlipala <adamc@hcoop.net> | 2010-05-27 16:36:17 -0400 |
commit | 4a557ce40dd17eb928bb59c2c2eb6d354f9fef06 (patch) | |
tree | e323bae4aa24f7a07c4a5c0941b14dc88b97e75a /src/sqlite.sml | |
parent | be9263be5864a7cc94cab5b971af9ff02c26cc70 (diff) |
-moduleOf command-line option; compatibility fixes and better error messages for SQLite
Diffstat (limited to 'src/sqlite.sml')
-rw-r--r-- | src/sqlite.sml | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/sqlite.sml b/src/sqlite.sml index 26cfc9d5..d628da16 100644 --- a/src/sqlite.sml +++ b/src/sqlite.sml @@ -58,7 +58,7 @@ fun checkRel (table, checkNullable) (s, xts) = newline, box [string "sqlite3_close(conn->conn);", newline, - string "uw_error(ctx, FATAL, \"Query preparation failed:\\n", + string "uw_error(ctx, FATAL, \"Query preparation failed:<br />", string q, string "\");", newline], @@ -77,7 +77,7 @@ fun checkRel (table, checkNullable) (s, xts) = newline, string "sqlite3_close(conn->conn);", newline, - string "uw_error(ctx, FATAL, \"No row returned:\\n", + string "uw_error(ctx, FATAL, \"No row returned:<br />", string q, string "\");", newline], @@ -90,7 +90,7 @@ fun checkRel (table, checkNullable) (s, xts) = newline, string "sqlite3_close(conn->conn);", newline, - string "uw_error(ctx, FATAL, \"Error getting row:\\n", + string "uw_error(ctx, FATAL, \"Error getting row:<br />", string q, string "\");", newline], @@ -104,7 +104,7 @@ fun checkRel (table, checkNullable) (s, xts) = newline, string "sqlite3_close(conn->conn);", newline, - string "uw_error(ctx, FATAL, \"Bad column count:\\n", + string "uw_error(ctx, FATAL, \"Bad column count:<br />", string q, string "\");", newline], @@ -242,7 +242,7 @@ fun init {dbstring, prepared = ss, tables, views, sequences} = string "msg[1023] = 0;", newline, uhoh false ("Error preparing statement: " - ^ String.toString s ^ "\\n%s") ["msg"]], + ^ String.toString s ^ "<br />%s") ["msg"]], string "}", newline] end) @@ -353,7 +353,7 @@ fun init {dbstring, prepared = ss, tables, views, sequences} = newline], string "else {", newline, - box [string "fprintf(stderr, \"Begin error: %s\\n\", sqlite3_errmsg(conn->conn));", + box [string "fprintf(stderr, \"Begin error: %s<br />\", sqlite3_errmsg(conn->conn));", newline, string "return 1;", newline], @@ -371,7 +371,7 @@ fun init {dbstring, prepared = ss, tables, views, sequences} = newline], string "else {", newline, - box [string "fprintf(stderr, \"Commit error: %s\\n\", sqlite3_errmsg(conn->conn));", + box [string "fprintf(stderr, \"Commit error: %s<br />\", sqlite3_errmsg(conn->conn));", newline, string "return 1;", newline], @@ -391,7 +391,7 @@ fun init {dbstring, prepared = ss, tables, views, sequences} = newline], string "else {", newline, - box [string "fprintf(stderr, \"Rollback error: %s\\n\", sqlite3_errmsg(conn->conn));", + box [string "fprintf(stderr, \"Rollback error: %s<br />\", sqlite3_errmsg(conn->conn));", newline, string "return 1;", newline], @@ -522,7 +522,7 @@ fun queryCommon {loc, query, cols, doCols} = string "if (r != SQLITE_DONE) uw_error(ctx, FATAL, \"", string (ErrorMsg.spanToString loc), - string ": query step failed: %s\\n%s\", ", + string ": query step failed: %s<br />%s\", ", query, string ", sqlite3_errmsg(conn->conn));", newline, @@ -534,7 +534,7 @@ fun query {loc, cols, doCols} = string "sqlite3_stmt *stmt;", newline, newline, - string "if (sqlite3_prepare_v2(conn->conn, query, -1, &stmt, NULL) != SQLITE_OK) uw_error(ctx, FATAL, \"Error preparing statement: %s\\n%s\", sqlite3_errmsg(conn->conn));", + string "if (sqlite3_prepare_v2(conn->conn, query, -1, &stmt, NULL) != SQLITE_OK) uw_error(ctx, FATAL, \"Error preparing statement: %s<br />%s\", sqlite3_errmsg(conn->conn), query);", newline, newline, string "uw_push_cleanup(ctx, (void (*)(void *))sqlite3_finalize, stmt);", @@ -654,7 +654,7 @@ fun queryPrepared {loc, id, query, inputs, cols, doCols, nested} = string (String.toString query), string "\", -1, &stmt, NULL) != SQLITE_OK) uw_error(ctx, FATAL, \"Error preparing statement: ", string (String.toString query), - string "\\n%s\", sqlite3_errmsg(conn->conn));", + string "<br />%s\", sqlite3_errmsg(conn->conn));", newline, if nested then box [string "uw_push_cleanup(ctx, (void (*)(void *))sqlite3_finalize, stmt);", @@ -703,7 +703,7 @@ fun dmlCommon {loc, dml} = string "if (r != SQLITE_DONE) uw_error(ctx, FATAL, \"", string (ErrorMsg.spanToString loc), - string ": DML step failed: %s\\n%s\", ", + string ": DML step failed: %s<br />%s\", ", dml, string ", sqlite3_errmsg(conn->conn));", newline] @@ -714,7 +714,7 @@ fun dml loc = string "sqlite3_stmt *stmt;", newline, newline, - string "if (sqlite3_prepare_v2(conn->conn, dml, -1, &stmt, NULL) != SQLITE_OK) uw_error(ctx, FATAL, \"Error preparing statement: %s\\n%s\", dml, sqlite3_errmsg(conn->conn));", + string "if (sqlite3_prepare_v2(conn->conn, dml, -1, &stmt, NULL) != SQLITE_OK) uw_error(ctx, FATAL, \"Error preparing statement: %s<br />%s\", dml, sqlite3_errmsg(conn->conn));", newline, newline, string "uw_push_cleanup(ctx, (void (*)(void *))sqlite3_finalize, stmt);", @@ -742,7 +742,7 @@ fun dmlPrepared {loc, id, dml, inputs} = string (String.toString dml), string "\", -1, &stmt, NULL) != SQLITE_OK) uw_error(ctx, FATAL, \"Error preparing statement: ", string (String.toString dml), - string "\\n%s\", sqlite3_errmsg(conn->conn));", + string "<br />%s\", sqlite3_errmsg(conn->conn));", newline, string "conn->p", string (Int.toString id), |