Mercurial > urweb
diff src/sqlite.sml @ 1656:3e7c7e200713
Fix handling of quotes in generating C literals
| author | Adam Chlipala <adam@chlipala.net> |
|---|---|
| date | Mon, 02 Jan 2012 17:08:39 -0500 |
| parents | 969b90b1f2f9 |
| children | ac141fbb313a |
line wrap: on
line diff
--- a/src/sqlite.sml Mon Jan 02 16:54:18 2012 -0500 +++ b/src/sqlite.sml Mon Jan 02 17:08:39 2012 -0500 @@ -1,4 +1,4 @@ -(* Copyright (c) 2009-2010, Adam Chlipala + (* Copyright (c) 2009-2010, Adam Chlipala * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -230,7 +230,7 @@ newline] in box [string "if (sqlite3_prepare_v2(conn->conn, \"", - string (String.toCString s), + string (Prim.toCString s), string "\", -1, &conn->p", string (Int.toString i), string ", NULL) != SQLITE_OK) {", @@ -242,7 +242,7 @@ string "msg[1023] = 0;", newline, uhoh false ("Error preparing statement: " - ^ String.toCString s ^ "<br />%s") ["msg"]], + ^ Prim.toCString s ^ "<br />%s") ["msg"]], string "}", newline] end) @@ -659,9 +659,9 @@ newline], string "if (sqlite3_prepare_v2(conn->conn, \"", - string (String.toCString query), + string (Prim.toCString query), string "\", -1, &stmt, NULL) != SQLITE_OK) uw_error(ctx, FATAL, \"Error preparing statement: ", - string (String.toCString query), + string (Prim.toCString query), string "<br />%s\", sqlite3_errmsg(conn->conn));", newline, if nested then @@ -685,7 +685,7 @@ newline, queryCommon {loc = loc, cols = cols, doCols = doCols, query = box [string "\"", - string (String.toCString query), + string (Prim.toCString query), string "\""]}, string "uw_pop_cleanup(ctx);", @@ -750,9 +750,9 @@ string "if (stmt == NULL) {", newline, box [string "if (sqlite3_prepare_v2(conn->conn, \"", - string (String.toCString dml), + string (Prim.toCString dml), string "\", -1, &stmt, NULL) != SQLITE_OK) uw_error(ctx, FATAL, \"Error preparing statement: ", - string (String.toCString dml), + string (Prim.toCString dml), string "<br />%s\", sqlite3_errmsg(conn->conn));", newline, string "conn->p", @@ -771,7 +771,7 @@ newline, dmlCommon {loc = loc, dml = box [string "\"", - string (String.toCString dml), + string (Prim.toCString dml), string "\""], mode = mode}, string "uw_pop_cleanup(ctx);",