diff options
author | Ingela Anderton Andin <[email protected]> | 2011-06-16 11:26:41 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2011-06-16 11:26:41 +0200 |
commit | 85d69b7881d8a213d723c675ea314689c43cbb8d (patch) | |
tree | be4c659d336958a52d72ae89e2e8501fd0dc22cc /lib/odbc/test/sqlserver.erl | |
parent | b60c05ff97b76082969f969dc8b19b61649d259b (diff) | |
parent | a70ee114820dd3922f3049e93981bc326af1863a (diff) | |
download | otp-85d69b7881d8a213d723c675ea314689c43cbb8d.tar.gz otp-85d69b7881d8a213d723c675ea314689c43cbb8d.tar.bz2 otp-85d69b7881d8a213d723c675ea314689c43cbb8d.zip |
Merge branch 'ia/odbc/mysql' into dev
* ia/odbc/mysql:
Test odbc with MySQL
Diffstat (limited to 'lib/odbc/test/sqlserver.erl')
-rw-r--r-- | lib/odbc/test/sqlserver.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/odbc/test/sqlserver.erl b/lib/odbc/test/sqlserver.erl index e3fe30e0bc..13930cd5ae 100644 --- a/lib/odbc/test/sqlserver.erl +++ b/lib/odbc/test/sqlserver.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2002-2010. All Rights Reserved. +%% Copyright Ericsson AB 2002-2011. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -279,8 +279,8 @@ param_select() -> %------------------------------------------------------------------------- describe_integer() -> - {ok,[{"int1", sql_smallint},{"int2", sql_integer}, - {"int3", sql_integer}]}. + {ok,[{"myint1", sql_smallint},{"myint2", sql_integer}, + {"myint3", sql_integer}]}. describe_string() -> {ok,[{"str1",{sql_char,10}}, @@ -292,7 +292,7 @@ describe_floating() -> {ok,[{"f", sql_real},{"r", sql_real}, {"d", {sql_float, 53}}]}. describe_dec_num() -> - {ok,[{"dec",{sql_decimal,9,3}},{"num",{sql_numeric,9,2}}]}. + {ok,[{"mydec",{sql_decimal,9,3}},{"mynum",{sql_numeric,9,2}}]}. describe_timestamp() -> {ok, [{"field", sql_timestamp}]}. |