Mercurial > urweb

comparison src/postgres.sml @ 1564:da11f7b18067

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add an URWEB_PQ_CON environment variable, which overrides the PostgreSQL connection string.
author Austin Seipp <as@hacks.yi.org>
date Fri, 23 Sep 2011 23:11:59 -0500
parents daf71c76707e
children 8128fcb2d4a4
comparison
equal deleted inserted replaced
1563:a0caa991cdad 1564:da11f7b18067
474 newline, 474 newline,
475 newline, 475 newline,
476 476
477 string "static void uw_db_init(uw_context ctx) {", 477 string "static void uw_db_init(uw_context ctx) {",
478 newline, 478 newline,
479 string "PGconn *conn = PQconnectdb(\"", 479 string "char *env_db_str = getenv(\"URWEB_PQ_CON\");",
480 newline,
481 string "PGconn *conn = PQconnectdb(env_db_str == NULL ? \"",
480 string (String.toCString dbstring), 482 string (String.toCString dbstring),
481 string "\");", 483 string "\" : env_db_str);",
482 newline, 484 newline,
483 string "if (conn == NULL) uw_error(ctx, FATAL, ", 485 string "if (conn == NULL) uw_error(ctx, FATAL, ",
484 string "\"libpq can't allocate a connection.\");", 486 string "\"libpq can't allocate a connection.\");",
485 newline, 487 newline,
486 string "if (PQstatus(conn) != CONNECTION_OK) {", 488 string "if (PQstatus(conn) != CONNECTION_OK) {",