2008-09-06 Daniel Morgan <monodanmorg@yahoo.com>

[mono.git] / mcs / class / System.Data.OracleClient / Test / TestOracleClient.cs

diff --git a/mcs/class/System.Data.OracleClient/Test/TestOracleClient.cs b/mcs/class/System.Data.OracleClient/Test/TestOracleClient.cs
index dddc29f310f62d9c65111bd72d4c67b4717a871e..ddcbef8bf2f980c28e7e334354af89c306e6112b 100644 (file)
--- a/mcs/class/System.Data.OracleClient/Test/TestOracleClient.cs
+++ b/mcs/class/System.Data.OracleClient/Test/TestOracleClient.cs
@@ -1255,6 +1255,8 @@ namespace Test.OracleClient
                        StringBuilder sb2 = new StringBuilder();
                        for (int z = 0; z < bytes.Length; z++) {
                                byte byt = bytes[z];
+                               if (byt < 0x10)
+                                       sb2.Append ("0");
                                sb2.Append (byt.ToString("x"));
                        }
                        if (sb2.Length > 0)
@@ -1545,7 +1547,7 @@ namespace Test.OracleClient
                        cmd3.ExecuteNonQuery ();
                        DateTime outValue = (DateTime) myParameter2.Value;
                        Console.WriteLine ("    Out Value should be: 2004-12-18");
-                       Console.WriteLine ("    Out Value: {0}", outValue.ToString ("yyyy-mm-dd"));
+                       Console.WriteLine ("    Out Value: {0}", outValue.ToString ("yyyy-MM-dd"));
                }
 
                static void ShowConnectionProperties (OracleConnection con) 
@@ -1642,13 +1644,16 @@ namespace Test.OracleClient
                        Console.WriteLine("Setup Oracle package curspkg_join...");\r
                \r
                        OracleCommand cmd = con.CreateCommand();\r
-\r
+
+                       Console.Error.WriteLine("    create or replace package curspkg_join...");\r
                        cmd.CommandText = \r
                                "CREATE OR REPLACE PACKAGE curspkg_join AS\n" +\r
                                "TYPE t_cursor IS REF CURSOR;\n" +\r
                                "Procedure open_join_cursor1 (n_EMPNO IN NUMBER, io_cursor IN OUT t_cursor);\n" +\r
                                "END curspkg_join;";\r
-                       cmd.ExecuteNonQuery();\r
+                       cmd.ExecuteNonQuery();
+\r
+                       Console.Error.WriteLine("    create or replace package body curspkg_join...");                  
                        cmd.CommandText = \r
                                "CREATE OR REPLACE PACKAGE BODY curspkg_join AS\n" +\r
                                "   Procedure open_join_cursor1 (n_EMPNO IN NUMBER, io_cursor IN OUT t_cursor)\n" +\r
@@ -1658,26 +1663,29 @@ namespace Test.OracleClient
                                "        IF n_EMPNO <> 0 THEN\n" +\r
                                "             OPEN v_cursor FOR\n" +\r
                                "             SELECT EMP.EMPNO, EMP.ENAME, DEPT.DEPTNO, DEPT.DNAME\n" +\r
-                               "                  FROM EMP, DEPT\n" +\r
+                               "                  FROM SCOTT.EMP, SCOTT.DEPT\n" +\r
                                "                  WHERE EMP.DEPTNO = DEPT.DEPTNO\n" +\r
                                "                  AND EMP.EMPNO = n_EMPNO;\n" +\r
                                "\n" +\r
                                "        ELSE\n" +\r
                                "             OPEN v_cursor FOR\n" +\r
                                "             SELECT EMP.EMPNO, EMP.ENAME, DEPT.DEPTNO, DEPT.DNAME\n" +\r
-                               "                  FROM EMP, DEPT\n" +\r
+                               "                  FROM SCOTT.EMP, SCOTT.DEPT\n" +\r
                                "                  WHERE EMP.DEPTNO = DEPT.DEPTNO;\n" +\r
                                "\n" +\r
                                "        END IF;\n" +\r
                                "        io_cursor := v_cursor;\n" +\r
                                "   END open_join_cursor1;\n" +\r
                                "END curspkg_join;";\r
+                       cmd.ExecuteNonQuery();
+
+                       cmd.CommandText = "commit";\r
                        cmd.ExecuteNonQuery();\r
                }\r
 \r
                public static void RefCursorTest4(OracleConnection connection) \r
                {\r
-                       Console.WriteLine("Setup test package and data...");\r
+                       Console.WriteLine("Setup test package and data for RefCursorTest4...");\r
                        OracleCommand cmddrop = connection.CreateCommand();\r
 \r
                        cmddrop.CommandText = "DROP TABLE TESTTABLE";\r
@@ -1696,7 +1704,7 @@ namespace Test.OracleClient
                        cmd.CommandText = \r
                                "create table TESTTABLE (\n" +\r
                                " col1 numeric(18,0),\n" +\r
-                               " col2 varchar(32),\n" +\r
+                               " col2 char(32),\n" +\r
                                " col3 date)";\r
                        cmd.ExecuteNonQuery();\r
 \r
@@ -1767,7 +1775,7 @@ namespace Test.OracleClient
                                Console.WriteLine("Row {0}", r);\r
                                for (int f = 0; f < reader.FieldCount; f ++) {\r
                                        object val = reader.GetValue(f);\r
-                                       Console.WriteLine("    Field {0} Value: {1}", f, val);\r
+                                       Console.WriteLine("    Field {0} Value: {1}", f, val.ToString());\r
                                }\r
                                r ++;\r
                        }\r