Author: gbayon
Date: Sat Dec 10 00:23:46 2005
New Revision: 355716
URL: http://svn.apache.org/viewcvs?rev=355716&view=rev
Log:
- Updated DataAccess schema
- Added one unit test for multiple context
Added:
ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_Multiple_Context.config
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/IBatisNet.DataAccess.Test.csproj
ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/BaseDaoTest.cs
ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_MSSQL_SqlClient.config
ibatis/trunk/cs/mapper/IBatisNet.DataAccess/DaoConfig.xsd
ibatis/trunk/cs/mapper/IBatisNet.DataAccess/DaoManager.cs
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/IBatisNet.DataAccess.Test.csproj
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/IBatisNet.DataAccess.Test.csproj?rev=355716&r1=355715&r2=355716&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/IBatisNet.DataAccess.Test.csproj
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/IBatisNet.DataAccess.Test.csproj
Sat Dec 10 00:23:46 2005
@@ -155,6 +155,10 @@
BuildAction = "None"
/>
<File
+ RelPath = "bin\Debug\dao_Multiple_Context.config"
+ BuildAction = "None"
+ />
+ <File
RelPath = "bin\Debug\dao_MySql_ByteFx.config"
BuildAction = "None"
/>
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/BaseDaoTest.cs
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/BaseDaoTest.cs?rev=355716&r1=355715&r2=355716&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/BaseDaoTest.cs
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/BaseDaoTest.cs
Sat Dec 10 00:23:46 2005
@@ -6,6 +6,7 @@
using System.Threading;
using IBatisNet.Common;
using IBatisNet.Common.Utilities;
+using IBatisNet.DataAccess.Configuration;
using IBatisNet.DataAccess.Test.Dao.Interfaces;
using IBatisNet.DataAccess.Test.Domain;
using NUnit.Framework;
@@ -47,6 +48,20 @@
ScriptRunner runner = new ScriptRunner();
runner.RunScript(datasource, script);
+ }
+
+ [Test]
+ public void MultipleContext()
+ {
+ DomDaoManagerBuilder builder = new
DomDaoManagerBuilder();
+ builder.Configure( "dao_Multiple_Context.config" );
+ DaoManager daoManager1 =
DaoManager.GetInstance("Contex1");
+ DaoManager daoManager2 =
DaoManager.GetInstance("Contex2");
+
+ Assert.IsNotNull(daoManager1);
+ Assert.IsNotNull(daoManager2);
+
Assert.IsTrue(daoManager2.LocalDataSource.ConnectionString !=
daoManager1.LocalDataSource.ConnectionString);
+ Assert.IsTrue(daoManager2.LocalDataSource.Provider.Name
!= daoManager1.LocalDataSource.Provider.Name);
}
#region Dao statement tests
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_MSSQL_SqlClient.config
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_MSSQL_SqlClient.config?rev=355716&r1=355715&r2=355716&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_MSSQL_SqlClient.config
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_MSSQL_SqlClient.config
Sat Dec 10 00:23:46 2005
@@ -46,21 +46,6 @@
</daoFactory>
</context>
- <context id="SqlMapDao2">
- <properties resource="../../database.config"/>
- <!-- ==== SqlClient configuration ========= -->
- <database>
- <provider name="OleDb1.1"/>
- <dataSource name="iBatisNet"
connectionString="Provider=SQLOLEDB;Server=${datasource};database=${database};user
id=${userid};password=${password};" />
- </database>
-
- <daoSessionHandler id="SqlMap">
- <property name="resource"
value="SqlMap_MSSQL_OleDb.config"/>
- </daoSessionHandler>
-
- <daoFactory />
- </context>
-
<!-- <context id="NHibernateDao">
<properties resource="../../database.config"/>
Added:
ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_Multiple_Context.config
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_Multiple_Context.config?rev=355716&view=auto
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_Multiple_Context.config
(added)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_Multiple_Context.config
Sat Dec 10 00:23:46 2005
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<daoConfig xmlns="http://ibatis.apache.org/dataAccess";
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+
+ <providers resource="providers.config"/>
+
+ <!-- ==== Contex1 with ADO.NET session and SqlClient provider =========
-->
+ <context id="Contex1">
+ <properties resource="../../database.config"/>
+ <database>
+ <provider name="sqlServer1.1"/>
+ <dataSource name="iBatisNet" connectionString="data
source=${datasource};database=${database};user
id=${userid};password=${password};connection reset=false;connection lifetime=5;
min pool size=1; max pool size=50"/>
+ </database>
+
+ <daoSessionHandler id="ADONET" />
+
+ <daoFactory />
+ </context>
+
+ <!-- ==== Contex2 with DataMapper session and OleDb provider =========
-->
+ <context id="Contex2">
+ <properties resource="../../database.config"/>
+ <database>
+ <provider name="OleDb1.1"/>
+ <dataSource name="iBatisNet"
connectionString="Provider=SQLOLEDB;Server=${datasource};database=${database};user
id=${userid};password=${password};" />
+ </database>
+
+ <daoSessionHandler id="SqlMap">
+ <property name="resource"
value="SqlMap_MSSQL_OleDb.config"/>
+ </daoSessionHandler>
+
+ <daoFactory />
+ </context>
+
+</daoConfig>
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataAccess/DaoConfig.xsd
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataAccess/DaoConfig.xsd?rev=355716&r1=355715&r2=355716&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataAccess/DaoConfig.xsd (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataAccess/DaoConfig.xsd Sat Dec 10
00:23:46 2005
@@ -43,6 +43,7 @@
<xs:complexType>
<xs:sequence>
<xs:element ref="daoSessionHandlers"
minOccurs="0"/>
+ <xs:element ref="providers" minOccurs="0"
maxOccurs="1"/>
<xs:element ref="context"
maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataAccess/DaoManager.cs
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataAccess/DaoManager.cs?rev=355716&r1=355715&r2=355716&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataAccess/DaoManager.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataAccess/DaoManager.cs Sat Dec 10
00:23:46 2005
@@ -96,7 +96,7 @@
/// <summary>
/// Key for default context name
/// </summary>
- public static string DEFAULT_CONTEXT_NAME =
"_DEFAULT_CONTEXT_NAME";
+ public const string DEFAULT_CONTEXT_NAME =
"_DEFAULT_CONTEXT_NAME";
#endregion
#region Fields
