summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adamc@csail.mit.edu>2016-06-17 16:39:51 -0400
committerGravatar Adam Chlipala <adamc@csail.mit.edu>2016-06-17 16:39:51 -0400
commit5ac04f029f2876284e8af10275bdd63e75fc90e7 (patch)
treea8a6ad5188dbfc5425825a73c19a659c9c7c8520 /src
parent6dad7c645d8fdb7b7237c89ff7b34e90adbb86b1 (diff)
Prepare Postgres code for NULL error fields
Diffstat (limited to 'src')
-rw-r--r--src/c/urweb.c7
-rw-r--r--src/postgres.sml12
2 files changed, 13 insertions, 6 deletions
diff --git a/src/c/urweb.c b/src/c/urweb.c
index 286ec7be..afe8457b 100644
--- a/src/c/urweb.c
+++ b/src/c/urweb.c
@@ -4968,3 +4968,10 @@ void uw_Sqlcache_flush(uw_context ctx, uw_Sqlcache_Cache *cache, char **keys) {
}
pthread_rwlock_unlock(&cache->lockIn);
}
+
+int strcmp_nullsafe(const char *str1, const char *str2) {
+ if (str1)
+ return strcmp(str1, str2);
+ else
+ return 1;
+}
diff --git a/src/postgres.sml b/src/postgres.sml
index ddfe0ad6..404384d2 100644
--- a/src/postgres.sml
+++ b/src/postgres.sml
@@ -443,7 +443,7 @@ fun init {dbstring, prepared = ss, tables, views, sequences} =
newline,
newline,
string "if (PQresultStatus(res) != PGRES_COMMAND_OK) {",
- box [string "if (!strcmp(PQresultErrorField(res, PG_DIAG_SQLSTATE), \"40001\")) {",
+ box [string "if (!strcmp_nullsafe(PQresultErrorField(res, PG_DIAG_SQLSTATE), \"40001\")) {",
box [newline,
string "PQclear(res);",
newline,
@@ -451,7 +451,7 @@ fun init {dbstring, prepared = ss, tables, views, sequences} =
newline],
string "}",
newline,
- string "if (!strcmp(PQresultErrorField(res, PG_DIAG_SQLSTATE), \"40P01\")) {",
+ string "if (!strcmp_nullsafe(PQresultErrorField(res, PG_DIAG_SQLSTATE), \"40P01\")) {",
box [newline,
string "PQclear(res);",
newline,
@@ -629,7 +629,7 @@ fun queryCommon {loc, query, cols, doCols} =
string "if (PQresultStatus(res) != PGRES_TUPLES_OK) {",
newline,
- box [string "if (!strcmp(PQresultErrorField(res, PG_DIAG_SQLSTATE), \"40001\")) {",
+ box [string "if (!strcmp_nullsafe(PQresultErrorField(res, PG_DIAG_SQLSTATE), \"40001\")) {",
box [newline,
string "PQclear(res);",
newline,
@@ -637,7 +637,7 @@ fun queryCommon {loc, query, cols, doCols} =
newline],
string "}",
newline,
- string "if (!strcmp(PQresultErrorField(res, PG_DIAG_SQLSTATE), \"40P01\")) {",
+ string "if (!strcmp_nullsafe(PQresultErrorField(res, PG_DIAG_SQLSTATE), \"40P01\")) {",
box [newline,
string "PQclear(res);",
newline,
@@ -800,7 +800,7 @@ fun dmlCommon {loc, dml, mode} =
string "if (PQresultStatus(res) != PGRES_COMMAND_OK) {",
newline,
- box [string "if (!strcmp(PQresultErrorField(res, PG_DIAG_SQLSTATE), \"40001\")) {",
+ box [string "if (!strcmp_nullsafe(PQresultErrorField(res, PG_DIAG_SQLSTATE), \"40001\")) {",
box [newline,
string "PQclear(res);",
newline,
@@ -808,7 +808,7 @@ fun dmlCommon {loc, dml, mode} =
newline],
string "}",
newline,
- string "if (!strcmp(PQresultErrorField(res, PG_DIAG_SQLSTATE), \"40P01\")) {",
+ string "if (!strcmp_nullsafe(PQresultErrorField(res, PG_DIAG_SQLSTATE), \"40P01\")) {",
box [newline,
string "PQclear(res);",
newline,