Permalink
Browse files

Merge pull request #83 from hazzik/green-tests-project

Fixed some tests for Oracle
  • Loading branch information...
2 parents e6f4e0f + 5ca67f8 commit 4a235f6cf418d97fabc397b8ae8e7fff480921c0 @julian-maughan julian-maughan committed Feb 19, 2012
@@ -2,7 +2,7 @@ namespace NHibernate.Test.Generatedkeys.ByTrigger
{
public class MyEntity
{
- public virtual int Id { get; private set; }
+ public virtual int Id { get; protected set; }
public virtual string Name { get; set; }
}
@@ -17,11 +17,11 @@
<composite-element class="Component">
<property name="Name" column="Component_Name" />
<nested-composite-element name="SubComponent" access="property" class="SubComponent">
- <property name="SubName" column="Component_SubComponent_SubName" />
- <property name="SubName1" column="Component_SubComponent_SubName1" />
+ <property name="SubName" column="Comp_SubComp_SubName" />
+ <property name="SubName1" column="Comp_SubComp_SubName1" />
<nested-composite-element name="Nested" access="property" class="SubComponent">
- <property name="SubName" column="Component_SubComponent_Nested_SubName" />
- <property name="SubName1" column="Component_SubComponent_Nested_SubName1" />
+ <property name="SubName" column="Comp_SubComp_Nested_SubName" />
+ <property name="SubName1" column="Comp_SubComp_Nested_SubName1" />
</nested-composite-element>
</nested-composite-element>
</composite-element>
@@ -41,10 +41,10 @@
<nested-composite-element name="Component" class="Component">
<property name="Name" column="Component_Name" />
<nested-composite-element name="SubComponent" access="property" class="SubComponent">
- <property name="SubName" column="Component_SubComponent_SubName" />
+ <property name="SubName" column="Comp_SubComp_SubName" />
<nested-composite-element name="Nested" access="property" class="SubComponent">
- <property name="SubName" column="Component_SubComponent_Nested_SubName" />
- <property name="SubName1" column="Component_SubComponent_Nested_SubName1" />
+ <property name="SubName" column="Comp_SubComp_Nested_SubName" />
+ <property name="SubName1" column="Comp_SubComp_Nested_SubName1" />
</nested-composite-element>
</nested-composite-element>
</nested-composite-element>
@@ -7,11 +7,11 @@
<id name="ID" type="Int32">
<generator class="hilo" />
</id>
- <property name="Mode" type="String" />
- <property name="Num" type="Int32" />
- <property name="Category" type="Int32" />
+ <property name="Mode" type="String" column="`Mode`"/>
+ <property name="Num" type="Int32"/>
+ <property name="Category" type="Int32"/>
- <filter name="modeFilter" condition="Mode=:currentMode" />
+ <filter name="modeFilter" condition="`Mode`=:currentMode" />
</class>
<filter-def name="modeFilter">
@@ -17,6 +17,6 @@
<id name="Id">
<generator class="native" />
</id>
- <property name="Start" />
+ <property name="Start" column="`Start`" />
</class>
</hibernate-mapping>
@@ -8,7 +8,7 @@
<generator class="native" />
</id>
<property name="Name" />
- <property name="Level" />
+ <property name="Level" column="`Level`" />
</class>
</hibernate-mapping>
@@ -20,7 +20,7 @@
<generator class="hilo" />
</id>
- <property name="Number" type="Int32" />
+ <property name="Number" type="Int32" column="`Number`" />
<many-to-one name="Customer" column="CustomerID" class="Customer" />
</class>

0 comments on commit 4a235f6

Please sign in to comment.