IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Work around differing pgsql protocol and dbi name

Browse Source 
Also silence postgres notices during test.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23172 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
John Ralls 2013-09-17 23:25:11 +00:00
parent 843fd20e8a
commit 213344f378
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/backend/dbi/test/test-backend-dbi-basic.c
View File

@ -224,6 +224,7 @@ destroy_database (gchar* url)
gchar *basename = NULL;
gint portnum = 0;
gchar *port = NULL;
gchar *pgsql = "pgsql";
dbi_conn conn = NULL;
gchar *errfmt = "Unable to delete tables in %s: %s";
gint fail = 0;
@ -232,7 +233,10 @@ destroy_database (gchar* url)
gnc_uri_get_components (url, &protocol, &host, &portnum,
&username, &password, &dbname);
conn = dbi_conn_new (protocol);
if (g_strcmp0 (protocol, "postgres") == 0)
conn = dbi_conn_new (pgsql);
else
conn = dbi_conn_new (protocol);
port = g_strdup_printf ("%d", portnum);
if (conn == NULL)
{
@ -240,7 +244,7 @@ destroy_database (gchar* url)
return;
}
fail = dbi_conn_set_option (conn, "host", host);
if (!fail)
if (!fail && portnum)
fail = dbi_conn_set_option (conn, "port", port);
if (!fail)
fail = dbi_conn_set_option (conn, "dbname", dbname);
@ -580,6 +584,9 @@ test_suite_gnc_backend_dbi (void)
if (strlen (TEST_MYSQL_URL) > 0)
create_dbi_test_suite ("mysql", TEST_MYSQL_URL);
if (strlen (TEST_PGSQL_URL) > 0)
{
g_setenv ("PGOPTIONS", "-c client_min_messages=WARNING", FALSE);
create_dbi_test_suite ("postgres", TEST_PGSQL_URL);
}
}