2005-10-24 Sebastien Pouliot <sebastien@ximian.com>

[mono.git] / mcs / class / System.Data.OracleClient / System.Data.OracleClient.Oci / OciEnvironmentHandle.cs

diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciEnvironmentHandle.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciEnvironmentHandle.cs
index 2d7af6db0dcec719fa78583764d9ee92c0f633fe..663fe51f6e15d3d0cdf7b6058c87ad975c8574fe 100644 (file)
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciEnvironmentHandle.cs
+++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciEnvironmentHandle.cs
@@ -19,14 +19,8 @@ using System;
 using System.Runtime.InteropServices;
 
 namespace System.Data.OracleClient.Oci {
-       internal class OciEnvironmentHandle : IOciHandle, IDisposable
+       internal class OciEnvironmentHandle : OciHandle, IDisposable
        {
-               #region Fields
-
-               IntPtr handle;
-
-               #endregion // Fields
-
                #region Constructors
 
                public OciEnvironmentHandle ()
@@ -35,143 +29,24 @@ namespace System.Data.OracleClient.Oci {
                }
 
                public OciEnvironmentHandle (OciEnvironmentMode mode)
-               {
-                       int status = 0;
-                       this.handle = IntPtr.Zero;
-
-                       status = OCIEnvCreate (out handle, mode, 
-                                       IntPtr.Zero, 
-                                       IntPtr.Zero, 
-                                       IntPtr.Zero, 
-                                       IntPtr.Zero, 
-                                       0, 
-                                       IntPtr.Zero);
-               }
-
-               #endregion // Constructors
-
-               #region Properties
-
-               public IntPtr Handle { 
-                       get { return handle; }
-                       set { handle = value; }
-               }
-
-               public OciHandleType HandleType {
-                       get { return OciHandleType.Environment; }
-               }
-
-               #endregion // Properties
-
-               #region Methods
-
-               [DllImport ("oci")]
-               public static extern int OCIEnvCreate (out IntPtr envhpp,
-                                                       [MarshalAs (UnmanagedType.U4)] OciEnvironmentMode mode,
-                                                       IntPtr ctxp,
-                                                       IntPtr malocfp,
-                                                       IntPtr ralocfp,
-                                                       IntPtr mfreep,
-                                                       int xtramem_sz,
-                                                       IntPtr usrmempp);
-
-               [DllImport ("oci")]
-               public static extern int OCIHandleAlloc (IntPtr parenth,
-                                                       out IntPtr hndlpp,
-                                                       [MarshalAs (UnmanagedType.U4)] OciHandleType type,
-                                                       int xtramem_sz,
-                                                       IntPtr usrmempp);
-
-               [DllImport ("oci")]
-               public static extern int OCIDescriptorAlloc (IntPtr parenth,
-                                                       out IntPtr descpp,
-                                                       [MarshalAs (UnmanagedType.U4)] OciDescriptorType type,
-                                                       int xtramem_sz,
-                                                       IntPtr usrmempp);
-
-               [DllImport ("oci")]
-               public static extern int OCIHandleFree (IntPtr hndlp, 
-                                                       [MarshalAs (UnmanagedType.U4)] OciHandleType type);
-
-               [DllImport ("oci")]
-               public static extern int OCIDescriptorFree (IntPtr hndlp, 
-                                                       [MarshalAs (UnmanagedType.U4)] OciDescriptorType type);
-
-
-               public IOciHandle Allocate (OciHandleType type)
+                       : base (OciHandleType.Environment, null, IntPtr.Zero)
                {
                        IntPtr newHandle = IntPtr.Zero;
-                       int status = 0;
-
-                       status = OCIHandleAlloc (Handle,
-                                               out newHandle,
-                                               type,
-                                               0,
-                                               IntPtr.Zero);
-
-                       if (status != 0 && status != 1) 
-                               return null;
-
-                       switch (type) {
-                               case OciHandleType.Service:
-                                       return new OciServiceHandle (this, newHandle);
-                               case OciHandleType.Error:
-                                       return new OciErrorHandle (this, newHandle);
-                               case OciHandleType.Server:
-                                       return new OciServerHandle (this, newHandle);
-                               case OciHandleType.Session:
-                                       return new OciSessionHandle (this, newHandle);
-                               case OciHandleType.Statement:
-                                       return new OciStatementHandle (this, newHandle);
-                               case OciHandleType.Transaction:
-                                       return new OciTransactionHandle (this, newHandle);
-                               default:
-                                       OCIHandleFree (newHandle, type);
-                                       newHandle = IntPtr.Zero;
-                                       throw new ArgumentException ("Invalid handle type.");
-                       }
-               }
-
-               public IOciDescriptorHandle AllocateDescriptor (OciDescriptorType type)
-               {
-                       IntPtr newHandle = IntPtr.Zero;
-                       int status = 0;
-
-                       status = OCIDescriptorAlloc (Handle,
-                                               out newHandle,
-                                               type,
-                                               0,
+                       OciCalls.OCIEnvCreate (out newHandle, 
+                                               mode, 
+                                               IntPtr.Zero, 
+                                               IntPtr.Zero, 
+                                               IntPtr.Zero, 
+                                               IntPtr.Zero, 
+                                               0, 
                                                IntPtr.Zero);
 
-                       if (status != 0 && status != 1) 
-                               return null;
-
-                       switch (type) {
-                               case OciDescriptorType.LobLocator:
-                                       return new OciLobLocator (this, newHandle);
-                               default:
-                                       OCIDescriptorFree (newHandle, type);
-                                       newHandle = IntPtr.Zero;
-                                       throw new ArgumentException ("Invalid handle type.");
-                       }
-               }
-
-               public void Dispose ()
-               {
-                       FreeHandle (this);
+                       SetHandle (newHandle);
                }
 
-               public void FreeHandle (IOciHandle toBeDisposed)
-               {
-                       OCIHandleFree (toBeDisposed.Handle, toBeDisposed.HandleType);
-                       toBeDisposed.Handle = IntPtr.Zero;
-               }
+               #endregion // Constructors
 
-               public void FreeDescriptor (IOciDescriptorHandle toBeDisposed)
-               {
-                       OCIDescriptorFree (toBeDisposed.Handle, toBeDisposed.HandleType);
-                       toBeDisposed.Handle = IntPtr.Zero;
-               }
+               #region Methods
 
                public OciErrorInfo HandleError ()
                {
@@ -182,7 +57,7 @@ namespace System.Data.OracleClient.Oci {
                        info.ErrorCode = 0;
                        info.ErrorMessage = String.Empty;
 
-                       OciGlue.OCIErrorGet (handle,
+                       OciCalls.OCIErrorGet (Handle,
                                        1,
                                        IntPtr.Zero,
                                        out info.ErrorCode,