diff options
| author | Anders Svensson <[email protected]> | 2011-08-24 16:44:16 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2011-08-24 16:44:16 +0200 |
| commit | 3536111957c809976ed3e7091e85960990be904d (patch) | |
| tree | aafc4cf4f996ece272e6b9c3d2366061c34f08da /lib/odbc/test/postgres.erl | |
| parent | a7c0e439ee84d25ce18f65959be06315063a7de8 (diff) | |
| parent | 0c09797c725c98e5466bf6c575b7be4f2fc0e813 (diff) | |
| download | otp-3536111957c809976ed3e7091e85960990be904d.tar.gz otp-3536111957c809976ed3e7091e85960990be904d.tar.bz2 otp-3536111957c809976ed3e7091e85960990be904d.zip | |
Merge remote branch 'upstream/dev' into dev
Diffstat (limited to 'lib/odbc/test/postgres.erl')
| -rw-r--r-- | lib/odbc/test/postgres.erl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/odbc/test/postgres.erl b/lib/odbc/test/postgres.erl index 26a2913d46..d564dbd5ff 100644 --- a/lib/odbc/test/postgres.erl +++ b/lib/odbc/test/postgres.erl @@ -30,7 +30,7 @@ connection_string() -> {unix, sunos} -> "DSN=Postgres;UID=odbctest"; {unix, linux} -> - Size = erlang:system_info(wordsize), + Size = erlang:system_info({wordsize, external}), linux_dist_connection_string(Size) end. @@ -43,7 +43,12 @@ linux_dist_connection_string(4) -> end; linux_dist_connection_string(_) -> - "DSN=PostgresLinux64;UID=odbctest". + case linux_dist() of + "ubuntu" -> + "DSN=PostgresLinux64Ubuntu;UID=odbctest"; + _ -> + "DSN=PostgresLinux64;UID=odbctest" + end. linux_dist() -> case file:read_file("/etc/issue") of |