Author: roberto
Date: Sun Sep 11 11:56:31 2005
New Revision: 280165
URL: http://svn.apache.org/viewcvs?rev=280165&view=rev
Log:
~Updated C# DataMapper MySql MySql.Data tests
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MySql/MySql/Order.xml
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MySql/MySql/Other.xml
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Scripts/MySql/DataBase.sql
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Scripts/MySql/order-init.sql
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Scripts/MySql/other-init.sql
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/providers.config
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MySql/MySql/Order.xml
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MySql/MySql/Order.xml?rev=280165&r1=280164&r2=280165&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MySql/MySql/Order.xml
(original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MySql/MySql/Order.xml
Sun Sep 11 11:56:31 2005
@@ -61,6 +61,10 @@
<result property="PostalCode"
column="Order_PostalCode"/>
</resultMap>
+ <resultMap id="order-hash" class="Hashtable">
+ <result property="Date" column="Order_Date"
nullValue="01/01/0001 00:00:00"/>
+ </resultMap>
+
<resultMap id="order-with-types-result" class="Order">
<result property="Id" column="Order_ID"
dbType="Int32"/>
<result property="Date" column="Order_Date"
dbType="DateTime "/>
@@ -153,6 +157,18 @@
<result property="FavouriteLineItem"
resultMapping="LineItem.LineItem" />
</resultMap>
+ <resultMap id="order-joined-with-account" class="Order">
+ <result property="Id" column="Order_ID"/>
+ <result property="Date" column="Order_Date"
nullValue="01/01/0001 00:00:00"/>
+ <result property="CardExpiry"
column="Order_CardExpiry"/>
+ <result property="CardType" column="Order_CardType"/>
+ <result property="CardNumber"
column="Order_CardNumber"/>
+ <result property="Street" column="Order_Street"/>
+ <result property="City" column="Order_City"/>
+ <result property="Province" column="Order_Province"/>
+ <result property="PostalCode"
column="Order_PostalCode"/>
+ <result property="Account"
resultMapping="Account.account-result-nullable-email" />
+ </resultMap>
</resultMaps>
<statements>
@@ -162,6 +178,12 @@
select * from Orders where Order_ID = #value#
</statement>
+ <statement id="GetOrderByHashTable"
+ parameterClass="Int"
+ resultMap="order-hash" >
+ select Order_Date from Orders where Order_ID = #value#
+ </statement>
+
<statement id="GetOrderLiteByColumnIndex"
parameterClass="Int"
resultMap="lite-order-result-by-index" >
@@ -311,7 +333,28 @@
from Accounts
where Account_ID = #value#
</select>
-
+
+ <select id="GetOrderJoinWithAccount"
+ parameterClass="Integer"
+ resultMap="order-joined-with-account">
+ select
+ Order_ID,
+ Order_Date,
+ Order_CardExpiry,
+ Order_CardType,
+ Order_CardNumber,
+ Order_Street,
+ Order_City,
+ Order_Province,
+ Order_PostalCode,
+ acc.Account_ID,
+ acc.Account_FirstName,
+ acc.Account_LastName,
+ acc.Account_Email
+ from Orders as ord
+ LEFT OUTER JOIN Accounts as acc on acc.Account_ID =
ord.Account_ID
+ where Order_ID = #value#
+ </select>
</statements>
<parameterMaps>
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MySql/MySql/Other.xml
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MySql/MySql/Other.xml?rev=280165&r1=280164&r2=280165&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MySql/MySql/Other.xml
(original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MySql/MySql/Other.xml
Sun Sep 11 11:56:31 2005
@@ -4,6 +4,12 @@
<alias>
<typeAlias alias="Other"
type="IBatisNet.DataMapper.Test.Domain.Other, IBatisNet.DataMapper.Test"/>
+ <typeAlias alias="A" type="IBatisNet.DataMapper.Test.Domain.A,
IBatisNet.DataMapper.Test"/>
+ <typeAlias alias="B" type="IBatisNet.DataMapper.Test.Domain.B,
IBatisNet.DataMapper.Test"/>
+ <typeAlias alias="C" type="IBatisNet.DataMapper.Test.Domain.C,
IBatisNet.DataMapper.Test"/>
+ <typeAlias alias="D" type="IBatisNet.DataMapper.Test.Domain.D,
IBatisNet.DataMapper.Test"/>
+ <typeAlias alias="E" type="IBatisNet.DataMapper.Test.Domain.E,
IBatisNet.DataMapper.Test"/>
+ <typeAlias alias="F" type="IBatisNet.DataMapper.Test.Domain.F,
IBatisNet.DataMapper.Test"/>
</alias>
<resultMaps>
@@ -13,9 +19,67 @@
<result property="Bool" column="Other_Bit"/>
<result property="Bool2" column="Other_String"
typeHandler="OuiNonBool"/>
</resultMap>
+
+ <resultMap id="A-result" class="A" >
+ <result property="Id" column="A_ID"/>
+ <result property="Libelle" column="A_Libelle"/>
+ <result property="B"
resultMapping="Other.B-result"/>
+ <result property="E"
resultMapping="Other.E-result"/>
+ <result property="F"
resultMapping="Other.F-result"/>
+ </resultMap>
+
+ <resultMap id="B-result" class="B" >
+ <result property="Id" column="B_ID"/>
+ <result property="Libelle" column="B_Libelle"/>
+ <result property="C"
resultMapping="Other.C-result"/>
+ <result property="D"
resultMapping="Other.D-result"/>
+ </resultMap>
+
+ <resultMap id="C-result" class="C" >
+ <result property="Id" column="C_ID"/>
+ <result property="Libelle" column="C_Libelle"/>
+ </resultMap>
+
+ <resultMap id="D-result" class="D" >
+ <result property="Id" column="D_ID"/>
+ <result property="Libelle" column="D_Libelle"/>
+ </resultMap>
+
+ <resultMap id="E-result" class="E" >
+ <result property="Id" column="E_ID"/>
+ <result property="Libelle" column="E_Libelle"/>
+ </resultMap>
+
+ <resultMap id="F-result" class="F" >
+ <result property="Id" column="F_ID"/>
+ <result property="Libelle" column="F_Libelle"/>
+ </resultMap>
</resultMaps>
<statements>
+
+ <select id="SelectComplexJoined" resultMap="A-result">
+ SELECT
+ A.Id AS A_ID,
+ A.A_Libelle AS A_Libelle,
+ B.ID AS B_ID,
+ B.B_Libelle AS B_Libelle,
+ C.ID AS C_ID,
+ C.C_Libelle AS C_Libelle,
+ D.ID AS D_ID,
+ D.D_Libelle AS D_Libelle,
+ E.ID AS E_ID,
+ E.E_Libelle AS E_Libelle,
+ F.ID AS F_ID,
+ F.F_Libelle AS F_Libelle
+ FROM A
+ LEFT OUTER JOIN B ON A.B_ID = B.ID
+ LEFT OUTER JOIN C ON B.C_ID = C.ID
+ LEFT OUTER JOIN D ON B.D_ID = D.ID
+ LEFT OUTER JOIN E ON A.E_ID = E.ID
+ LEFT OUTER JOIN F ON A.F_ID = F.ID
+ </select>
+
<statement id="DynamicSelectByIntLong"
parameterClass="Hashtable"
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Scripts/MySql/DataBase.sql
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Scripts/MySql/DataBase.sql?rev=280165&r1=280164&r2=280165&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Scripts/MySql/DataBase.sql
(original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Scripts/MySql/DataBase.sql
Sun Sep 11 11:56:31 2005
@@ -94,7 +94,7 @@
create table Orders
(
Order_Id int not null,
- Account_Id int not null,
+ Account_Id int null,
Order_Date datetime,
Order_CardType varchar(32),
Order_CardNumber varchar(32),
@@ -117,6 +117,69 @@
Other_Bit bit not null default 0,
Other_String varchar(32) not null
) TYPE=INNODB;
+
+CREATE TABLE F (
+ ID varchar(50) NOT
NULL ,
+ F_Libelle varchar(50) NULL ,
+ primary key (ID)
+) TYPE=INNODB;
+
+CREATE TABLE E (
+ ID varchar(50) NOT
NULL ,
+ E_Libelle varchar(50) NULL ,
+ primary key (ID)
+) TYPE=INNODB;
+
+CREATE TABLE D (
+ ID varchar(50) NOT
NULL ,
+ D_Libelle varchar(50) NULL ,
+ primary key (ID)
+) TYPE=INNODB;
+
+CREATE TABLE C (
+ ID varchar(50) NOT
NULL ,
+ C_Libelle varchar(50) NULL ,
+ primary key (ID)
+) TYPE=INNODB;
+
+
+CREATE TABLE B (
+ ID varchar(50) NOT
NULL ,
+ C_ID varchar(50) NULL ,
+ D_ID varchar(50) NULL ,
+ B_Libelle varchar(50) NULL ,
+ primary key (ID)
+) TYPE=INNODB;
+
+ALTER TABLE B ADD CONSTRAINT FK_B_C FOREIGN KEY FK_B_C (C_ID)
+ REFERENCES C (ID)
+ ON DELETE RESTRICT
+ ON UPDATE RESTRICT,
+ ADD CONSTRAINT FK_B_D FOREIGN KEY FK_B_D (D_ID)
+ REFERENCES D (ID)
+ ON DELETE RESTRICT
+ ON UPDATE RESTRICT;
+
+CREATE TABLE A (
+ ID varchar(50) NOT
NULL ,
+ B_ID varchar(50) NULL ,
+ E_ID varchar(50) NULL ,
+ F_ID varchar(50) NULL ,
+ A_Libelle varchar(50) NULL ,
+ primary key (ID)
+) TYPE=INNODB;
+
+ALTER TABLE A ADD CONSTRAINT FK_A_B FOREIGN KEY FK_A_B (B_ID)
+ REFERENCES B (ID)
+ ON DELETE RESTRICT
+ ON UPDATE RESTRICT,
+ ADD CONSTRAINT FK_A_E FOREIGN KEY FK_A_E (E_ID)
+ REFERENCES E (ID)
+ ON DELETE RESTRICT
+ ON UPDATE RESTRICT,
+ ADD CONSTRAINT FK_A_F FOREIGN KEY FK_A_F (F_ID)
+ REFERENCES F (ID)
+ ON DELETE RESTRICT;
/*==============================================================*/
/* Table : Documents */
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Scripts/MySql/order-init.sql
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Scripts/MySql/order-init.sql?rev=280165&r1=280164&r2=280165&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Scripts/MySql/order-init.sql
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Scripts/MySql/order-init.sql
Sun Sep 11 11:56:31 2005
@@ -3,7 +3,7 @@
create table Orders
(
Order_Id int not null,
- Account_Id int not null,
+ Account_Id int null,
Order_Date datetime,
Order_CardType varchar(32),
Order_CardNumber varchar(32),
@@ -26,4 +26,5 @@
INSERT INTO Orders VALUES (8, 3, '2003-02-15 8:15:00', 'AMEX', '777777777777',
'12/03', '888 Our Street', 'Regina', 'SK', 'S4S 7G4',1);
INSERT INTO Orders VALUES (9, 2, '2003-02-15 8:15:00', 'MC', '666666666666',
'01/04', '999 Your Street', 'Toronto', 'ON', 'G4D 9F4',2);
INSERT INTO Orders VALUES (10, 1, '2003-02-15 8:15:00', 'VISA',
'555555555555', '02/04', '99 Some Street', 'Calgary', 'AB', 'W4G 7A4',1);
+INSERT INTO Orders VALUES (11, null, '2003-02-15 8:15:00', 'VISA',
'555555555555', '02/04', 'Null order', 'Calgary', 'ZZ', 'XXX YYY',1);
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Scripts/MySql/other-init.sql
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Scripts/MySql/other-init.sql?rev=280165&r1=280164&r2=280165&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Scripts/MySql/other-init.sql
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Scripts/MySql/other-init.sql
Sun Sep 11 11:56:31 2005
@@ -2,6 +2,12 @@
use IBatisNet;
drop table if exists Others;
+drop table if exists A;
+drop table if exists B;
+drop table if exists C;
+drop table if exists D;
+drop table if exists E;
+drop table if exists F;
create table Others
(
@@ -11,5 +17,75 @@
Other_String varchar(32) not null
) TYPE=INNODB;
+CREATE TABLE F (
+ ID varchar(50) NOT
NULL ,
+ F_Libelle varchar(50) NULL ,
+ primary key (ID)
+) TYPE=INNODB;
+
+CREATE TABLE E (
+ ID varchar(50) NOT
NULL ,
+ E_Libelle varchar(50) NULL ,
+ primary key (ID)
+) TYPE=INNODB;
+
+CREATE TABLE D (
+ ID varchar(50) NOT
NULL ,
+ D_Libelle varchar(50) NULL ,
+ primary key (ID)
+) TYPE=INNODB;
+
+CREATE TABLE C (
+ ID varchar(50) NOT
NULL ,
+ C_Libelle varchar(50) NULL ,
+ primary key (ID)
+) TYPE=INNODB;
+
+
+CREATE TABLE B (
+ ID varchar(50) NOT
NULL ,
+ C_ID varchar(50) NULL ,
+ D_ID varchar(50) NULL ,
+ B_Libelle varchar(50) NULL ,
+ primary key (ID)
+) TYPE=INNODB;
+
+ALTER TABLE B ADD CONSTRAINT FK_B_C FOREIGN KEY FK_B_C (C_ID)
+ REFERENCES C (ID)
+ ON DELETE RESTRICT
+ ON UPDATE RESTRICT,
+ ADD CONSTRAINT FK_B_D FOREIGN KEY FK_B_D (D_ID)
+ REFERENCES D (ID)
+ ON DELETE RESTRICT
+ ON UPDATE RESTRICT;
+
+CREATE TABLE A (
+ ID varchar(50) NOT
NULL ,
+ B_ID varchar(50) NULL ,
+ E_ID varchar(50) NULL ,
+ F_ID varchar(50) NULL ,
+ A_Libelle varchar(50) NULL ,
+ primary key (ID)
+) TYPE=INNODB;
+
+ALTER TABLE A ADD CONSTRAINT FK_A_B FOREIGN KEY FK_A_B (B_ID)
+ REFERENCES B (ID)
+ ON DELETE RESTRICT
+ ON UPDATE RESTRICT,
+ ADD CONSTRAINT FK_A_E FOREIGN KEY FK_A_E (E_ID)
+ REFERENCES E (ID)
+ ON DELETE RESTRICT
+ ON UPDATE RESTRICT,
+ ADD CONSTRAINT FK_A_F FOREIGN KEY FK_A_F (F_ID)
+ REFERENCES F (ID)
+ ON DELETE RESTRICT;
+
INSERT INTO Others VALUES(1, 8888888, 0, 'Oui');
-INSERT INTO Others VALUES(2, 9999999999, 1, 'Non');
\ No newline at end of file
+INSERT INTO Others VALUES(2, 9999999999, 1, 'Non');
+
+INSERT INTO F VALUES('f', 'fff');
+INSERT INTO E VALUES('e', 'eee');
+INSERT INTO D VALUES('d', 'ddd');
+INSERT INTO C VALUES('c', 'ccc');
+INSERT INTO B VALUES('b', 'c', null, 'bbb');
+INSERT INTO A VALUES('a', 'b', 'e', null, 'aaa');
\ No newline at end of file
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/providers.config
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/providers.config?rev=280165&r1=280164&r2=280165&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/providers.config
(original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/providers.config
Sun Sep 11 11:56:31 2005
@@ -128,9 +128,9 @@
parameterPrefix="@"/>
<provider
name="MySql"
- description="MySQL, MySQL provider V1.0.4.20163"
- enabled="false"
- assemblyName="MySql.Data, Version=1.0.4.20163, Culture=neutral,
PublicKeyToken=c5687fc88969c44d"
connectionClass="MySql.Data.MySqlClient.MySqlConnection"
+ description="MySQL, MySQL provider V1.0.5.13785"
+ enabled="true"
+ assemblyName="MySql.Data, Version=1.0.5.13785, Culture=neutral,
PublicKeyToken=c5687fc88969c44d"
connectionClass="MySql.Data.MySqlClient.MySqlConnection"
commandClass="MySql.Data.MySqlClient.MySqlCommand"
parameterClass="MySql.Data.MySqlClient.MySqlParameter"
parameterDbTypeClass="MySql.Data.MySqlClient.MySqlDbType"
@@ -140,7 +140,7 @@
usePositionalParameters="false"
useParameterPrefixInSql="true"
useParameterPrefixInParameter="true"
- parameterPrefix="@"/>
+ parameterPrefix="?"/>
<provider
name="SQLite3"
description="SQLite, SQLite.NET provider V0.21.1869.3794"
