adapdev-commits Mailing List for Adapdev.NET (Page 4)
Status: Beta
Brought to you by:
intesar66
Menu
▾
▴
adapdev-commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(26) |
Apr
(59) |
May
(37) |
Jun
(53) |
Jul
(13) |
Aug
(7) |
Sep
(5) |
Oct
(74) |
Nov
(404) |
Dec
(14) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(10) |
Feb
(26) |
Mar
(64) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Sean M. <int...@us...> - 2006-02-19 06:17:24
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/MySql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14337/src/Adapdev.Data/Sql/MySql Added Files: MySqlCriteria.cs MySqlDeleteQuery.cs MySqlInsertQuery.cs MySqlSelectQuery.cs MySqlUpdateQuery.cs Log Message: --- NEW FILE: MySqlDeleteQuery.cs --- using System; namespace Adapdev.Data.Sql { /// <summary> /// Summary description for MySqlDeleteQuery. /// </summary> public class MySqlDeleteQuery : DeleteQuery { public MySqlDeleteQuery():base(DbType.MYSQL, DbProviderType.MYSQL){} public MySqlDeleteQuery(string table):base(DbType.MYSQL, DbProviderType.MYSQL, table){} } } --- NEW FILE: MySqlCriteria.cs --- namespace Adapdev.Data.Sql { using System.Collections; using System.Text; using Adapdev.Text; /// <summary> /// Summary description for MySqlCriteria. /// </summary> public class MySqlCriteria : Criteria { public MySqlCriteria() : base(DbType.MYSQL, DbProviderType.MYSQL) { } public MySqlCriteria(string sql) : base(DbType.MYSQL, DbProviderType.MYSQL, sql) { } } } --- NEW FILE: MySqlInsertQuery.cs --- using System; namespace Adapdev.Data.Sql { /// <summary> /// Summary description for MySqlInsertQuery. /// </summary> public class MySqlInsertQuery : InsertQuery { public MySqlInsertQuery():base(DbType.MYSQL, DbProviderType.MYSQL){} public MySqlInsertQuery(string table):base(DbType.MYSQL, DbProviderType.MYSQL, table){} } } --- NEW FILE: MySqlSelectQuery.cs --- using System; namespace Adapdev.Data.Sql { /// <summary> /// Summary description for MySqlSelectQuery. /// </summary> public class MySqlSelectQuery : SelectQuery { public MySqlSelectQuery():base(DbType.MYSQL, DbProviderType.MYSQL){} public MySqlSelectQuery(string table):base(DbType.MYSQL, DbProviderType.MYSQL, table){} protected override string GetLimit() { if (maxRecords > 0) { return " LIMIT " + maxRecords; } return ""; } public override string GetText() { return "SELECT " + this.GetColumns() + " FROM " + this._table + this._join + this.GetCriteria() + this.GetOrderBy() + this.GetGroupBy() + this.GetLimit(); } } } --- NEW FILE: MySqlUpdateQuery.cs --- using System; namespace Adapdev.Data.Sql { /// <summary> /// Summary description for MySqlUpdateQuery. /// </summary> public class MySqlUpdateQuery : UpdateQuery { public MySqlUpdateQuery():base(DbType.MYSQL, DbProviderType.MYSQL){} public MySqlUpdateQuery(string table):base(DbType.MYSQL, DbProviderType.MYSQL, table){} } } |
|
From: Sean M. <int...@us...> - 2006-02-19 06:15:34
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/Access In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13581/Access Log Message: Directory /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/Access added to the repository |
|
From: Sean M. <int...@us...> - 2006-02-19 06:15:34
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/Oracle In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13581/Oracle Log Message: Directory /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/Oracle added to the repository |
|
From: Sean M. <int...@us...> - 2006-02-19 06:15:33
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/MySql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13581/MySql Log Message: Directory /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/MySql added to the repository |
|
From: Sean M. <int...@us...> - 2006-02-19 06:15:32
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/MsSql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13581/MsSql Log Message: Directory /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/MsSql added to the repository |
|
From: Sean M. <int...@us...> - 2006-02-19 06:14:05
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Tests/Reflection In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12892/src/Adapdev.Tests/Reflection Modified Files: ClassAccessorTest.cs FieldAccessorTest.cs FieldAccessorTestObject.cs Log Message: Index: ClassAccessorTest.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Tests/Reflection/ClassAccessorTest.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ClassAccessorTest.cs 16 Nov 2005 07:01:52 -0000 1.3 --- ClassAccessorTest.cs 19 Feb 2006 06:13:55 -0000 1.4 *************** *** 13,17 **** { [Test] ! public void SetAndGet() { PropertyAccessorTestObject o = new PropertyAccessorTestObject(); --- 13,17 ---- { [Test] ! public void SetAndGetProperties() { PropertyAccessorTestObject o = new PropertyAccessorTestObject(); *************** *** 32,35 **** --- 32,98 ---- [Test] + public void SetAndGetFields() + { + FieldAccessorTestObject o = new FieldAccessorTestObject(); + ClassAccessor c = new ClassAccessor(o); + + c.SetFieldValue(o, "mBool", false); + c.SetFieldValue(o, "mInt", 3); + int i = (int)c.GetFieldValue(o, "mInt"); + bool b = (bool)c.GetFieldValue(o, "mBool"); + + Assert.AreEqual(3, o.Int, "Int should be 3."); + Assert.AreEqual(false, o.Bool, "Bool should be false."); + + Assert.AreEqual(3, i, "Returned Int should be 3."); + Assert.AreEqual(false, b, "Returned Bool should be false."); + + Assert.AreEqual(0, c.GetFieldValue(o, "mPrivateInt"), "mPrivateInt should be 0."); + Assert.AreEqual(0, c.GetFieldValue(o, "mProtectedInt"), "mProtectedInt should be 0."); + + c.SetFieldValue(o, "mPrivateInt", 1); + c.SetFieldValue(o, "mProtectedInt", 1); + + Assert.AreEqual(1, c.GetFieldValue(o, "mPrivateInt"), "mPrivateInt should be 1."); + Assert.AreEqual(1, c.GetFieldValue(o, "mProtectedInt"), "mProtectedInt should be 1."); + + } + + [Test] + public void SetAndGet() + { + PropertyAccessorTestObject o = new PropertyAccessorTestObject(); + ClassAccessor c = new ClassAccessor(o); + c.LoadAllPropertiesAndFields(); + + // Fields + c.SetValue(o, "mBool", false); + c.SetValue(o, "mInt", 3); + int i = (int)c.GetValue(o, "mInt"); + bool b = (bool)c.GetValue(o, "mBool"); + + Assert.AreEqual(3, o.Int, "Int should be 3."); + Assert.AreEqual(false, o.Bool, "Bool should be false."); + + Assert.AreEqual(3, i, "Returned Int should be 3."); + Assert.AreEqual(false, b, "Returned Bool should be false."); + + + // Properties + c.SetValue(o, "Bool", true); + c.SetValue(o, "Int", 4); + int i2 = (int)c.GetValue(o, "Int"); + bool b2 = (bool)c.GetValue(o, "Bool"); + + Assert.AreEqual(4, o.Int, "Int should be 4."); + Assert.AreEqual(true, o.Bool, "Bool should be true."); + + Assert.AreEqual(4, i2, "Returned Int should be 4."); + Assert.AreEqual(true, b2, "Returned Bool should be true."); + + + } + + [Test] public void LoadAllProperties() { *************** *** 40,43 **** --- 103,128 ---- Assert.AreEqual(17, c.PropertyCount, "Should have loaded 17 properties."); } + + [Test] + public void LoadAllFields() + { + FieldAccessorTestObject o = new FieldAccessorTestObject(); + ClassAccessor c = new ClassAccessor(o); + c.LoadAllFields(); + Console.WriteLine(c); + Assert.AreEqual(19, c.FieldCount, "Should have loaded 19 fields."); + } + + [Test] + public void LoadAllPropertiesAndFields() + { + FieldAccessorTestObject o = new FieldAccessorTestObject(); + ClassAccessor c = new ClassAccessor(o); + c.LoadAllPropertiesAndFields(); + Console.WriteLine(c); + Assert.AreEqual(36, c.TotalCount, "Should have loaded 36 total."); + + } + } Index: FieldAccessorTestObject.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Tests/Reflection/FieldAccessorTestObject.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FieldAccessorTestObject.cs 16 Nov 2005 07:01:52 -0000 1.3 --- FieldAccessorTestObject.cs 19 Feb 2006 06:13:55 -0000 1.4 *************** *** 199,202 **** --- 199,204 ---- public int mReadOnlyInt = 0; public int mWriteOnlyInt; + private int mPrivateInt = 0; + protected int mProtectedInt = 0; } } Index: FieldAccessorTest.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Tests/Reflection/FieldAccessorTest.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FieldAccessorTest.cs 16 Nov 2005 07:01:52 -0000 1.3 --- FieldAccessorTest.cs 19 Feb 2006 06:13:55 -0000 1.4 *************** *** 71,77 **** [Test] public void TestSetString() { ! FieldAccessor FieldAccessor = new FieldAccessor(typeof(FieldAccessorTestObject), "mString"); --- 71,91 ---- [Test] + public void FieldInfoTest() + { + FieldAccessorTestObject testObject = + this.CreateTestObject(); + + Type myType = testObject.GetType(); + FieldInfo myFieldInfo = myType.GetField("mString", BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance); + + Assert.IsNotNull(myFieldInfo, "FieldInfo is null"); + myFieldInfo.SetValue(testObject, "test"); + } + + [Test] public void TestSetString() { ! ! FieldAccessor fieldAccessor = new FieldAccessor(typeof(FieldAccessorTestObject), "mString"); *************** *** 81,85 **** string testString = "New string"; ! FieldAccessor.Set(testObject, testString); Assert.AreEqual(testString, testObject.String); } --- 95,99 ---- string testString = "New string"; ! fieldAccessor.Set(testObject, testString); Assert.AreEqual(testString, testObject.String); } *************** *** 475,560 **** [Test] - public void TestCanRead() - { - FieldAccessor FieldAccessor; - - // - // Can read - // - FieldAccessor = new FieldAccessor(typeof(FieldAccessorTestObject), - "mInt"); - - Assert.IsTrue(FieldAccessor.CanRead); - - // - // Cannot read - // - FieldAccessor = new FieldAccessor(typeof(FieldAccessorTestObject), - "mWriteOnlyInt"); - - Assert.IsFalse(FieldAccessor.CanRead); - } - - [Test] - public void TestCanWrite() - { - FieldAccessor FieldAccessor; - - // - // Can read - // - FieldAccessor = new FieldAccessor(typeof(FieldAccessorTestObject), - "mInt"); - - Assert.IsTrue(FieldAccessor.CanWrite); - - // - // Cannot write - // - FieldAccessor = new FieldAccessor(typeof(FieldAccessorTestObject), - "ReadOnlyInt"); - - Assert.IsFalse(FieldAccessor.CanWrite); - } - - [Test] - [ExpectedException(typeof(FieldAccessorException), - "Property \"ReadOnlyInt\" does not have a set method.")] - public void TestSetNotSupported() - { - FieldAccessor FieldAccessor - = new FieldAccessor(typeof(FieldAccessorTestObject), - "ReadOnlyInt"); - - FieldAccessorTestObject testObject = - this.CreateTestObject(); - - // - // Attempt to set a propert that is read only - // - FieldAccessor.Set(testObject, 123); - } - - [Test] - [ExpectedException(typeof(FieldAccessorException), - "Field \"WriteOnlyInt\" does not have a get method.")] - public void TestGetNotSupported() - { - FieldAccessor FieldAccessor - = new FieldAccessor(typeof(FieldAccessorTestObject), - "WriteOnlyInt"); - - FieldAccessorTestObject testObject = - this.CreateTestObject(); - - // - // Attempt read a write-only property - // - int test = (int)FieldAccessor.Get(testObject); - } - - [Test] [ExpectedException(typeof(FieldAccessorException), ! "Field \"NonExistantProperty\" does not exist for " + "type Adapdev.Reflection.Tests.FieldAccessorTestObject.")] public void TestNonExistantProperty() --- 489,494 ---- [Test] [ExpectedException(typeof(FieldAccessorException), ! "Field \"NonExistantField\" does not exist for " + "type Adapdev.Reflection.Tests.FieldAccessorTestObject.")] public void TestNonExistantProperty() *************** *** 565,810 **** } - [Test] - public void TestGetIntegerPerformance() - { - const int TEST_ITERATIONS = 1000000; - - FieldAccessorTestObject testObject - = this.CreateTestObject(); - - int test; - - // - // Property accessor - // - DateTime start = DateTime.Now; - - FieldAccessor FieldAccessor = - new FieldAccessor(typeof(FieldAccessorTestObject), "Int"); - for(int i = 0; i < TEST_ITERATIONS; i++) - { - test = (int)FieldAccessor.Get(testObject); - } - - DateTime end = DateTime.Now; - - TimeSpan time = end - start; - double FieldAccessorMs = time.TotalMilliseconds; - - // - // Direct access - // - start = DateTime.Now; - - for(int i = 0; i < TEST_ITERATIONS; i++) - { - test = testObject.Int; - } - - end = DateTime.Now; - - time = end - start; - double directAccessMs = time.TotalMilliseconds; - - // - // Reflection - // - start = DateTime.Now; - Type type = testObject.GetType(); - for(int i = 0; i < TEST_ITERATIONS; i++) - { - test = (int)type.InvokeMember("Int", - BindingFlags.Public | BindingFlags.GetProperty | BindingFlags.Instance, - null, testObject, null); - } - - end = DateTime.Now; - - time = end - start; - double reflectionMs = time.TotalMilliseconds; - - // - // Print results - // - Console.WriteLine( - TEST_ITERATIONS.ToString() + " property gets on integer..." - + "\nDirect access ms: \t\t\t\t\t" + directAccessMs.ToString() - + "\nFieldAccessor (Reflection.Emit) ms: \t\t" + FieldAccessorMs.ToString() - + "\nReflection ms: \t\t\t\t\t" + reflectionMs.ToString()); - } - - [Test] - public void TestSetIntegerPerformance() - { - const int TEST_ITERATIONS = 1000000; - const int TEST_VALUE = 123; - - FieldAccessorTestObject testObject - = this.CreateTestObject(); - - // - // Property accessor - // - DateTime start = DateTime.Now; - - FieldAccessor FieldAccessor = - new FieldAccessor(typeof(FieldAccessorTestObject), "Int"); - for(int i = 0; i < TEST_ITERATIONS; i++) - { - FieldAccessor.Set(testObject, TEST_VALUE); - } - - DateTime end = DateTime.Now; - - TimeSpan time = end - start; - double FieldAccessorMs = time.TotalMilliseconds; - - // - // Reflection - // - start = DateTime.Now; - Type type = testObject.GetType(); - for(int i = 0; i < TEST_ITERATIONS; i++) - { - type.InvokeMember("Int", - BindingFlags.Public | BindingFlags.SetProperty | BindingFlags.Instance, - null, testObject, new object[]{TEST_VALUE}); - } - - end = DateTime.Now; - - time = end - start; - double reflectionMs = time.TotalMilliseconds; - - // - // Print results - // - Console.WriteLine( - TEST_ITERATIONS.ToString() + " property sets on integer..." - + "\nFieldAccessor (Reflection.Emit) ms: \t\t" + FieldAccessorMs.ToString() - + "\nReflection ms: \t\t\t\t\t" + reflectionMs.ToString()); - } - - [Test] - public void TestGetStringPerformance() - { - const int TEST_ITERATIONS = 1000000; - - FieldAccessorTestObject testObject - = this.CreateTestObject(); - - string test; - - // - // Property accessor - // - DateTime start = DateTime.Now; - - FieldAccessor FieldAccessor = - new FieldAccessor(typeof(FieldAccessorTestObject), "String"); - for(int i = 0; i < TEST_ITERATIONS; i++) - { - test = (string)FieldAccessor.Get(testObject); - } - - DateTime end = DateTime.Now; - - TimeSpan time = end - start; - double FieldAccessorMs = time.TotalMilliseconds; - - // - // Direct access - // - start = DateTime.Now; - - for(int i = 0; i < TEST_ITERATIONS; i++) - { - test = testObject.String; - } - - end = DateTime.Now; - - time = end - start; - double directAccessMs = time.TotalMilliseconds; - - // - // Reflection - // - start = DateTime.Now; - Type type = testObject.GetType(); - for(int i = 0; i < TEST_ITERATIONS; i++) - { - test = (string)type.InvokeMember("String", - BindingFlags.Public | BindingFlags.GetProperty | BindingFlags.Instance, - null, testObject, null); - } - - end = DateTime.Now; - - time = end - start; - double reflectionMs = time.TotalMilliseconds; - - // - // Print results - // - Console.WriteLine( - TEST_ITERATIONS.ToString() + " property gets on string..." - + "\nDirect access ms: \t\t\t\t\t" + directAccessMs.ToString() - + "\nFieldAccessor (Reflection.Emit) ms: \t\t" + FieldAccessorMs.ToString() - + "\nReflection ms: \t\t\t\t\t" + reflectionMs.ToString()); - } - - [Test] - public void TestSetStringPerformance() - { - const int TEST_ITERATIONS = 1000000; - const string TEST_VALUE = "Test"; - - FieldAccessorTestObject testObject - = this.CreateTestObject(); - - // - // Property accessor - // - DateTime start = DateTime.Now; - - FieldAccessor FieldAccessor = - new FieldAccessor(typeof(FieldAccessorTestObject), "String"); - for(int i = 0; i < TEST_ITERATIONS; i++) - { - FieldAccessor.Set(testObject, TEST_VALUE); - } - - DateTime end = DateTime.Now; - - TimeSpan time = end - start; - double FieldAccessorMs = time.TotalMilliseconds; - - // - // Reflection - // - start = DateTime.Now; - Type type = testObject.GetType(); - for(int i = 0; i < TEST_ITERATIONS; i++) - { - type.InvokeMember("String", - BindingFlags.Public | BindingFlags.SetProperty | BindingFlags.Instance, - null, testObject, new object[]{TEST_VALUE}); - } - - end = DateTime.Now; - - time = end - start; - double reflectionMs = time.TotalMilliseconds; - - // - // Print results - // - Console.WriteLine( - TEST_ITERATIONS.ToString() + " property sets on string..." - + "\nFieldAccessor (Reflection.Emit) ms: \t\t" + FieldAccessorMs.ToString() - + "\nReflection ms: \t\t\t\t\t" + reflectionMs.ToString()); - } - #region Private Methods --- 499,502 ---- |
|
From: Sean M. <int...@us...> - 2006-02-19 06:14:05
|
Update of /cvsroot/adapdev/Adapdev/src/FullBuild In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12892/src/FullBuild Modified Files: FullBuild.csproj Log Message: Index: FullBuild.csproj =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/FullBuild/FullBuild.csproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FullBuild.csproj 28 Nov 2005 23:40:24 -0000 1.4 --- FullBuild.csproj 19 Feb 2006 06:13:55 -0000 1.5 *************** *** 130,133 **** --- 130,153 ---- Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}" /> + <Reference + Name = "TestDriven.Framework" + AssemblyName = "TestDriven.Framework" + HintPath = "..\..\lib\TestDriven.Framework.dll" + /> + <Reference + Name = "log4net" + AssemblyName = "log4net" + HintPath = "..\..\lib\log4net.dll" + /> + <Reference + Name = "MySql.Data" + AssemblyName = "MySql.Data" + HintPath = "..\..\lib\MySql.Data.dll" + /> + <Reference + Name = "nunit.framework" + AssemblyName = "nunit.framework" + HintPath = "..\..\lib\nunit.framework.dll" + /> </References> </Build> |
|
From: Sean M. <int...@us...> - 2006-02-19 06:14:05
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12892/src/Adapdev.Data Modified Files: Adapdev.Data.csproj Log Message: Index: Adapdev.Data.csproj =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Adapdev.Data.csproj,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Adapdev.Data.csproj 21 Jan 2006 19:42:48 -0000 1.18 --- Adapdev.Data.csproj 19 Feb 2006 06:13:54 -0000 1.19 *************** *** 361,545 **** /> <File ! RelPath = "Sql\AccessCriteria.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\AccessDeleteQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\AccessInsertQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\AccessSelectQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\AccessUpdateQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\Criteria.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\CriteriaFactory.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\DeleteQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\DialectConstants.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\ICriteria.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\IDeleteQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\IInsertQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\INonSelectQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\InsertQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\ISelectQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\ISqlQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\IUpdateQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\MySqlCriteria.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\MySqlDeleteQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\MySqlInsertQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\MySqlSelectQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\MySqlUpdateQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\OracleCriteria.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\OracleDeleteQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\OracleInsertQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\OracleSelectQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\OracleUpdateQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\QueryConstants.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\QueryFactory.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\QueryHelper.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\SelectQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\SqlDeleteQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\SqlInsertQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\SqlSelectQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\SqlServerCriteria.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\SqlUpdateQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\UpdateQuery.cs" SubType = "Code" BuildAction = "Compile" --- 361,545 ---- /> <File ! RelPath = "Sql\Criteria.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\CriteriaFactory.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\DeleteQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\DialectConstants.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\ICriteria.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\IDeleteQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\IInsertQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\INonSelectQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\InsertQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\ISelectQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\ISqlQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\IUpdateQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\QueryConstants.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\QueryFactory.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\QueryHelper.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\SelectQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\UpdateQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\Access\AccessCriteria.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\Access\AccessDeleteQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\Access\AccessInsertQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\Access\AccessSelectQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\Access\AccessUpdateQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\MsSql\SqlDeleteQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\MsSql\SqlInsertQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\MsSql\SqlSelectQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\MsSql\SqlServerCriteria.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\MsSql\SqlUpdateQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\MySql\MySqlCriteria.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\MySql\MySqlDeleteQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\MySql\MySqlInsertQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\MySql\MySqlSelectQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\MySql\MySqlUpdateQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\Oracle\OracleCriteria.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\Oracle\OracleDeleteQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\Oracle\OracleInsertQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\Oracle\OracleSelectQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\Oracle\OracleUpdateQuery.cs" SubType = "Code" BuildAction = "Compile" |
|
From: Sean M. <int...@us...> - 2006-02-19 06:14:03
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.UnitTest.Core.Tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12892/src/Adapdev.UnitTest.Core.Tests Modified Files: AdapdevLocalTestEngineTest.cs Log Message: Index: AdapdevLocalTestEngineTest.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.UnitTest.Core.Tests/AdapdevLocalTestEngineTest.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** AdapdevLocalTestEngineTest.cs 27 Nov 2005 06:32:43 -0000 1.9 --- AdapdevLocalTestEngineTest.cs 19 Feb 2006 06:13:55 -0000 1.10 *************** *** 38,42 **** Console.WriteLine(new Adapdev.UnitTest.Core.TextFormatter(new TestAssemblyResult[]{result}, true, true, true).GetText()); ! Assert.AreEqual(25, result.Passed); Assert.AreEqual(2, result.Failed); --- 38,42 ---- Console.WriteLine(new Adapdev.UnitTest.Core.TextFormatter(new TestAssemblyResult[]{result}, true, true, true).GetText()); ! Assert.AreEqual(27, result.Passed); Assert.AreEqual(2, result.Failed); *************** *** 74,78 **** Console.WriteLine(new Adapdev.UnitTest.Core.TextFormatter(new TestAssemblyResult[]{result}, true, true, true).GetText()); ! Assert.AreEqual(25, result.Passed); Assert.AreEqual(2, result.Failed); --- 74,78 ---- Console.WriteLine(new Adapdev.UnitTest.Core.TextFormatter(new TestAssemblyResult[]{result}, true, true, true).GetText()); ! Assert.AreEqual(27, result.Passed); Assert.AreEqual(2, result.Failed); |
|
From: Sean M. <int...@us...> - 2006-02-08 03:00:11
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7247/src/Adapdev Modified Files: Adapdev.csproj Added Files: IEntity.cs Log Message: Index: Adapdev.csproj =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev/Adapdev.csproj,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Adapdev.csproj 23 Nov 2005 03:00:42 -0000 1.17 --- Adapdev.csproj 8 Feb 2006 03:00:00 -0000 1.18 *************** *** 166,169 **** --- 166,174 ---- /> <File + RelPath = "IEntity.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File RelPath = "IProgressCallback.cs" SubType = "Code" --- NEW FILE: IEntity.cs --- using System; namespace Adapdev { /// <summary> /// Summary description for IEntity. /// </summary> public interface IEntity { } } |
|
From: Sean M. <int...@us...> - 2006-02-08 03:00:11
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7247/src/Adapdev.Data/Schema Modified Files: DatabaseSchema.cs ForeignKeyAssociation.cs OleDbSchemaBuilder.cs TableSchema.cs Log Message: Index: DatabaseSchema.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/DatabaseSchema.cs,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** DatabaseSchema.cs 26 Nov 2005 08:09:22 -0000 1.10 --- DatabaseSchema.cs 8 Feb 2006 03:00:00 -0000 1.11 *************** *** 132,135 **** --- 132,136 ---- } + public override string ToString() { Index: OleDbSchemaBuilder.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/OleDbSchemaBuilder.cs,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** OleDbSchemaBuilder.cs 26 Nov 2005 08:09:22 -0000 1.8 --- OleDbSchemaBuilder.cs 8 Feb 2006 03:00:00 -0000 1.9 *************** *** 153,156 **** --- 153,157 ---- ti.Alias = dr["TABLE_NAME"].ToString(); ti.Name = dr["TABLE_NAME"].ToString(); + ti.SchemaName = dr["TABLE_SCHEMA"].ToString(); ti.TableType = TableTypeConverter.Convert(dr["TABLE_TYPE"].ToString()); return ti; Index: TableSchema.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/TableSchema.cs,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** TableSchema.cs 27 Nov 2005 06:32:43 -0000 1.13 --- TableSchema.cs 8 Feb 2006 03:00:00 -0000 1.14 *************** *** 23,26 **** --- 23,28 ---- protected ColumnSchemaDictionary columns = new ColumnSchemaDictionary(); protected DatabaseSchema parent = null; + protected string schemaName = String.Empty; + /// <summary> *************** *** 258,261 **** --- 260,270 ---- } + [XmlAttribute] + public string SchemaName + { + get { return schemaName; } + set { schemaName = value; } + } + /// <summary> /// Returns a collection of ColumnSchemas Index: ForeignKeyAssociation.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/ForeignKeyAssociation.cs,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ForeignKeyAssociation.cs 19 Jan 2006 03:50:40 -0000 1.11 --- ForeignKeyAssociation.cs 8 Feb 2006 03:00:00 -0000 1.12 *************** *** 189,197 **** { if(this.SecondForeignTable != null && this.ThirdForeignTable != null) ! return this._table.Name + "." + this.ColumnName + "-" + this.ForeignTableName + "." + this.ForeignColumnName + "-" + this.SecondForeignTableName + "." + this.SecondForeignColumnName + "-" + this.ThirdForeignTableName + "." + this.ThirdForeignColumnName; else if(this.SecondForeignTable != null && this.ThirdForeignTable == null) ! return this._table.Name + "." + this.ColumnName + "-" + this.ForeignTableName + "." + this.ForeignColumnName + "-" + this.SecondForeignTableName + "." + this.SecondForeignColumnName; else ! return this._table.Name + "." + this.ColumnName + "-" + this.ForeignTableName + "." + this.ForeignColumnName; } } --- 189,197 ---- { if(this.SecondForeignTable != null && this.ThirdForeignTable != null) ! return this.DisplayAssociation() + this._table.Name + "." + this.ColumnName + " - " + this.ForeignTableName + "." + this.ForeignColumnName + " - " + this.SecondForeignTableName + "." + this.SecondForeignColumnName + " - " + this.ThirdForeignTableName + "." + this.ThirdForeignColumnName; else if(this.SecondForeignTable != null && this.ThirdForeignTable == null) ! return this.DisplayAssociation() + this._table.Name + "." + this.ColumnName + " - " + this.ForeignTableName + "." + this.ForeignColumnName + " - " + this.SecondForeignTableName + "." + this.SecondForeignColumnName; else ! return this.DisplayAssociation() + this._table.Name + "." + this.ColumnName + " - " + this.ForeignTableName + "." + this.ForeignColumnName; } } *************** *** 203,206 **** --- 203,214 ---- } + private string DisplayAssociation() + { + if (this.AssociationType == AssociationType.OneToOne) return "(1-1) "; + if (this.AssociationType == AssociationType.OneToMany) return "(1-n) "; + if (this.AssociationType == AssociationType.ManyToMany) return "(n-n) "; + return String.Empty; + } + [Browsable(false)] public override string ToString() |
|
From: Sean M. <int...@us...> - 2006-02-08 03:00:09
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.UnitTest.Core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7247/src/Adapdev.UnitTest.Core Modified Files: TestSuiteBuilder.cs Log Message: Index: TestSuiteBuilder.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.UnitTest.Core/TestSuiteBuilder.cs,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** TestSuiteBuilder.cs 30 Nov 2005 05:08:47 -0000 1.16 --- TestSuiteBuilder.cs 8 Feb 2006 03:00:00 -0000 1.17 *************** *** 404,408 **** { AssemblyName assemblyName = assembly.GetName(); ! //Console.WriteLine("Probing for: " + assemblyName); if (! dependencyList.Contains(assemblyName.FullName)) { --- 404,408 ---- { AssemblyName assemblyName = assembly.GetName(); ! Console.WriteLine("Probing for: " + assemblyName); if (! dependencyList.Contains(assemblyName.FullName)) { *************** *** 418,422 **** public void CurrentDomain_AssemblyLoad(object sender, AssemblyLoadEventArgs args) { ! //Console.WriteLine("Loading: " + args.LoadedAssembly.FullName); } } --- 418,422 ---- public void CurrentDomain_AssemblyLoad(object sender, AssemblyLoadEventArgs args) { ! Console.WriteLine("Loading: " + args.LoadedAssembly.FullName); } } |
|
From: Sean M. <int...@us...> - 2006-02-08 03:00:09
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.UnitTest.Core.AdapdevTests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7247/src/Adapdev.UnitTest.Core.AdapdevTests Modified Files: RollbackTransactionTest.cs Log Message: Index: RollbackTransactionTest.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.UnitTest.Core.AdapdevTests/RollbackTransactionTest.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RollbackTransactionTest.cs 30 Dec 2005 20:42:11 -0000 1.4 --- RollbackTransactionTest.cs 8 Feb 2006 03:00:00 -0000 1.5 *************** *** 8,12 **** /// </summary> /// ! // [TestFixture] public class RollbackTransactionTest { --- 8,12 ---- /// </summary> /// ! [TestFixture] public class RollbackTransactionTest { *************** *** 14,18 **** [RollbackTransaction] public void Transaction() ! { Assert.IsTrue(ContextUtil.IsInTransaction, "Should be in a transaction."); Console.WriteLine("TransactionId: " + ContextUtil.TransactionId); --- 14,18 ---- [RollbackTransaction] public void Transaction() ! { Assert.IsTrue(ContextUtil.IsInTransaction, "Should be in a transaction."); Console.WriteLine("TransactionId: " + ContextUtil.TransactionId); |
|
From: Sean M. <int...@us...> - 2006-02-08 03:00:08
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data.Tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7247/src/Adapdev.Data.Tests Modified Files: SchemaBuilderTest.cs Log Message: Index: SchemaBuilderTest.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data.Tests/SchemaBuilderTest.cs,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** SchemaBuilderTest.cs 26 Nov 2005 08:09:22 -0000 1.10 --- SchemaBuilderTest.cs 8 Feb 2006 03:00:00 -0000 1.11 *************** *** 1,3 **** --- 1,4 ---- using System; + using System.Data.OleDb; using NUnit.Framework; *************** *** 26,29 **** --- 27,32 ---- Assert.AreEqual(Adapdev.Data.DbProviderType.OLEDB, ds.DatabaseProviderType, "ProviderTypes don't match."); Assert.AreEqual(Adapdev.Data.DbType.SQLSERVER, ds.DatabaseType, "DataTypes don't match."); + Assert.AreEqual("dbo", ds.GetTable("Orders").SchemaName); + //Console.WriteLine(ds.GetTable("Orders")); foreach(ColumnSchema column in ds.GetTable("Orders").Columns.Values) *************** *** 50,53 **** --- 53,63 ---- [Test] + public void PrintSqlServerSqlSchema() + { + int i = 0; + Console.WriteLine(new OleDbSchemaBuilder(null, ref i).PrintOleDbSchema(this._oledbConnectionString, OleDbSchemaGuid.Tables, "")); + } + + [Test] public void BuildMySqlSchema() { |
|
From: Sean M. <int...@us...> - 2006-02-08 02:56:25
|
Update of /cvsroot/adapdev/Adapdev/lib/nunit/226 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6288/226 Log Message: Directory /cvsroot/adapdev/Adapdev/lib/nunit/226 added to the repository |
|
From: Sean M. <int...@us...> - 2006-01-26 05:10:16
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Cache.Tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7199/src/Adapdev.Cache.Tests Modified Files: AbstractICacheTest.cs CacheManagerTest.cs FileCacheTest.cs Log Message: Index: FileCacheTest.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Cache.Tests/FileCacheTest.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FileCacheTest.cs 16 Nov 2005 07:01:46 -0000 1.5 --- FileCacheTest.cs 26 Jan 2006 05:10:05 -0000 1.6 *************** *** 35,38 **** --- 35,44 ---- } + + [Test] + public void CacheCountReset() + { + Assert.AreEqual(0, this.cache.Count, "Cache was not reset"); + } } } Index: AbstractICacheTest.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Cache.Tests/AbstractICacheTest.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** AbstractICacheTest.cs 16 Nov 2005 07:01:46 -0000 1.6 --- AbstractICacheTest.cs 26 Jan 2006 05:10:05 -0000 1.7 *************** *** 37,41 **** cache.Add(12, e); ! Assert.IsTrue(cache.Count == 1, "Cache count should be 1."); } --- 37,41 ---- cache.Add(12, e); ! Assert.AreEqual(1, cache.Count, "Cache count should be 1."); } *************** *** 156,171 **** public virtual void Copy() { ! ICache source = this.GetCache(); this.cache.Add(1, new SuppliersEntity()); source.Add(2, new SuppliersEntity()); ! ! Assert.AreEqual(1, this.cache.Count); ! Assert.AreEqual(1, source.Count); this.cache.Copy(source); ! Assert.AreEqual(2, this.cache.Count); } --- 156,173 ---- public virtual void Copy() { ! ICache source = new MutableInMemoryCache(); this.cache.Add(1, new SuppliersEntity()); + Assert.AreEqual(1, this.cache.Count, "Target should have 1 item."); source.Add(2, new SuppliersEntity()); ! Assert.AreEqual(1, source.Count, "Source should have 1 item."); this.cache.Copy(source); ! Assert.AreEqual(2, this.cache.Count, "Combined cache count should be 2."); ! ! this.cache.Clear(); ! source.Clear(); } Index: CacheManagerTest.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Cache.Tests/CacheManagerTest.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CacheManagerTest.cs 16 Nov 2005 07:01:46 -0000 1.6 --- CacheManagerTest.cs 26 Jan 2006 05:10:05 -0000 1.7 *************** *** 24,27 **** --- 24,28 ---- Assert.AreEqual(0, CacheManager.Cache.Count, "Cache has switched, so count should be 0."); + CacheManager.Cache = new ImmutableInMemoryCache(); } |
|
From: Sean M. <int...@us...> - 2006-01-21 19:42:57
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26702/src/Adapdev.Data/Sql Modified Files: Criteria.cs ICriteria.cs INonSelectQuery.cs ISelectQuery.cs Added Files: ISqlQuery.cs Log Message: Separated IQuery and ISqlQuery Fixed issue with empty Criterias Index: INonSelectQuery.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/INonSelectQuery.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** INonSelectQuery.cs 16 Nov 2005 07:01:48 -0000 1.5 --- INonSelectQuery.cs 21 Jan 2006 19:42:48 -0000 1.6 *************** *** 4,8 **** /// Represents a query that does not return records /// </summary> ! public interface INonSelectQuery : IQuery { } --- 4,8 ---- /// Represents a query that does not return records /// </summary> ! public interface INonSelectQuery : ISqlQuery { } Index: Criteria.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/Criteria.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Criteria.cs 30 Dec 2005 20:42:11 -0000 1.7 --- Criteria.cs 21 Jan 2006 19:42:48 -0000 1.8 *************** *** 106,110 **** } ! public virtual void AddExists(IQuery subQuery) { } --- 106,110 ---- } ! public virtual void AddExists(ISqlQuery subSqlQuery) { } *************** *** 134,141 **** } ! public virtual void AddIn(string columnName, IQuery subQuery) { sb.Append(" IN ("); ! sb.Append(subQuery.GetText()); sb.Append(") "); this.initialized = true; --- 134,141 ---- } ! public virtual void AddIn(string columnName, ISqlQuery subSqlQuery) { sb.Append(" IN ("); ! sb.Append(subSqlQuery.GetText()); sb.Append(") "); this.initialized = true; *************** *** 229,235 **** } ! public virtual void AddNotExists(IQuery subQuery) { ! sb.Append(" EXISTS (" + subQuery.GetText() + ") "); this.initialized = true; } --- 229,235 ---- } ! public virtual void AddNotExists(ISqlQuery subSqlQuery) { ! sb.Append(" EXISTS (" + subSqlQuery.GetText() + ") "); this.initialized = true; } *************** *** 249,255 **** } ! public virtual void AddNotIn(string columnName, IQuery subQuery) { ! sb.Append(" NOT IN (" + subQuery.GetText() + ") "); this.initialized = true; } --- 249,255 ---- } ! public virtual void AddNotIn(string columnName, ISqlQuery subSqlQuery) { ! sb.Append(" NOT IN (" + subSqlQuery.GetText() + ") "); this.initialized = true; } --- NEW FILE: ISqlQuery.cs --- namespace Adapdev.Data.Sql { using System; /// <summary> /// Represents a query /// </summary> public interface ISqlQuery : IQuery { /// <summary> /// Sets the criteria to use for the query /// </summary> /// <param name="c"></param> void SetCriteria(ICriteria c); /// <summary> /// Specifies the table to use for the query /// </summary> /// <param name="tableName"></param> void SetTable(string tableName); /// <summary> /// Returns a datastore specific ICriteria implementation /// </summary> /// <returns></returns> ICriteria CreateCriteria(); /// <summary> /// The DbProviderType for this query. Necessary to determine how to /// represent dates, parameters, etc. /// </summary> DbProviderType DbProviderType { get; set; } ICriteria Criteria{get;} } } Index: ICriteria.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/ICriteria.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ICriteria.cs 30 Dec 2005 20:42:11 -0000 1.7 --- ICriteria.cs 21 Jan 2006 19:42:48 -0000 1.8 *************** *** 15,22 **** void AddEqualTo(string tableName, string columnName, object columnValue); void AddEqualTo(string columnName); ! void AddExists(IQuery subQuery); void AddGreaterThanOrEqualTo(string columnName, object columnValue); void AddGreaterThan(string columnName, object columnValue); ! void AddIn(string columnName, IQuery subQuery); void AddIn(string columnName, ICollection values); void AddIsNull(string columnName); --- 15,22 ---- void AddEqualTo(string tableName, string columnName, object columnValue); void AddEqualTo(string columnName); ! void AddExists(ISqlQuery subSqlQuery); void AddGreaterThanOrEqualTo(string columnName, object columnValue); void AddGreaterThan(string columnName, object columnValue); ! void AddIn(string columnName, ISqlQuery subSqlQuery); void AddIn(string columnName, ICollection values); void AddIsNull(string columnName); *************** *** 26,32 **** void AddNotBetween(string columnName, object value1, object value2); void AddNotEqualTo(string columnName, object columnValue); ! void AddNotExists(IQuery subQuery); void AddNotIn(string columnName, ICollection values); ! void AddNotIn(string columnName, IQuery subQuery); void AddNotLike(string columnName, object columnValue); void AddNotNull(string columnName); --- 26,32 ---- void AddNotBetween(string columnName, object value1, object value2); void AddNotEqualTo(string columnName, object columnValue); ! void AddNotExists(ISqlQuery subSqlQuery); void AddNotIn(string columnName, ICollection values); ! void AddNotIn(string columnName, ISqlQuery subSqlQuery); void AddNotLike(string columnName, object columnValue); void AddNotNull(string columnName); Index: ISelectQuery.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/ISelectQuery.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ISelectQuery.cs 26 Nov 2005 09:08:59 -0000 1.9 --- ISelectQuery.cs 21 Jan 2006 19:42:48 -0000 1.10 *************** *** 4,8 **** /// Summary description for ISelectQuery. /// </summary> ! public interface ISelectQuery : IQuery { /// <summary> --- 4,8 ---- /// Summary description for ISelectQuery. /// </summary> ! public interface ISelectQuery : ISqlQuery { /// <summary> |
|
From: Sean M. <int...@us...> - 2006-01-21 19:42:56
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26702/src/Adapdev.Data Modified Files: Adapdev.Data.csproj Added Files: IQuery.cs Log Message: Separated IQuery and ISqlQuery Fixed issue with empty Criterias --- NEW FILE: IQuery.cs --- using System; namespace Adapdev.Data { /// <summary> /// Summary description for IQuery. /// </summary> public interface IQuery { /// <summary> /// Returns the text form of the query /// </summary> /// <returns></returns> string GetText(); } } Index: Adapdev.Data.csproj =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Adapdev.Data.csproj,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Adapdev.Data.csproj 16 Nov 2005 07:01:47 -0000 1.17 --- Adapdev.Data.csproj 21 Jan 2006 19:42:48 -0000 1.18 *************** *** 216,219 **** --- 216,224 ---- /> <File + RelPath = "IQuery.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File RelPath = "ITransferObject.cs" SubType = "Code" *************** *** 426,435 **** /> <File ! RelPath = "Sql\IQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\ISelectQuery.cs" SubType = "Code" BuildAction = "Compile" --- 431,440 ---- /> <File ! RelPath = "Sql\ISelectQuery.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Sql\ISqlQuery.cs" SubType = "Code" BuildAction = "Compile" |
|
From: Sean M. <int...@us...> - 2006-01-21 19:42:55
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data.Tests/Sql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26702/src/Adapdev.Data.Tests/Sql Modified Files: SelectQueryTest.cs Log Message: Separated IQuery and ISqlQuery Fixed issue with empty Criterias Index: SelectQueryTest.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data.Tests/Sql/SelectQueryTest.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SelectQueryTest.cs 30 Dec 2005 20:42:11 -0000 1.1 --- SelectQueryTest.cs 21 Jan 2006 19:42:48 -0000 1.2 *************** *** 27,30 **** --- 27,55 ---- Console.WriteLine(query.GetText()); } + + [Test] + public void EmptyCriteria() + { + ISelectQuery query = QueryFactory.CreateSelectQuery(DbType.SQLSERVER); + query.SetTable("Test"); + query.Add("column"); + query.SetCriteria(query.CreateCriteria()); + + Console.WriteLine(query.GetText()); + } + + [Test] + public void PopulatedCriteria() + { + ISelectQuery query = QueryFactory.CreateSelectQuery(DbType.SQLSERVER); + query.SetTable("Test"); + query.Add("column"); + + ICriteria criteria = query.CreateCriteria(); + criteria.AddIsNull("column2"); + query.SetCriteria(criteria); + + Console.WriteLine(query.GetText()); + } } } |
|
From: Sean M. <int...@us...> - 2006-01-21 06:03:00
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31245/src/Adapdev.Data/Sql Modified Files: SelectQuery.cs Log Message: Index: SelectQuery.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/SelectQuery.cs,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** SelectQuery.cs 30 Dec 2005 20:42:11 -0000 1.11 --- SelectQuery.cs 21 Jan 2006 06:02:52 -0000 1.12 *************** *** 257,261 **** protected string GetCriteria() { ! if (this.criteria == null) return ""; else return criteria.GetText(); } --- 257,261 ---- protected string GetCriteria() { ! if (this.criteria == null || !this.criteria.Initialized) return ""; else return criteria.GetText(); } |
|
From: Sean M. <int...@us...> - 2006-01-19 03:50:52
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27047/src/Adapdev.Data/Schema Modified Files: ColumnSchema.cs ForeignKeyAssociation.cs LoadDatabaseSchema.cs SaveDatabaseSchema.cs Log Message: Added serialization of foreign key associations Changed db schema serialization to binary (xml causes recursion problem) Index: SaveDatabaseSchema.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/SaveDatabaseSchema.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SaveDatabaseSchema.cs 26 Nov 2005 08:09:22 -0000 1.7 --- SaveDatabaseSchema.cs 19 Jan 2006 03:50:40 -0000 1.8 *************** *** 28,32 **** { schemaFile = System.IO.Path.Combine(SchemaConstants.SCHEMAPATH,_savedSchemaName); ! Serializer.SerializeToXmlFile(this._dbSchema, schemaFile); } } --- 28,32 ---- { schemaFile = System.IO.Path.Combine(SchemaConstants.SCHEMAPATH,_savedSchemaName); ! Serializer.SerializeToBinary(this._dbSchema, schemaFile); } } Index: LoadDatabaseSchema.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/LoadDatabaseSchema.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** LoadDatabaseSchema.cs 9 Dec 2005 05:30:31 -0000 1.6 --- LoadDatabaseSchema.cs 19 Jan 2006 03:50:40 -0000 1.7 *************** *** 32,36 **** try { ! this._dbSchema = Serializer.DeserializeFromXmlFile(typeof(DatabaseSchema), schemaFile) as DatabaseSchema; } catch (Exception) --- 32,36 ---- try { ! this._dbSchema = Serializer.DeserializeFromBinary(typeof(DatabaseSchema), schemaFile) as DatabaseSchema; } catch (Exception) Index: ColumnSchema.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/ColumnSchema.cs,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ColumnSchema.cs 9 Dec 2005 05:30:31 -0000 1.14 --- ColumnSchema.cs 19 Jan 2006 03:50:40 -0000 1.15 *************** *** 237,242 **** /// <value></value> [Browsable(false)] ! // [XmlElement(Type = typeof(ForeignKeyAssociation))] ! [XmlIgnore] public ArrayList ForeignKeyTables { --- 237,242 ---- /// <value></value> [Browsable(false)] ! [XmlElement(Type = typeof(ForeignKeyAssociation))] ! // [XmlIgnore] public ArrayList ForeignKeyTables { Index: ForeignKeyAssociation.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/ForeignKeyAssociation.cs,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ForeignKeyAssociation.cs 9 Dec 2005 05:30:31 -0000 1.10 --- ForeignKeyAssociation.cs 19 Jan 2006 03:50:40 -0000 1.11 *************** *** 11,14 **** --- 11,15 ---- /// </summary> /// + [Serializable] public class ForeignKeyAssociation { |
|
From: Sean M. <int...@us...> - 2006-01-19 03:50:51
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data.Tests/Schema In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27047/src/Adapdev.Data.Tests/Schema Modified Files: SaveDatabaseSchemaTest.cs Log Message: Added serialization of foreign key associations Changed db schema serialization to binary (xml causes recursion problem) Index: SaveDatabaseSchemaTest.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data.Tests/Schema/SaveDatabaseSchemaTest.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SaveDatabaseSchemaTest.cs 27 Nov 2005 06:32:43 -0000 1.4 --- SaveDatabaseSchemaTest.cs 19 Jan 2006 03:50:40 -0000 1.5 *************** *** 19,23 **** { DatabaseSchema ds = SchemaBuilder.CreateDatabaseSchema(this._oledbConnectionString, Adapdev.Data.DbType.SQLSERVER, Adapdev.Data.DbProviderType.OLEDB); ! Serializer.SerializeToXmlFile(ds, "schema.xml"); } --- 19,23 ---- { DatabaseSchema ds = SchemaBuilder.CreateDatabaseSchema(this._oledbConnectionString, Adapdev.Data.DbType.SQLSERVER, Adapdev.Data.DbProviderType.OLEDB); ! Serializer.SerializeToBinary(ds, "schema.bin"); } |
|
From: Sean M. <int...@us...> - 2006-01-18 12:57:56
|
Update of /cvsroot/adapdev/Adapdev/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26335/lib Modified Files: TestDriven.Framework.dll log4net.dll Log Message: Updated log4net to 1.2.9 Updated TD.NET library Added tests for AbstractDAO based on bug reports Index: TestDriven.Framework.dll =================================================================== RCS file: /cvsroot/adapdev/Adapdev/lib/TestDriven.Framework.dll,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 Binary files /tmp/cvsz70mtP and /tmp/cvsnP8u6n differ Index: log4net.dll =================================================================== RCS file: /cvsroot/adapdev/Adapdev/lib/log4net.dll,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 Binary files /tmp/cvsZ1f3Qm and /tmp/cvsgtQ7gX differ |
|
From: Sean M. <int...@us...> - 2006-01-18 12:57:56
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data.Tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26335/src/Adapdev.Data.Tests Modified Files: CategoriesDAOTest.cs Log Message: Updated log4net to 1.2.9 Updated TD.NET library Added tests for AbstractDAO based on bug reports Index: CategoriesDAOTest.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data.Tests/CategoriesDAOTest.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CategoriesDAOTest.cs 16 Nov 2005 07:01:47 -0000 1.5 --- CategoriesDAOTest.cs 18 Jan 2006 12:57:48 -0000 1.6 *************** *** 7,10 **** --- 7,11 ---- using System.Collections; using System.Data; + using Adapdev.Data; using Test; using Test.Mock; *************** *** 117,120 **** --- 118,159 ---- [Test] + public void SelectAllDS() + { + DataSet ds = dao.SelectAllDS(); + Assert.IsTrue(ds.Tables[0].Rows.Count > 0); + } + + [Test] + public void SelectAllDSWithConnection() + { + using(IDbConnection conn = dao.CreateConnection()) + { + DataSet ds = dao.SelectAllDS(conn); + Assert.IsTrue(ds.Tables[0].Rows.Count > 0); + Console.WriteLine(DataSetDebugger.ToString(ds)); + } + } + + [Test] + public void SaveDataSetRecord() + { + using(TransactionScope scope = new TransactionScope()) + { + using(IDbConnection conn = dao.CreateConnection()) + { + DataSet ds = dao.SelectAllDS(conn); + Assert.IsTrue(ds.Tables[0].Rows.Count > 0); + DataRow drow= ds.Tables[0].NewRow(); + drow["CategoryName"]= "Test"; + drow["Description"]= "hello"; + ds.Tables[0].Rows.Add(drow); + Console.WriteLine(DataSetDebugger.ToString(ds)); + dao.SaveDS(ds); + scope.Abort(); + } + } + } + + [Test] [Ignore("")] public void TestToString(){ |
|
From: Sean M. <int...@us...> - 2006-01-12 05:42:41
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15765/src/Adapdev.Data/Sql Modified Files: IInsertQuery.cs IUpdateQuery.cs InsertQuery.cs UpdateQuery.cs Log Message: Index: InsertQuery.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/InsertQuery.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** InsertQuery.cs 30 Dec 2005 20:42:11 -0000 1.6 --- InsertQuery.cs 12 Jan 2006 05:42:34 -0000 1.7 *************** *** 1,2 **** --- 1,4 ---- + using System; + namespace Adapdev.Data.Sql { *************** *** 42,45 **** --- 44,54 ---- } + public void AddNull(string columnName) + { + cnames[cindex] = columnName; + cvalues[cindex] = "NULL"; + cindex++; + } + public void Add(string columnName, object columnValue) { Index: IInsertQuery.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/IInsertQuery.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** IInsertQuery.cs 16 Nov 2005 07:01:48 -0000 1.5 --- IInsertQuery.cs 12 Jan 2006 05:42:34 -0000 1.6 *************** *** 14,21 **** void Add(string columnName); /// <summary> ! /// Adds the column name and value to the insert query /// </summary> ! /// <param name="columnName"></param> ! /// <param name="columnValue"></param> void Add(string columnName, object columnValue); } --- 14,21 ---- void Add(string columnName); /// <summary> ! /// Adds the specified column with a NULL value /// </summary> ! /// <param name="columnName">The name of the column</param> ! void AddNull(string columnName); void Add(string columnName, object columnValue); } Index: UpdateQuery.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/UpdateQuery.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** UpdateQuery.cs 30 Dec 2005 20:42:11 -0000 1.6 --- UpdateQuery.cs 12 Jan 2006 05:42:34 -0000 1.7 *************** *** 36,39 **** --- 36,44 ---- } + public void AddNull(string columnName) + { + sb.Append(" " + QueryHelper.GetPreDelimeter(this.type) + columnName + QueryHelper.GetPostDelimeter(this.type) + " = NULL,"); + } + public void Add(string columnName, object columnValue) { Index: IUpdateQuery.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/IUpdateQuery.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** IUpdateQuery.cs 16 Nov 2005 07:01:48 -0000 1.5 --- IUpdateQuery.cs 12 Jan 2006 05:42:34 -0000 1.6 *************** *** 14,17 **** --- 14,22 ---- void Add(string columnName); /// <summary> + /// Adds the specified column with a NULL value + /// </summary> + /// <param name="columnName">The name of the column</param> + void AddNull(string columnName); + /// <summary> /// Adds the column name and value to the update query /// </summary> |
