[Jcframework-commits] Nunit AtomsFramework.xml,1.9,1.10 Nunit_AtomsFramework.vbproj,1.10,1.11 original db1.mdb,1.7,1.8

[Richard B. <rb...@us...>]

Update of /cvsroot/jcframework/Nunit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27457

Modified Files:
	AtomsFramework.xml Nunit_AtomsFramework.vbproj 
	original db1.mdb 
Log Message:
Fix for cache problems when changing key values of objects that don't inherit from CPersistentObject
Also fixed problem where many-to-many associations tried to save associationclass multiple times.

Index: Nunit_AtomsFramework.vbproj
===================================================================
RCS file: /cvsroot/jcframework/Nunit/Nunit_AtomsFramework.vbproj,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Nunit_AtomsFramework.vbproj	20 Oct 2004 06:43:40 -0000	1.10
+++ Nunit_AtomsFramework.vbproj	25 Oct 2004 07:14:12 -0000	1.11
@@ -140,6 +140,16 @@
                     BuildAction = "Compile"
                 />
                 <File
+                    RelPath = "InheritedClasses\ManyToManyClasses.vb"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "InheritedClasses\ManyToManyTests.vb"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
                     RelPath = "InheritedClasses\MultiRetrieveTestClasses.vb"
                     SubType = "Code"
                     BuildAction = "Compile"

Index: original db1.mdb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/original db1.mdb,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
Binary files /tmp/cvsoWb2Wq and /tmp/cvs2UuJKu differ

Index: AtomsFramework.xml
===================================================================
RCS file: /cvsroot/jcframework/Nunit/AtomsFramework.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- AtomsFramework.xml	21 Oct 2004 23:36:45 -0000	1.9
+++ AtomsFramework.xml	25 Oct 2004 07:14:12 -0000	1.10
@@ -19,65 +19,58 @@
 	<attribute name="Id" column="id" key="primary"/>
 	<attribute name="Description" column="description"/>
 </class>
-<class name="NPJobWithOIDValue" table="jobs" database="MSA" namespace="NunitTests.StandardClasses">
-	<attribute name="OIDValue" column="oidvalue" key="primary"/>
-	<attribute name="Description" column="description" find="true"/>
-</class>
-<class name="NPEmployee" table="employee" database="MSA" namespace="NunitTests.StandardClasses">
-	<attribute name="OIDValue" column="oid" key="primary"/>
-	<attribute name="Name" column="name" find="true"/>
-	<attribute name="ReportsToOID" column="parentoid" />
-	<attribute name="TeamOID" column="teamoid" />
+<class name="NPEmployee" table="NPEmployee" database="MSA" namespace="NunitTests.StandardClasses">
+	<attribute name="Name" column="name" find="true" key="primary"/>
+	<attribute name="ReportsToName" column="parentname" />
+	<attribute name="TeamName" column="teamname" />
 	<attribute name="Team" />
 	<attribute name="ReportsTo" />
 	<attribute name="Workers" />
 </class>
-<class name="NPTeam" table="teams" database="MSA" namespace="NunitTests.StandardClasses">
-	<attribute name="OIDValue" column="oidvalue" key="primary"/>
-	<attribute name="Name" column="teamname" find="true"/>
-	<attribute name="TeamLeaderOID" column="teamleader" />
-	<attribute name="jobOID" column="joboidvalue" />
+<class name="NPTeam" table="NPTeams" database="MSA" namespace="NunitTests.StandardClasses">
+	<attribute name="Name" column="teamname" find="true" key="primary"/>
+	<attribute name="TeamLeaderName" column="teamleader" />
+	<attribute name="jobId" column="jobid" />
 	<attribute name="TeamLeader" />
 	<attribute name="Job" />
 </class>
 <association fromClass="NunitTests.StandardClasses.NPEmployee" toClass="NunitTests.StandardClasses.NPEmployee" target="ReportsTo" cardinality="OneToOne"
 	retrieveAutomatic="true" saveAutomatic="true" deleteAutomatic="false" inverse="false">
-		<entry fromAttribute="ReportsToOID" toAttribute="OIDValue"/>
+		<entry fromAttribute="ReportsToName" toAttribute="Name"/>
 </association>
 <association fromClass="NunitTests.StandardClasses.NPEmployee" toClass="NunitTests.StandardClasses.NPEmployee" target="Workers" cardinality="OneToMany"
 	retrieveAutomatic="true" saveAutomatic="true" deleteAutomatic="false" inverse="false">
-		<entry fromAttribute="OIDValue" toAttribute="ReportsToOID"/>
+		<entry fromAttribute="Name" toAttribute="ReportsToName"/>
 </association>
 <association fromClass="NunitTests.StandardClasses.NPTeam" toClass="NunitTests.StandardClasses.NPEmployee" target="TeamLeader" cardinality="OneToOne"
 	retrieveAutomatic="true" saveAutomatic="false" deleteAutomatic="false" inverse="false">
-		<entry fromAttribute="TeamLeaderOID" toAttribute="OIDValue"/>
+		<entry fromAttribute="TeamLeaderName" toAttribute="Name"/>
 </association>
-<association fromClass="NunitTests.StandardClasses.NPTeam" toClass="NunitTests.StandardClasses.NPJobWithOIDValue" target="Job" cardinality="OneToOne"
+<association fromClass="NunitTests.StandardClasses.NPTeam" toClass="NunitTests.StandardClasses.NPJob" target="Job" cardinality="OneToOne"
 	retrieveAutomatic="true" saveAutomatic="false" deleteAutomatic="false" inverse="false">
-		<entry fromAttribute="jobOID" toAttribute="OIDValue"/>
+		<entry fromAttribute="jobId" toAttribute="Id"/>
 </association>
 <association fromClass="NunitTests.StandardClasses.NPTeam" toClass="NunitTests.StandardClasses.NPEmployee" target="Members" cardinality="OneToMany"
 	retrieveAutomatic="true" saveAutomatic="false" deleteAutomatic="false" inverse="false">
-		<entry fromAttribute="OIDValue" toAttribute="TeamOID"/>
+		<entry fromAttribute="Name" toAttribute="TeamName"/>
 </association>
 
 
-<class name="IEmployee" table="employee" database="MSA" factory="IEmployeeFactory" namespace="NunitTests.Interfaces">
-	<attribute name="OIDValue" column="oid" key="primary"/>
-	<attribute name="Name" column="name" find="true"/>
-	<attribute name="ReportsToOID" column="parentoid" />
-	<attribute name="TeamOID" column="teamoid" />
+<class name="IEmployee" table="NPEmployee" database="MSA" factory="IEmployeeFactory" namespace="NunitTests.Interfaces">
+	<attribute name="Name" column="name" key="primary" find="true"/>
+	<attribute name="ReportsToName" column="parentname" />
+	<attribute name="TeamName" column="teamname" />
 	<attribute name="Team" />
 	<attribute name="ReportsTo" />
 	<attribute name="Workers" />
 </class>
 <association fromClass="NunitTests.Interfaces.IEmployee" toClass="NunitTests.Interfaces.IEmployee" target="ReportsTo" cardinality="OneToOne"
 	retrieveAutomatic="true" saveAutomatic="true" deleteAutomatic="false" inverse="false">
-		<entry fromAttribute="ReportsToOID" toAttribute="OIDValue"/>
+		<entry fromAttribute="ReportsToName" toAttribute="Name"/>
 </association>
 <association fromClass="NunitTests.Interfaces.IEmployee" toClass="NunitTests.Interfaces.IEmployee" target="Workers" cardinality="OneToMany"
 	retrieveAutomatic="true" saveAutomatic="true" deleteAutomatic="false" inverse="false">
-		<entry fromAttribute="OIDValue" toAttribute="ReportsToOID"/>
+		<entry fromAttribute="Name" toAttribute="ReportsToName"/>
 </association>
 
 
@@ -248,4 +241,46 @@
 		<entry fromAttribute="COID" toAttribute="OIDValue"/>
 	</association>
 
+
+	<class name="ManyToManyA" table="ManyToManyA" database="MSA" namespace="NunitTests.InheritedClasses">
+		<attribute name="GUIDValue" column="GuidValue" key="primary"/>
+		<attribute name="Description" column="description" />
+		<attribute name="M2MABCollection" />
+	</class>
+	<class name="ManyToManyB" table="ManyToManyB" database="MSA" namespace="NunitTests.InheritedClasses">
+		<attribute name="GUIDValue" column="GuidValue" key="primary"/>
+		<attribute name="Description" column="description" />
+		<attribute name="M2MABCollection" />
+	</class>
+	<class name="ManyToManyAB" table="ManyToManyAB" database="MSA" namespace="NunitTests.InheritedClasses">
+		<attribute name="AGuidValue" column="AGuidValue" key="primary"/>
+		<attribute name="BGuidValue" column="BGuidValue" key="primary"/>
+		<attribute name="M2MA"/>
+		<attribute name="M2MB"/>
+	</class>
+	<association fromClass="NunitTests.InheritedClasses.ManyToManyA"
+	  toClass="NunitTests.InheritedClasses.ManyToManyAB"
+	  cardinality="OneToMany" target="M2MABCollection"
+	  retrieveAutomatic="True" saveAutomatic="true" deleteAutomatic="true" inverse="false">
+	  <entry fromAttribute="GUIDValue" toAttribute="AGuidValue"/>
+	</association>
+	<association fromClass="NunitTests.InheritedClasses.ManyToManyB"
+	  toClass="NunitTests.InheritedClasses.ManyToManyAB"
+	  cardinality="OneToMany" target="M2MABCollection"
+	  retrieveAutomatic="True" saveAutomatic="true" deleteAutomatic="true" inverse="false">
+	  <entry fromAttribute="GUIDValue" toAttribute="BGuidValue"/>
+	</association>
+	<association fromClass="NunitTests.InheritedClasses.ManyToManyAB"
+	  toClass="NunitTests.InheritedClasses.ManyToManyA"
+	  cardinality="OneToOne" target="M2MA"
+	  retrieveAutomatic="True" saveAutomatic="true" deleteAutomatic="true" inverse="false">
+	  <entry fromAttribute="AGuidValue" toAttribute="GUIDValue"/>
+	</association>
+	<association fromClass="NunitTests.InheritedClasses.ManyToManyAB"
+	  toClass="NunitTests.InheritedClasses.ManyToManyB"
+	  cardinality="OneToOne" target="M2MB"
+	  retrieveAutomatic="True" saveAutomatic="true" deleteAutomatic="true" inverse="false">
+	  <entry fromAttribute="BGuidValue" toAttribute="GUIDValue"/>
+	</association>
+
 </map>
\ No newline at end of file