diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-06-16 15:28:00 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-06-17 12:08:30 +0200 |
| commit | e670d7bec29c5390f2f7a53a8730a0db4efc99d7 (patch) | |
| tree | 9ec77904e4c5bc6793bc9981a8c0ebf99a35c784 /lib/odbc/test/odbc_data_type_SUITE.erl | |
| parent | 364d34ddc383690a76d517e6c9bc717af40f80c6 (diff) | |
| download | otp-e670d7bec29c5390f2f7a53a8730a0db4efc99d7.tar.gz otp-e670d7bec29c5390f2f7a53a8730a0db4efc99d7.tar.bz2 otp-e670d7bec29c5390f2f7a53a8730a0db4efc99d7.zip | |
Added code to handle old postgres drivers on solaris and running against
postgres for linux 64 bits (MySQL 64 seems to be broken).
Diffstat (limited to 'lib/odbc/test/odbc_data_type_SUITE.erl')
| -rw-r--r-- | lib/odbc/test/odbc_data_type_SUITE.erl | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/lib/odbc/test/odbc_data_type_SUITE.erl b/lib/odbc/test/odbc_data_type_SUITE.erl index 3585446ec8..84c99e183b 100644 --- a/lib/odbc/test/odbc_data_type_SUITE.erl +++ b/lib/odbc/test/odbc_data_type_SUITE.erl @@ -167,31 +167,17 @@ init_per_testcase(param_insert_tiny_int = Case, Config) -> init_per_testcase(Case, Config) -> common_init_per_testcase(Case, Config). -is_supported_tinyint(sqlserver) -> - true; -is_supported_tinyint(_) -> - false. - -is_supported_bit(sqlserver) -> - true; -is_supported_bit(_) -> - false. - -is_fixed_upper_limit(mysql) -> - false; -is_fixed_upper_limit(_) -> - true. - common_init_per_testcase(Case, Config) -> + PlatformOptions = odbc_test_lib:platform_options(), case atom_to_list(Case) of "binary" ++ _ -> {ok, Ref} = odbc:connect(?RDBMS:connection_string(), - [{binary_strings, on}]); + [{binary_strings, on}] ++ PlatformOptions); "unicode" -> {ok, Ref} = odbc:connect(?RDBMS:connection_string(), - [{binary_strings, on}]); + [{binary_strings, on}] ++ PlatformOptions); _ -> - {ok, Ref} = odbc:connect(?RDBMS:connection_string(), []) + {ok, Ref} = odbc:connect(?RDBMS:connection_string(), PlatformOptions) end, odbc_test_lib:strict(Ref, ?RDBMS), Dog = test_server:timetrap(?default_timeout), @@ -199,6 +185,19 @@ common_init_per_testcase(Case, Config) -> NewConfig = lists:keydelete(watchdog, 1, Temp), [{watchdog, Dog}, {connection_ref, Ref} | NewConfig]. +is_fixed_upper_limit(mysql) -> + false; +is_fixed_upper_limit(_) -> + true. +is_supported_tinyint(sqlserver) -> + true; +is_supported_tinyint(_) -> + false. +is_supported_bit(sqlserver) -> + true; +is_supported_bit(_) -> + false. + %%-------------------------------------------------------------------- %% Function: end_per_testcase(Case, Config) -> _ %% Case - atom() @@ -212,7 +211,7 @@ end_per_testcase(_TestCase, Config) -> ok = odbc:disconnect(Ref), %% Clean up if needed Table = ?config(tableName, Config), - {ok, NewRef} = odbc:connect(?RDBMS:connection_string(), []), + {ok, NewRef} = odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()), odbc:sql_query(NewRef, "DROP TABLE " ++ Table), odbc:disconnect(NewRef), Dog = ?config(watchdog, Config), |