diff options
11 files changed, 37 insertions, 24 deletions
diff --git a/mcs/class/Mono.Data.SybaseClient/ChangeLog b/mcs/class/Mono.Data.SybaseClient/ChangeLog index aeca60b9540..fb2cc33b8b2 100644 --- a/mcs/class/Mono.Data.SybaseClient/ChangeLog +++ b/mcs/class/Mono.Data.SybaseClient/ChangeLog @@ -1,3 +1,18 @@ +2002-11-21 Tim Coleman <tim@timcoleman.com> + * Mono.Data.SybaseClient.build: + * Mono.Data.SybaseClient/SybaseCommand.cs: + * Mono.Data.SybaseClient/SybaseConnection.cs: + * Mono.Data.SybaseClient/SybaseConnectionPool.cs: + * Mono.Data.SybaseClient/SybaseDataReader.cs: + * Mono.Data.SybaseClient/SybaseException.cs: + * Mono.Data.SybaseClient/SybaseInfoMessageEventArgs.cs: + * Mono.Data.SybaseClient/SybaseParameter.cs: + * Mono.Data.SybaseClient/SybaseTransaction.cs: + * Mono.Data.SybaseTypes/SybaseDecimal.cs: + Modify to accept new Mono.Data.Tds.Protocol + namespace in Mono.Data.Tds assembly, replacing + Mono.Data.TdsClient.Internal + 2002-11-19 Tim Coleman <tim@timcoleman.com> * Mono.Data.SybaseClient/SybaseCommand.cs: Fix BuildExec to work. diff --git a/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient.build b/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient.build index 26747f5d561..b5435f230d6 100644 --- a/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient.build +++ b/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient.build @@ -2,7 +2,7 @@ <!-- NAnt build file for Mono.Data.SybaseClient.dll --> -<project name="System.Data" default="build"> +<project name="Mono.Data.SybaseClient" default="build"> <property name="debug" value="false"/> <target name="build"> @@ -19,10 +19,10 @@ <arg value="/r:System.Data.dll"/> <arg value="/r:System.EnterpriseServices.dll"/> <arg value="/r:System.Xml.dll"/> - <sources basedir=".."> - <includes name="Mono.Data.TdsClient/Mono.Data.TdsClient.Internal/*.cs"/> - <includes name="Mono.Data.SybaseClient/**/*.cs"/> - <excludes name="System.Data/Test/**"/> + <arg value="/r:../lib/Mono.Data.Tds.dll"/> + <sources> + <includes name="**/*.cs"/> + <excludes name="Test/**"/> </sources> <references> <includes name="../lib/corlib.dll"/> @@ -30,15 +30,14 @@ <includes name="../lib/System.Data.dll"/> <includes name="../lib/System.EnterpriseServices.dll"/> <includes name="../lib/System.Xml.dll"/> + <includes name="../lib/Mono.Data.Tds.dll"/> </references> </csc> - <!-- <copy file="../lib/Mono.Data.SybaseClient.dll" tofile="Test/Mono.Data.SybaseClient.dll"/> --> </target> <target name="test" depends="build"> <nant basedir="Test" target="test"/> </target> <target name="clean"> <delete file="../lib/Mono.Data.SybaseClient.dll" failonerror="false"/> - <!-- <delete file="Test/Mono.Data.SybaseClient.dll" failonerror="false"/> --> </target> </project> diff --git a/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseCommand.cs b/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseCommand.cs index 0c08ef22bad..eb4098673c7 100644 --- a/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseCommand.cs +++ b/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseCommand.cs @@ -11,7 +11,7 @@ // Copyright (C) Tim Coleman, 2002 // -using Mono.Data.TdsClient.Internal; +using Mono.Data.Tds.Protocol; using System; using System.Collections; using System.Collections.Specialized; diff --git a/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseConnection.cs b/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseConnection.cs index 64546eb14c2..20bba7c25c4 100644 --- a/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseConnection.cs +++ b/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseConnection.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2002 // -using Mono.Data.TdsClient.Internal; +using Mono.Data.Tds.Protocol; using System; using System.Collections; using System.Collections.Specialized; diff --git a/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseConnectionPool.cs b/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseConnectionPool.cs index 7cd91a87c8e..8f6760815b8 100644 --- a/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseConnectionPool.cs +++ b/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseConnectionPool.cs @@ -7,7 +7,7 @@ // Copyright (C) 2002 Tim Coleman // -using Mono.Data.TdsClient.Internal; +using Mono.Data.Tds.Protocol; using System; using System.Collections; using System.Threading; @@ -45,8 +45,8 @@ namespace Mono.Data.SybaseClient { #region Properties - public Tds this[int index] { - get { return (Tds) list[index]; } + public ITds this[int index] { + get { return (ITds) list[index]; } } object IList.this[int index] { @@ -88,7 +88,7 @@ namespace Mono.Data.SybaseClient { public int Add (object o) { - return list.Add ((Tds) o); + return list.Add ((ITds) o); } public void Clear () @@ -98,7 +98,7 @@ namespace Mono.Data.SybaseClient { public bool Contains (object o) { - return list.Contains ((Tds) o); + return list.Contains ((ITds) o); } public void CopyTo (Array array, int index) @@ -126,7 +126,7 @@ namespace Mono.Data.SybaseClient { return (ITds) o; if (Count < maxSize) { - Tds tds = new Tds50 (dataSource, port, packetSize, timeout); + ITds tds = new Tds50 (dataSource, port, packetSize, timeout); Monitor.Enter (tds); Add (tds); return tds; @@ -144,17 +144,17 @@ namespace Mono.Data.SybaseClient { public int IndexOf (object o) { - return list.IndexOf ((Tds) o); + return list.IndexOf ((ITds) o); } public void Insert (int index, object o) { - list.Insert (index, (Tds) o); + list.Insert (index, (ITds) o); } public void Remove (object o) { - list.Remove ((Tds) o); + list.Remove ((ITds) o); } public void RemoveAt (int index) diff --git a/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseDataReader.cs b/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseDataReader.cs index 430ccb64437..188f89a95f6 100644 --- a/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseDataReader.cs +++ b/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseDataReader.cs @@ -12,7 +12,7 @@ // using Mono.Data.SybaseTypes; -using Mono.Data.TdsClient.Internal; +using Mono.Data.Tds.Protocol; using System; using System.Collections; using System.ComponentModel; diff --git a/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseException.cs b/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseException.cs index 120e6162b32..94db7800b92 100644 --- a/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseException.cs +++ b/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseException.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2002 // -using Mono.Data.TdsClient.Internal; +using Mono.Data.Tds.Protocol; using System; using System.Data; using System.Runtime.Serialization; diff --git a/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseInfoMessageEventArgs.cs b/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseInfoMessageEventArgs.cs index faa861dc408..022bd0bb95a 100644 --- a/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseInfoMessageEventArgs.cs +++ b/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseInfoMessageEventArgs.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2002 // -using Mono.Data.TdsClient.Internal; +using Mono.Data.Tds.Protocol; using System; using System.Data; diff --git a/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseParameter.cs b/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseParameter.cs index caf9746372b..d271392e9bc 100644 --- a/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseParameter.cs +++ b/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseParameter.cs @@ -10,7 +10,7 @@ // Copyright (C) Tim Coleman, 2002 // -using Mono.Data.TdsClient.Internal; +using Mono.Data.Tds.Protocol; using System; using System.ComponentModel; using System.Data; diff --git a/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseTransaction.cs b/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseTransaction.cs index b52068ce3aa..2e324ae3cbe 100644 --- a/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseTransaction.cs +++ b/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseTransaction.cs @@ -7,7 +7,6 @@ // Copyright (C) Tim Coleman, 2002 // -using Mono.Data.TdsClient; using System; using System.Data; using System.Data.Common; diff --git a/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseTypes/SybaseDecimal.cs b/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseTypes/SybaseDecimal.cs index 8bcfd3ff6ba..aa1f5ddb297 100644 --- a/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseTypes/SybaseDecimal.cs +++ b/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseTypes/SybaseDecimal.cs @@ -7,7 +7,7 @@ // (C) Copyright Tim Coleman, 2002 // -using Mono.Data.TdsClient.Internal; +using Mono.Data.Tds.Protocol; using System; using System.Data.SqlTypes; using System.Globalization; |