Menu
▾
▴
[Jcframework-commits] dotnet/Providers/AF_MSOracle AF_MSOracle.vbproj,1.1,1.2 AssemblyInfo.vb,1.2,1.3 COracleConnection.vb,1.2,1.3 COracleDatabase.vb,1.1,1.2
|
From: Richard B. <rb...@us...> - 2005-04-11 00:32:35
|
Update of /cvsroot/jcframework/dotnet/Providers/AF_MSOracle In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv815/Providers/AF_MSOracle Modified Files: AF_MSOracle.vbproj AssemblyInfo.vb COracleConnection.vb COracleDatabase.vb Log Message: Name changes to bring class library into line with Microsoft naming standards. FxCop directory added Nunit tests moved into main repository Index: AssemblyInfo.vb =================================================================== RCS file: /cvsroot/jcframework/dotnet/Providers/AF_MSOracle/AssemblyInfo.vb,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- AssemblyInfo.vb 6 Apr 2005 06:34:21 -0000 1.2 +++ AssemblyInfo.vb 11 Apr 2005 00:31:45 -0000 1.3 @@ -29,5 +29,5 @@ ' You can specify all the values or you can default the Build and Revision Numbers ' by using the '*' as shown below: -<Assembly: AssemblyVersion("2.1.0.0")> -<Assembly: AssemblyFileVersion("2.1.0.0")> +<Assembly: AssemblyVersion("2.2.0.0")> +<Assembly: AssemblyFileVersion("2.2.0.0")> Index: COracleDatabase.vb =================================================================== RCS file: /cvsroot/jcframework/dotnet/Providers/AF_MSOracle/COracleDatabase.vb,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- COracleDatabase.vb 7 Feb 2005 07:37:36 -0000 1.1 +++ COracleDatabase.vb 11 Apr 2005 00:31:45 -0000 1.2 @@ -1,7 +1,7 @@ Option Strict Off Option Explicit On Imports System.Data.OracleClient -Imports AToMSFramework +Imports AtomsFramework '''----------------------------------------------------------------------------- ''' Project : AToMSFramework @@ -9,7 +9,7 @@ ''' '''----------------------------------------------------------------------------- ''' <summary> -''' Implementation of CRelationalDatabase for Oracle Database Servers. +''' Implementation of RelationalDatabase for Oracle Database Servers. ''' </summary> ''' <remarks>This class contains the specific functionality required for the ''' framework to interact with oracle databases.</remarks> @@ -18,7 +18,7 @@ ''' </history> '''----------------------------------------------------------------------------- Public Class COracleDatabase - Inherits CRelationalDatabase + Inherits RelationalDatabase Private m_user As String Private m_password As String @@ -29,14 +29,14 @@ ''' Establishes a new database connection. ''' </summary> ''' <returns>A COracleConnection containing the newly established connection.</returns> - ''' <remarks>The COracleConnection class implements the _CConnection interface which + ''' <remarks>The COracleConnection class implements the IConnection interface which ''' is required by this method. ''' <para>If the connection cannot be established an exception will be thrown.</para> ''' <history> ''' [rbanks] 23/12/2004 Created ''' </history> '''----------------------------------------------------------------------------- - Public Overrides Function getNewConnection() As _CConnection + Public Overrides Function getNewConnection() As IConnection Dim conn As New COracleConnection conn.Connection = New OracleConnection conn.ManageTransactions = True @@ -44,9 +44,9 @@ If m_user Is Nothing OrElse m_user.Length = 0 Then m_user = "" m_password = "" - Dim pbroker As CPersistenceBroker + Dim pbroker As PersistenceBroker pbroker = getPersistenceBrokerInstance() - pbroker.GetLoginDetails(Me, m_user, m_password) + pbroker.GetLogOnDetails(Me, m_user, m_password) End If If m_user = "SSPI" Then conn.Connection.ConnectionString = _ @@ -194,9 +194,9 @@ Dim row As System.Data.DataRow Dim p As OracleParameter Dim initvals() As Object = {1} - Dim x As OIDException + Dim x As ObjectIdException Dim conn As COracleConnection - conn = Me.getConnection(Nothing) + conn = Me.GetConnection conn.AutoCommit = False conn.startTransaction() Try @@ -216,10 +216,10 @@ conn.commit() Catch err As OracleException conn.rollback() - x = New OIDException(err.Message, err) + x = New ObjectIdException(err.Message, err) Catch err As Exception conn.rollback() - x = New OIDException(err.Message, err) + x = New ObjectIdException(err.Message, err) Finally Me.freeConnection(conn) If Not x Is Nothing Then @@ -243,7 +243,7 @@ ''' [rbanks] 11/12/2003 Created ''' </history> '''----------------------------------------------------------------------------- - Public Overrides Function getIdentityValue(ByVal conn As _CConnection) As Integer + Public Overrides Function getIdentityValue(ByVal conn As IConnection) As Integer Dim rs As New DataSet Dim da As New OracleDataAdapter Dim cb As OracleCommandBuilder @@ -286,7 +286,7 @@ ''' [rbanks] 23/01/2004 Created ''' </history> '''----------------------------------------------------------------------------- - Public Overrides Function getParamHolder(ByVal i As Integer) As String + Public Overrides Function getParameterHolder(ByVal i As Integer) As String Return ":p" & CStr(i) End Function @@ -302,7 +302,8 @@ Return owner & "." & table & " as " & pAlias End Function - Public Overloads Overrides Sub Dispose(ByVal disposing As Boolean) + Private m_disposed As Boolean + Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean) If Not m_disposed Then If disposing Then Dim conn As COracleConnection Index: AF_MSOracle.vbproj =================================================================== RCS file: /cvsroot/jcframework/dotnet/Providers/AF_MSOracle/AF_MSOracle.vbproj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- AF_MSOracle.vbproj 7 Feb 2005 07:37:36 -0000 1.1 +++ AF_MSOracle.vbproj 11 Apr 2005 00:31:45 -0000 1.2 @@ -20,8 +20,8 @@ OptionCompare = "Binary" OptionExplicit = "On" OptionStrict = "Off" - RootNamespace = "AF_MSOracle" - StartupObject = "" + RootNamespace = "AtomsFramework.Providers.MSOracle" + StartupObject = "AtomsFramework.Providers.MSOracle.(None)" > <Config Name = "Debug" @@ -75,7 +75,7 @@ HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.OracleClient.dll" /> <Reference - Name = "AToMSFramework" + Name = "Atoms.Framework" Project = "{8FFD05CF-E733-4D8E-BC0E-D9DD37B87384}" Package = "{F184B08F-C81C-45F6-A57F-5ABD9991F28F}" /> Index: COracleConnection.vb =================================================================== RCS file: /cvsroot/jcframework/dotnet/Providers/AF_MSOracle/COracleConnection.vb,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- COracleConnection.vb 1 Apr 2005 00:04:34 -0000 1.2 +++ COracleConnection.vb 11 Apr 2005 00:31:45 -0000 1.3 @@ -1,5 +1,5 @@ Imports System.Data.OracleClient -Imports AToMSFramework +Imports AtomsFramework '''----------------------------------------------------------------------------- ''' Project : AToMSFramework @@ -9,7 +9,7 @@ ''' <summary> ''' Connection class for Oracle data sources ''' </summary> -''' <remarks><para>This class implements the <see cref="T:AToMSFramework._CConnection"/> interface and is used +''' <remarks><para>This class implements the <see cref="T:AToMSFramework.IConnection"/> interface and is used ''' to manage connections to Oracle datasources.</para> ''' <para>The following should be taken into consideration when using this ''' class:</para> @@ -20,13 +20,13 @@ ''' first transaction created. A rollback on any nested transaction will cause all ''' outside transactions to also roll back.</para> ''' </remarks> -''' <seealso cref="T:AToMSFramework._CConnection"/> +''' <seealso cref="T:AToMSFramework.IConnection"/> ''' <history> ''' [rbanks] 23/12/2004 Created ''' </history> '''----------------------------------------------------------------------------- Public Class COracleConnection - Implements _CConnection + Implements IConnection Implements IDisposable Private m_connection As OracleConnection @@ -36,7 +36,7 @@ Private m_transaction As OracleTransaction Private m_transactioncalls As Integer Private m_references As Integer - Private m_db As _CRelationalDatabase + Private m_db As IRelationalDatabase Private Const DEBUG_MODE As Boolean = True Private m_disposed As Boolean @@ -61,7 +61,7 @@ '''----------------------------------------------------------------------------- ''' <summary> - ''' See <see cref="P:AToMSFramework._CConnection.AutoCommit">_CConnection</see>. + ''' See <see cref="P:AToMSFramework.IConnection.AutoCommit">IConnection</see>. ''' </summary> ''' <value></value> ''' <remarks></remarks> @@ -69,7 +69,7 @@ ''' [rbanks] 23/12/2004 Created ''' </history> '''----------------------------------------------------------------------------- - Public Property AutoCommit() As Boolean Implements _CConnection.AutoCommit + Public Property AutoCommit() As Boolean Implements IConnection.AutoCommit Get AutoCommit = m_autoCommit End Get @@ -80,7 +80,7 @@ '''----------------------------------------------------------------------------- ''' <summary> - ''' See <see cref="P:AToMSFramework._CConnection.Started">_CConnection</see>. + ''' See <see cref="P:AToMSFramework.IConnection.Started">IConnection</see>. ''' </summary> ''' <value></value> ''' <remarks></remarks> @@ -88,7 +88,7 @@ ''' [rbanks] 23/12/2004 Created ''' </history> '''----------------------------------------------------------------------------- - Public Property Started() As Boolean Implements _CConnection.Started + Public Property Started() As Boolean Implements IConnection.Started Get Started = m_started End Get @@ -99,7 +99,7 @@ '''----------------------------------------------------------------------------- ''' <summary> - ''' See <see cref="P:AToMSFramework._CConnection.ManageTransactions">_CConnection</see>. + ''' See <see cref="P:AToMSFramework.IConnection.ManageTransactions">IConnection</see>. ''' </summary> ''' <value></value> ''' <remarks></remarks> @@ -107,7 +107,7 @@ ''' [rbanks] 23/12/2004 Created ''' </history> '''----------------------------------------------------------------------------- - Public Property ManageTransactions() As Boolean Implements _CConnection.ManageTransactions + Public Property ManageTransactions() As Boolean Implements IConnection.ManageTransactions Get ManageTransactions = m_manageTransactions End Get @@ -118,14 +118,14 @@ '''----------------------------------------------------------------------------- ''' <summary> - ''' See <see cref="M:AToMSFramework._CConnection.commit">_CConnection</see>. + ''' See <see cref="M:AToMSFramework.IConnection.commit">IConnection</see>. ''' </summary> ''' <remarks></remarks> ''' <history> ''' [rbanks] 23/12/2004 Created ''' </history> '''----------------------------------------------------------------------------- - Public Sub commit() Implements _CConnection.commit + Public Sub commit() Implements IConnection.commit If DEBUG_MODE Then If m_transactioncalls = 1 Then System.Diagnostics.Debug.WriteLine("COMMIT TRANSACTION") @@ -160,13 +160,13 @@ '''----------------------------------------------------------------------------- ''' <summary> - ''' See <see cref="M:AToMSFramework._CConnection.startTransaction">_CConnection</see>. + ''' See <see cref="M:AToMSFramework.IConnection.startTransaction">IConnection</see>. ''' </summary> ''' <history> ''' [rbanks] 23/12/2004 Created ''' </history> '''----------------------------------------------------------------------------- - Public Overloads Sub startTransaction() Implements _CConnection.startTransaction + Public Overloads Sub startTransaction() Implements IConnection.startTransaction If DEBUG_MODE Then If m_transactioncalls = 0 Then System.Diagnostics.Debug.WriteLine("BEGIN TRANSACTION") @@ -186,7 +186,7 @@ '''----------------------------------------------------------------------------- ''' <summary> - ''' See <see cref="M:AToMSFramework._CConnection.processStatement">_CConnection</see>. + ''' See <see cref="M:AToMSFramework.IConnection.processStatement">IConnection</see>. ''' </summary> ''' <param name="statement"></param> ''' <remarks></remarks> @@ -194,10 +194,10 @@ ''' [rbanks] 23/12/2004 Created ''' </history> '''----------------------------------------------------------------------------- - Public Sub processStatement(ByVal statement As CSqlStatement) Implements _CConnection.processStatement + Public Sub processStatement(ByVal statement As AtomsSqlStatement) Implements IConnection.processStatement Dim m_command As New OracleCommand Dim m_recordcount As Integer - Dim cp As CSQLParameter + Dim cp As AtomsSqlParameter Dim param As OracleParameter Dim dd As Date @@ -228,7 +228,7 @@ '''----------------------------------------------------------------------------- ''' <summary> - ''' See <see cref="M:AToMSFramework._CConnection.processSelectStatement">_CConnection</see>. + ''' See <see cref="M:AToMSFramework.IConnection.processSelectStatement">IConnection</see>. ''' </summary> ''' <param name="statement"></param> ''' <returns></returns> @@ -237,10 +237,10 @@ ''' [rbanks] 23/12/2004 Created ''' </history> '''----------------------------------------------------------------------------- - Public Function processSelectStatement(ByVal statement As CSqlStatement) As CResultset Implements _CConnection.processSelectStatement + Public Function processSelectStatement(ByVal statement As AtomsSqlStatement) As ResultSet Implements IConnection.processSelectStatement SyncLock GetType(COracleConnection) Dim x As RetrieveException - Dim rs As New CResultset + Dim rs As New ResultSet Dim param As OracleParameter Dim dd As Date Dim m_command As New OracleCommand @@ -251,7 +251,7 @@ m_command.Connection = m_connection m_command.CommandText = statement.SqlString - For Each cp As CSQLParameter In statement.Parameters + For Each cp As AtomsSqlParameter In statement.Parameters If Not cp.Ignore Then param = New OracleParameter param.ParameterName = cp.Name @@ -280,15 +280,15 @@ '''----------------------------------------------------------------------------- ''' <summary> - ''' See <see cref="M:AToMSFramework._CConnection.rollback">_CConnection</see>. + ''' See <see cref="M:AToMSFramework.IConnection.rollback">IConnection</see>. ''' </summary> ''' <remarks></remarks> ''' <history> ''' [rbanks] 23/12/2004 Created ''' </history> '''----------------------------------------------------------------------------- - Public Sub rollback() Implements _CConnection.rollback - Dim pb As CPersistenceBroker + Public Sub rollback() Implements IConnection.rollback + Dim pb As PersistenceBroker If DEBUG_MODE Then If m_transactioncalls = 1 Then System.Diagnostics.Debug.WriteLine("ROLLBACK TRANSACTION") @@ -322,14 +322,14 @@ '''----------------------------------------------------------------------------- ''' <summary> - ''' See <see cref="M:AToMSFramework._CConnection.CloseConnection">_CConnection</see>. + ''' See <see cref="M:AToMSFramework.IConnection.CloseConnection">IConnection</see>. ''' </summary> ''' <remarks></remarks> ''' <history> ''' [rbanks] 23/12/2004 Created ''' </history> '''----------------------------------------------------------------------------- - Public Sub CloseConnection() Implements _CConnection.CloseConnection + Public Sub CloseConnection() Implements IConnection.CloseConnection m_references -= 1 If m_references = 0 Then m_connection.Close() @@ -338,7 +338,7 @@ '''----------------------------------------------------------------------------- ''' <summary> - ''' See <see cref="P:AToMSFramework._CConnection.IsClosed">_CConnection</see>. + ''' See <see cref="P:AToMSFramework.IConnection.IsClosed">IConnection</see>. ''' </summary> ''' <value></value> ''' <remarks></remarks> @@ -346,7 +346,7 @@ ''' [rbanks] 23/12/2004 Created ''' </history> '''----------------------------------------------------------------------------- - Public ReadOnly Property IsClosed() As Boolean Implements _CConnection.IsClosed + Public ReadOnly Property IsClosed() As Boolean Implements IConnection.IsClosed Get Return m_connection.State = ConnectionState.Closed End Get @@ -354,7 +354,7 @@ '''----------------------------------------------------------------------------- ''' <summary> - ''' See <see cref="P:AToMSFramework._CConnection.ReferenceCount">_CConnection</see>. + ''' See <see cref="P:AToMSFramework.IConnection.ReferenceCount">IConnection</see>. ''' </summary> ''' <value></value> ''' <remarks></remarks> @@ -362,7 +362,7 @@ ''' [rbanks] 23/12/2004 Created ''' </history> '''----------------------------------------------------------------------------- - Public Property ReferenceCount() As Integer Implements _CConnection.ReferenceCount + Public Property ReferenceCount() As Integer Implements IConnection.ReferenceCount Get Return m_references End Get @@ -373,7 +373,7 @@ '''----------------------------------------------------------------------------- ''' <summary> - ''' See <see cref="P:AToMSFramework._CConnection.getTableSchema">_CConnection</see>. + ''' See <see cref="P:AToMSFramework.IConnection.getTableSchema">IConnection</see>. ''' </summary> ''' <param name="tName"></param> ''' <returns></returns> @@ -382,7 +382,7 @@ ''' [rbanks] 23/12/2004 Created ''' </history> '''----------------------------------------------------------------------------- - Public Function getTableSchema(ByVal tName As String) As System.Data.DataTable Implements _CConnection.getTableSchema + Public Function getTableSchema(ByVal tName As String) As System.Data.DataTable Implements IConnection.getTableSchema Dim statement As String Dim cmd As OracleCommand Dim dr As OracleDataReader @@ -400,7 +400,7 @@ Return dt End Function - Public Overloads Sub startTransaction(ByVal isolationLevel As System.Data.IsolationLevel) Implements _CConnection.startTransaction + Public Overloads Sub startTransaction(ByVal isolationLevel As System.Data.IsolationLevel) Implements IConnection.startTransaction If DEBUG_MODE Then If m_transactioncalls = 0 Then System.Diagnostics.Debug.WriteLine("BEGIN TRANSACTION") @@ -418,11 +418,11 @@ End If End Sub - Public Property Database() As _CRelationalDatabase Implements _CConnection.Database + Public Property Database() As IRelationalDatabase Implements IConnection.Database Get Return m_db End Get - Set(ByVal Value As _CRelationalDatabase) + Set(ByVal Value As IRelationalDatabase) m_db = Value End Set End Property |
