aboutsummaryrefslogtreecommitdiffstats
path: root/lib/odbc/test/oracle.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2011-06-16 11:26:41 +0200
committerIngela Anderton Andin <[email protected]>2011-06-16 11:26:41 +0200
commit85d69b7881d8a213d723c675ea314689c43cbb8d (patch)
treebe4c659d336958a52d72ae89e2e8501fd0dc22cc /lib/odbc/test/oracle.erl
parentb60c05ff97b76082969f969dc8b19b61649d259b (diff)
parenta70ee114820dd3922f3049e93981bc326af1863a (diff)
downloadotp-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/oracle.erl')
-rw-r--r--lib/odbc/test/oracle.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/odbc/test/oracle.erl b/lib/odbc/test/oracle.erl
index ebf6dbb6bf..786280701d 100644
--- a/lib/odbc/test/oracle.erl
+++ b/lib/odbc/test/oracle.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
@@ -231,8 +231,8 @@ param_select() ->
%-------------------------------------------------------------------------
describe_integer() ->
- {ok,[{"INT1",{sql_decimal,38,0}},{"INT2",{sql_decimal,38,0}},
- {"INT3",{sql_decimal,38,0}}]}.
+ {ok,[{"MYINT1",{sql_decimal,38,0}},{"MYINT2",{sql_decimal,38,0}},
+ {"MYINT3",{sql_decimal,38,0}}]}.
describe_string() ->
{ok,[{"STR1",{sql_char,10}},
@@ -243,4 +243,4 @@ describe_string() ->
describe_floating() ->
{ok,[{"F",sql_double},{"R",sql_double},{"D",sql_double}]}.
describe_dec_num() ->
- {ok,[{"DEC",{sql_decimal,9,3}},{"NUM",{sql_decimal,9,2}}]}.
+ {ok,[{"MYDEC",{sql_decimal,9,3}},{"MYNUM",{sql_decimal,9,2}}]}.