From a70ee114820dd3922f3049e93981bc326af1863a Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Mon, 30 May 2011 10:32:35 +0200
Subject: Test odbc with MySQL

Updated test framework to also be able to test the erlang odbc application
with MySQL as database.

Made minor changes to error-handling to improve interoperability
with MySQL-drivers.
---
 lib/odbc/test/oracle.erl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/odbc/test/oracle.erl')

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}}]}.
-- 
cgit v1.2.3